Jeff Sharkey
5b2a431787
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 4cfc684346
2017-10-18 18:28:28 +00:00
Jeff Sharkey
45fc104958
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 5ef2cfac97
2017-10-11 23:03:25 +00:00
Jeff Sharkey
8b399b3eb7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours
...
am: 952ae3ec34
2017-10-11 22:02:29 +00:00
Jeff Sharkey
9138455b41
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours
...
am: 0f53a56cbd
2017-10-11 22:00:24 +00:00
Jeff Sharkey
952ae3ec34
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44
...
am: e803004863
2017-10-11 21:42:57 +00:00
Jeff Sharkey
0f53a56cbd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
...
am: 250d5e60b0
2017-10-11 21:42:14 +00:00
Jeff Sharkey
e803004863
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
...
am: 2433b6dc44
2017-10-11 21:34:11 +00:00
Jeff Sharkey
250d5e60b0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
...
am: 3aa36a6afb
2017-10-11 21:33:01 +00:00
Jeff Sharkey
4d61a1bd15
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours
...
am: 47bc5fba05
2017-10-11 21:24:25 +00:00
Jeff Sharkey
2433b6dc44
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d
...
am: d721694b79
2017-10-11 21:21:40 +00:00
Jeff Sharkey
3aa36a6afb
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239
...
am: 53a69985b3
2017-10-11 21:20:09 +00:00
Jeff Sharkey
47bc5fba05
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
...
am: efe9e7e003
2017-10-11 21:12:41 +00:00
Jeff Sharkey
de7c312543
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours
...
am: b410435a21
2017-10-11 21:10:10 +00:00
Jeff Sharkey
f4e2e26064
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
...
am: 9c39da39df
2017-10-11 21:09:20 +00:00
Jeff Sharkey
d721694b79
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e
...
am: 86cc9a681d
2017-10-11 21:01:29 +00:00
Jeff Sharkey
53a69985b3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3
...
am: b3d4bc8239
2017-10-11 21:00:27 +00:00
Jeff Sharkey
efe9e7e003
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
...
am: fe1daa6eda
2017-10-11 20:57:51 +00:00
Jeff Sharkey
86cc9a681d
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours
...
am: 004f90f35e
2017-10-11 20:46:28 +00:00
Jeff Sharkey
b3d4bc8239
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours
...
am: 89791cb5c3
2017-10-11 20:45:04 +00:00
Jeff Sharkey
fe1daa6eda
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
...
am: 979efb53d0
2017-10-11 20:44:53 +00:00
Jeff Sharkey
b410435a21
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
...
am: 46bc2bd7bd
2017-10-11 20:39:07 +00:00
Jeff Sharkey
004f90f35e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
...
am: ba66bb8a43
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
...
am: 45926efd0f
2017-10-11 20:34:40 +00:00
TreeHugger Robot
9c39da39df
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
2017-10-11 20:32:55 +00:00
Jeff Sharkey
ba66bb8a43
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
...
am: 95bbef26d7
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
...
am: 556688abdb
2017-10-11 20:31:41 +00:00
Jeff Sharkey
979efb53d0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
...
am: 7c41707eaf
2017-10-11 20:29:25 +00:00
Jeff Sharkey
95bbef26d7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
...
am: e38a7f42ab
2017-10-11 20:28:13 +00:00
Jeff Sharkey
46bc2bd7bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
...
am: 0bcee25346
2017-10-11 20:28:11 +00:00
Jeff Sharkey
9173362f4e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours
...
am: 70387afef9
2017-10-11 20:27:42 +00:00
Jeff Sharkey
556688abdb
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 019f31b499
2017-10-11 20:26:40 +00:00
Jeff Sharkey
7c41707eaf
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: f32a4fad5d
2017-10-11 20:25:11 +00:00
Jeff Sharkey
e38a7f42ab
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 94e678c188
2017-10-11 20:24:31 +00:00
Jeff Sharkey
0bcee25346
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 1cdc675d7d
2017-10-11 20:24:16 +00:00
Jeff Sharkey
70387afef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 8441943bfa
2017-10-11 20:24:05 +00:00
Jeff Sharkey
5ef2cfac97
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:32:03 +00:00
Jeff Sharkey
4cfc684346
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:31:54 +00:00
Jeff Sharkey
94e678c188
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:31:44 +00:00
Jeff Sharkey
019f31b499
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:31:34 +00:00
Jeff Sharkey
f32a4fad5d
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:31:23 +00:00
Jeff Sharkey
1cdc675d7d
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:43 +00:00
Jeff Sharkey
8441943bfa
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:31 +00:00
Jeff Sharkey
b5e93969a5
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431
2017-10-03 20:30:15 +00:00
Fan Zhang
e3c2e51f67
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Fixes: 64339515
Bug: 38258991
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
Change-Id: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
2017-09-26 17:10:03 -07:00
Fan Zhang
799e124d8e
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Fixes: 64339515
Bug: 38258991
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
(cherry picked from commit 6d479d99a9
2017-09-22 18:33:05 +00:00
Bill Yi
535dd7f066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
2017-09-06 08:36:23 -07:00
Phil Weaver
f65e790ba0
resolve merge conflicts of 94c5202965 to oc-dr1-dev
...
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Phil Weaver
94c5202965
Backport overlay security fix
...
Replacing app opps fix with the flag that is used
elsewhere.
Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.
Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6
2017-08-29 00:57:11 +00:00
Bill Yi
683fdb8177
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I452434cbf7282ba20233b9345b75ebdf9251ef98
2017-08-23 22:15:37 -07:00
Suprabh Shukla
9a416573d7
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
...
am: b4678ce1d2
2017-08-16 20:42:38 +00:00
