Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,880 Commits 1 Branch 0 Tags
f0ff1631dee1d988151f8260e6c65ff836a40e80
Commit Graph

20880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
f0ff1631de Merge "Preserve FRP lock if wiped during SUW" into mnc-dev 2015-11-17 01:14:11 +00:00
Russell Brenner
de4fc8eb2a Preserve FRP lock if wiped during SUW 
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
 2015-11-13 18:08:51 +00:00
Sanket Padawe
98f11fd1a4 Uncheck checkbox for contact sharing by default for non carkit devices. 
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262)
 2015-11-12 23:54:06 +00:00
Geoff Mendal
99131cf642 am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
  Import translations. DO NOT MERGE
 2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77 Import translations. DO NOT MERGE 
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
 2015-10-19 05:21:10 -07:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
 2015-10-14 12:53:54 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
 2015-10-14 12:49:34 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
 2015-10-14 12:45:51 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
 2015-10-14 12:40:45 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE 
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
 2015-10-14 05:30:54 -07:00
Geoff Mendal
c6d5ac0fb7 am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
  Import translations. DO NOT MERGE
 2015-10-14 12:23:45 +00:00
Geoff Mendal
974dfc1fbd Import translations. DO NOT MERGE 
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
 2015-10-14 05:17:15 -07:00
Geoff Mendal
4accfd0b12 am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '1bd19dd17e2038df6c374ca6ed48498de4dde730':
  Import translations. DO NOT MERGE
 2015-10-12 13:11:42 +00:00
Geoff Mendal
1bd19dd17e am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
  Import translations. DO NOT MERGE
 2015-10-12 13:04:48 +00:00
Geoff Mendal
0e3ffe7cce am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE
 2015-10-12 13:00:56 +00:00
Geoff Mendal
5fa0a93d3e am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE
 2015-10-12 12:55:33 +00:00
Geoff Mendal
4fedc0fdaf Import translations. DO NOT MERGE 
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
 2015-10-12 05:34:25 -07:00
Geoff Mendal
7d521a8ff2 am f598d0bc: (-s ours) Import translations. DO NOT MERGE 
* commit 'f598d0bcf70e27a14462bc5403c83822c5600945':
  Import translations. DO NOT MERGE
 2015-10-12 12:30:37 +00:00
Geoff Mendal
f598d0bcf7 Import translations. DO NOT MERGE 
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
 2015-10-12 05:21:40 -07:00
Geoff Mendal
4f7f05a00b am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
  Import translations. DO NOT MERGE
 2015-10-07 13:01:25 +00:00
Geoff Mendal
ad36aa0ed1 am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit '3963b980bebacb58dd2ed57fd45b042a01f125a0':
  Import translations. DO NOT MERGE
 2015-10-07 12:56:45 +00:00
Geoff Mendal
3963b980be am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit '793b2a2d444192ee587a643c88e535ebf0c98158':
  Import translations. DO NOT MERGE
 2015-10-07 12:51:18 +00:00
Geoff Mendal
793b2a2d44 am d4fd061d: (-s ours) Import translations. DO NOT MERGE 
* commit 'd4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
  Import translations. DO NOT MERGE
 2015-10-07 12:46:38 +00:00
Geoff Mendal
35d2cf1c0c am b4a027d0: (-s ours) Import translations. DO NOT MERGE 
* commit 'b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
  Import translations. DO NOT MERGE
 2015-10-07 12:41:35 +00:00
Geoff Mendal
d4fd061d6e Import translations. DO NOT MERGE 
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
 2015-10-07 05:36:18 -07:00
Geoff Mendal
b4a027d07b Import translations. DO NOT MERGE 
Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import
 2015-10-07 05:23:13 -07:00
Geoff Mendal
a4cd63f6cc am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '032262578565c928b47996d096f3518cf1f09aa7':
  Import translations. DO NOT MERGE
 2015-10-05 12:55:55 +00:00
Geoff Mendal
0322625785 am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
  Import translations. DO NOT MERGE
 2015-10-05 12:52:33 +00:00
