new file mode 100644
index 0000000000000000000000000000000000000000..b75a14aa8e510d95d350716353e2f121785a7d89
GIT binary patch
literal 294912
zc%1FkOKco>836DZ?|L0ObrglPZUshb6=+<HSnp%J7DCi<T^eef)Jf=5vUcsQ<l-ca
z*C8|kEf!#IZ~^rK6$dKd1eZ#jxI&Q-7ams*5eTUghaxqh5oPATaVKs;MO=#T@8_9s
zzWG1C`Ml%D=|>mWw>sr#E^MA_ZIx@$SE4wM9w?WiC>lu5;V4&1&*E+OarEv6qL2M)
zXtZ}TI&kIb=u3xszqtC!)$OaFy7I=Ar?33#KiCfd0000000000000000000000000
z0000000000@PB1vXlQJFJl_83R;#_yIoH{0J=of6?OqSeFE7lUSty^GJHEJ3-W@F;
zTVE@mT0ZgFx#cIyk1RY<KD%_{(X$KXlS}3KlS>aRo|r#VUS2r0I5)pARbJofoSW`n
zs*@i-P#T*bkE8YTYn?B4FK(oxE3Hdg7sCC@ZvB<%-E8=HsWdh=5kD0ctbV?=zIMLb
zJ+-<1h1OPQ=vH$lmL6Pqyc{O87V-t<W3A~*b@GA1P~)*sW24pXY~)KyduoKqchsm&
zK2$7?y?-KJ>9>8U{cLA-D_=6Wr^c=6f6>YG<b0ttcF*p2v)=7q>TKp~ihIiRXWvn!
zIX(G}Bpw=@n25hQ6JA+9oo54kUfb;j-u=bR9Y48zW~$t(q-XlxTGjNdWqBCLMy9i&
zW_H`mZkypYThgp&p^=3o3o}`0W??o9tt_<DFdIr$`Y}|jR731PrygP>#3aO-5St;+
zhS&<R9pY+etlwV0zmQk^d8k|sm8+q0HB_#K%GFT08Y<Vqu3Fet3%hDzS1s&H!fX;|
zlQ5fv*`z-kY9^uPOjz0M$M6Y;@3dO!=h@zB=(b)-RYS|S((qY_)wQs?7FO3Q{nh=2
z{gGOT^$;5&X3wsNr`E$$>*2jL!rn&M+o<$Mvc0RFMy+0JOy_AePj6dL&(lVpCV4uO
zr_Hz0B;S_g+md`+l5b0Pw<UQyN#0J9x0B@UBzZeY-cFLYljQBB>1>|1^0b|&t9iPX
zr=2`~=B+gRAoSCA-cCDfXRXnythK`@-mC=q=bOw<)&@#rpPu-4fBf>_(v|5vFQk8>
zi=%0Xdr{PTum4#900000000000000000000000000000000000008iw+WvBUxp?%@
zp(D}uvAr`#qp3qdlztsK^0s|PZ_WJo?(ScTar{#BWM#2(taR}HoriZ`AC2!Aj0=@}
zibuac`26wTe&)@m&VT*hAOGyvzx&os{E>eQ#Bs6wW)xq0;rAadeemaBJH7PBzufir
z=hp}B`q6i<jkNzf`tAE3e>p9C=k>i$i+80DOONdNah#5hWOKdiQSWW*0RR9100000
z00000000000000000000000000001BKNu<$hwo0WBk39UZbs<=000000000000000
z000000000000000000000002{QlStHkEGYQcQZ;40000000000000000000000000
z00000000000002kmkNbwcqF~Xy&F+_00000000000000000000000000000000000
z0002M{!=O(8Gb2xawJXT-m6i1000000000000000000000000000000000000002M
zzVN=n)bRDaL-A-9dOwWP0{{R300000000000000000000000000000000000{?|Pg
z4~|c5N6)po-OCp?*IxZWeE8X)Tzl~ozkKa`_kL$%ywa?EsC4lDoriZ`AC2!Aj0=@J
zi-(&RUpvs5{OcQ^{KLy<FIMmS>OdS956?AkJTm)A?KhwM>9vD5KJdcnk+gW+`&*PA
y0000000000000000000000000000000000000026uN*9l4?oxHb}wJpT>B^B%kLoo

--- a/toolkit/components/passwordmgr/test/unit/head.js
+++ b/toolkit/components/passwordmgr/test/unit/head.js
@@ -3,16 +3,17 @@
  */
 
 "use strict";
 
 // Globals
 
 let { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
+Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/LoginRecipes.jsm");
 Cu.import("resource://gre/modules/LoginHelper.jsm");
 Cu.import("resource://testing-common/MockDocument.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadPaths",
                                   "resource://gre/modules/DownloadPaths.jsm");
@@ -96,18 +97,22 @@ const RecipeHelpers = {
 
 // Initialization functions common to all tests
 
 add_task(async function test_common_initialize()
 {
   // Before initializing the service for the first time, we should copy the key
   // file required to decrypt the logins contained in the SQLite databases used
   // by migration tests.  This file is not required for the other tests.
-  await OS.File.copy(do_get_file("data/key3.db").path,
-                     OS.Path.join(OS.Constants.Path.profileDir, "key3.db"));
+
+
+  const isAndroid = AppConstants.platform == "android";
+  const keyDBName = isAndroid ? "key4.db" : "key3.db";
+  await OS.File.copy(do_get_file(`data/${keyDBName}`).path,
+                     OS.Path.join(OS.Constants.Path.profileDir, keyDBName));
 
   // Ensure that the service and the storage module are initialized.
   await Services.logins.initializationPromise;
 
   // Ensure that every test file starts with an empty database.
   LoginTestUtils.clearData();
 
   // Clean up after every test.

--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -7,17 +7,17 @@ support-files = data/**
 skip-if = os == "android"
 [test_module_LoginStore.js]
 skip-if = os == "android"
 [test_removeLegacySignonFiles.js]
 skip-if = os == "android"
 
 # Test SQLite database backup and migration, applicable to Android only.
 [test_storage_mozStorage.js]
-skip-if = true || os != "android" # Bug 1171687: Needs fixing on Android
+skip-if = os != "android"
 
 # The following tests apply to any storage back-end.
 [test_context_menu.js]
 skip-if = os == "android" # The context menu isn't used on Android.
 # LoginManagerContextMenu is only included for MOZ_BUILD_APP == 'browser'.
 run-if = buildapp == "browser"
 [test_dedupeLogins.js]
 [test_disabled_hosts.js]