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
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
Suprabh Shukla
8fe20711fa
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
...
am: 28f6dd01bc
2017-08-16 20:41:48 +00:00
Suprabh Shukla
bbe3047d1d
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
...
am: 0e22588ed0
2017-08-16 20:40:59 +00:00
Suprabh Shukla
b4678ce1d2
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
2017-08-16 20:25:12 +00:00
Suprabh Shukla
28f6dd01bc
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
...
am: a6b4e032c8
2017-08-16 20:24:28 +00:00
Suprabh Shukla
0e22588ed0
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
...
am: 142433924f
2017-08-16 20:23:41 +00:00
Suprabh Shukla
5d4a2bb844
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
2017-08-16 20:22:36 +00:00
Suprabh Shukla
a6b4e032c8
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
...
am: df39274478
2017-08-16 20:18:15 +00:00
Suprabh Shukla
23e185adf8
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
2017-08-16 20:17:34 +00:00
Suprabh Shukla
142433924f
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
...
am: 3dd026d5dc
2017-08-16 20:17:28 +00:00
Suprabh Shukla
82afc6c5fd
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
2017-08-16 20:14:42 +00:00
Suprabh Shukla
81ba0cc873
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
2017-08-16 20:10:37 +00:00
Suprabh Shukla
df39274478
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours
...
am: 05fec2162a
2017-08-16 20:09:35 +00:00
Suprabh Shukla
3dd026d5dc
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
...
am: 6d7bb4c4d0
2017-08-16 20:08:56 +00:00
Suprabh Shukla
202970aa92
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
2017-08-16 20:06:04 +00:00
Suprabh Shukla
05fec2162a
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours
...
am: b2f5566de5
2017-08-16 20:04:24 +00:00
Suprabh Shukla
6d7bb4c4d0
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
...
am: 817c35056c
2017-08-16 20:03:34 +00:00
Suprabh Shukla
3ce6d3ee87
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
2017-08-16 20:02:33 +00:00
Suprabh Shukla
cf0caf8f22
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
2017-08-16 19:59:04 +00:00
Suprabh Shukla
b2f5566de5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours
...
am: de8e1f4be5
2017-08-16 19:59:04 +00:00
Suprabh Shukla
817c35056c
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
...
am: 2e6cf5dcde
2017-08-16 19:55:14 +00:00
Suprabh Shukla
a92a7e400f
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
2017-08-16 19:55:02 +00:00
Suprabh Shukla
de8e1f4be5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours
...
am: d22de194f5
2017-08-16 19:55:01 +00:00
Suprabh Shukla
d22de194f5
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours
...
am: 7bd8e120cb
2017-08-16 19:51:02 +00:00
Suprabh Shukla
f52c8ccbfc
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
...
am: aedf7cdfdb
2017-08-16 19:48:33 +00:00