Geoff Mendal
45335b0c5e am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE
 2015-10-05 12:45:22 +00:00
Geoff Mendal
0070fbfe01 am f0338376: (-s ours) Import translations. DO NOT MERGE 
* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE
 2015-10-05 12:41:50 +00:00
Geoff Mendal
f033837677 Import translations. DO NOT MERGE 
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
 2015-10-05 05:33:27 -07:00
Geoff Mendal
82c61b2dd8 am 010d2fcd: (-s ours) Import translations. DO NOT MERGE 
* commit '010d2fcd2a4b8fda906ff0a0e04554475a45489c':
  Import translations. DO NOT MERGE
 2015-10-05 12:32:07 +00:00
Geoff Mendal
010d2fcd2a Import translations. DO NOT MERGE 
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
 2015-10-05 05:20:30 -07:00
Geoff Mendal
0929be6613 am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'dffcc532693c4bc6e07cf05ac532148612a94176':
  Import translations. DO NOT MERGE
 2015-09-30 12:57:33 +00:00
Geoff Mendal
dffcc53269 am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
  Import translations. DO NOT MERGE
 2015-09-30 12:51:15 +00:00
Geoff Mendal
c7b0a81625 am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE 
* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE
 2015-09-30 12:47:04 +00:00
Geoff Mendal
49b491bb76 am 2e095fa2: (-s ours) Import translations. DO NOT MERGE 
* commit '2e095fa263b0887fc55576b32625264e13fee4c7':
  Import translations. DO NOT MERGE
 2015-09-30 12:41:16 +00:00
Geoff Mendal
2e095fa263 Import translations. DO NOT MERGE 
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
 2015-09-30 05:34:33 -07:00
Geoff Mendal
afc3831267 am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE 
* commit '77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
  Import translations. DO NOT MERGE
 2015-09-30 12:27:22 +00:00
Geoff Mendal
77fc6ac5f6 Import translations. DO NOT MERGE 
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
 2015-09-30 05:21:29 -07:00
Baligh Uddin
23adae1332 am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE 
* commit '4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e':
  Import translations. DO NOT MERGE
 2015-09-27 03:10:00 +00:00
Baligh Uddin
4fdde2b56f am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE 
* commit '2b802ceb328658fa18e007f859bda47a755dce30':
  Import translations. DO NOT MERGE
 2015-09-27 03:04:11 +00:00
Baligh Uddin
e50e0b49b5 am ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE 
* commit 'ec9819828df47813168d99fd2905b98a230a5d6f':
  Import translations. DO NOT MERGE
 2015-09-27 03:03:44 +00:00
Baligh Uddin
2b802ceb32 am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE 
* commit 'cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
  Import translations. DO NOT MERGE
 2015-09-27 02:57:14 +00:00
Baligh Uddin
ec9819828d am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE 
* commit '9b9d77f163b65057540b37ac4f6732f01f2b2e40':
  Import translations. DO NOT MERGE
 2015-09-27 02:56:45 +00:00
Baligh Uddin
9b9d77f163 am 15243a26: (-s ours) Import translations. DO NOT MERGE 
* commit '15243a260c8accf0a1fc999282a10d1ecec334b6':
  Import translations. DO NOT MERGE
 2015-09-27 02:50:43 +00:00
Baligh Uddin
cd6e60343a am d0d54fc1: (-s ours) Import translations. DO NOT MERGE 
* commit 'd0d54fc1c54a046eaf919978d584fa3528c36e24':
  Import translations. DO NOT MERGE
 2015-09-27 02:49:56 +00:00
Baligh Uddin
08516de0fe am ad7342ec: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad7342ec09fb5a6fb28e84d0d93603f8d40ff225':
  Import translations. DO NOT MERGE
 2015-09-27 02:49:12 +00:00
Baligh Uddin
d0d54fc1c5 Import translations. DO NOT MERGE 
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
 2015-09-25 13:23:31 -07:00
Baligh Uddin
ad7342ec09 Import translations. DO NOT MERGE 
Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import
 2015-09-25 13:14:23 -07:00