Phil Weaver
b72ffa47a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours
...
am: df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours
...
am: 98e0930394
-s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
...
am: bebc9f9f3c
-s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Dmitry Dementyev
2d9593f8f1
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a
am: 0c07b38054
-s ours am: 22db6274bf
-s ours
...
am: 13b12fd61d
-s ours
Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
2017-04-12 19:37:33 +00:00
Dmitry Dementyev
13b12fd61d
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a
am: 0c07b38054
-s ours
...
am: 22db6274bf
-s ours
Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
2017-04-12 19:32:36 +00:00
Dmitry Dementyev
22db6274bf
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a
...
am: 0c07b38054
-s ours
Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
2017-04-12 19:26:32 +00:00
Dmitry Dementyev
0c07b38054
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
...
am: bac5163a9a
Change-Id: Ib70241c596aca047a096318eb2026634692f8620
2017-04-12 19:21:36 +00:00
Dmitry Dementyev
bac5163a9a
Add permission check to Intents used by Authenticator Settings.
...
am: ea55e6331e
Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
2017-04-12 19:16:01 +00:00
Dmitry Dementyev
ea55e6331e
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: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-03-28 13:53:10 -07:00
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
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
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
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
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
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
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
d4fd061d6e
Import translations. DO NOT MERGE
...
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
2015-10-07 05:36:18 -07: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
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
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
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
d0d54fc1c5
Import translations. DO NOT MERGE
...
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
2015-09-25 13:23:31 -07:00
Baligh Uddin
15243a260c
Import translations. DO NOT MERGE
...
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
2015-09-25 13:05:09 -07:00
Zach Jang
1304f47c1b
am 5cac8966
: am 8fc9b5b6
: am 2e006b2b
: am b7e865ee
: (-s ours) am 0431bc18
: am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '5cac896612ead73d08acb588e2f62512f8789cf4':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:39 +00:00
Zach Jang
564ec9357b
am 00721b4a
: am c87ceb7e
: am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 19:05:36 +00:00
Zach Jang
5cac896612
am 8fc9b5b6
: am 2e006b2b
: am b7e865ee
: (-s ours) am 0431bc18
: am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:23 +00:00
Zach Jang
00721b4afa
am c87ceb7e
: am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Zach Jang
8fc9b5b684
am 2e006b2b
: am b7e865ee
: (-s ours) am 0431bc18
: am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07
am b7e865ee
: (-s ours) am 0431bc18
: am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48
am 0431bc18
: am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8
am e7e0c03f
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:24 +00:00
Zach Jang
c87ceb7ec1
am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:18 +00:00
Zach Jang
6ceb2ba9b8
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00