Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev
...
am: e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Dmitry Dementyev
75ae46d035
Add permission check to Intents used by Authenticator Settings.
...
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Maurice Lam
c94f2b93af
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
2016-09-02 16:53:52 -07:00
Jason Monk
e6ad6e866b
Pre-setup restrictions DO NOT MERGE
...
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
2016-06-30 12:50:44 -04:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
...
am: 8e4f6fbc2e
* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
...
am: 6967df6421
-s ours
* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Russell Brenner
14bf226c79
[DO NOT MERGE] 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.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +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
Russell Brenner
4836ab6df4
Block developer settings during SUW
...
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
2015-11-10 12:15:48 -08: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