OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3
am: 2a2d92eee8  -s ours

Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da
am: 8f2a69fad3

Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours am: 416ecb20a3 am: e341fe95bd
am: 85cb0b43da

Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours am: 416ecb20a3
am: e341fe95bd

Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours
am: 416ecb20a3

Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0
am: fad1e6a315  -s ours

Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9
am: c1ebc09ff0

Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours...
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787
am: 9ba609cef9

Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours
am: 5b2a431787

Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 4cfc684346  -s ours

Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
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

Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:42:14 +0000 (21:42 +0000)]
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

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]
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

Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
am: 3aa36a6afb

Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d
am: d721694b79

Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239
am: 53a69985b3

Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 21:12:41 +0000 (21:12 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
am: efe9e7e003  -s ours

Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e
am: 86cc9a681d

Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3
am: b3d4bc8239

Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 20:57:51 +0000 (20:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
am: fe1daa6eda

Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours
am: 004f90f35e

Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours
am: 89791cb5c3

Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
Jeff Sharkey [Wed, 11 Oct 2017 20:44:53 +0000 (20:44 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
am: 979efb53d0

Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
Jeff Sharkey [Wed, 11 Oct 2017 20:39:07 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
am: 46bc2bd7bd  -s ours

Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43  -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f  -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc

6 years agoMerge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:32:55 +0000 (20:32 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
am: 95bbef26d7

Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb

Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf

Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
Jeff Sharkey [Wed, 11 Oct 2017 20:28:11 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346

Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:26:40 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 019f31b499

Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:25:11 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: f32a4fad5d

Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:31 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 94e678c188

Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 1cdc675d7d

Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:05 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 8441943bfa  -s ours

Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
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 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoBackport overlay security fix
Phil Weaver [Sat, 19 Aug 2017 01:08:12 +0000 (18:08 -0700)]
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

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:25:12 +0000 (20:25 +0000)]
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

Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 20:24:28 +0000 (20:24 +0000)]
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

Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 20:23:41 +0000 (20:23 +0000)]
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

Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:22:36 +0000 (20:22 +0000)]
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

Change-Id: I28fb4049f4c3a51d163cc77b60358736d082604e

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 20:18:15 +0000 (20:18 +0000)]
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

Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:17:34 +0000 (20:17 +0000)]
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

Change-Id: If3e96fdcd076bfe522b32726d05bef5f5a605d6a

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 20:17:28 +0000 (20:17 +0000)]
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

Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]
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

Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]
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

Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 20:09:35 +0000 (20:09 +0000)]
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

Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +0000)]
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

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]
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

Change-Id: I8afbb6a39eb1cffe0cafc94a4b3c98629afce27c

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]
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

Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4  -s ours am: 2e6cf5dcde  -s ours
am: 817c35056c  -s ours

Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]
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

Change-Id: If3daaffd53e0ee3743f6f4a1608c5114cfa498b7

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
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

Change-Id: I050ec3b9ce32d4a91add1447bab7845163348485

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
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

Change-Id: I991cd251a7f54d16dff7df676aff5fed265a07d3

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4  -s ours
am: 2e6cf5dcde  -s ours

Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]
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

Change-Id: Ib0587f73a715928275159027c09286127d063684

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]
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

Change-Id: I953f903e7298541160ed8c17f274a832618c152e

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]
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

Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]
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

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2  -s ours am: 78a9d598f1  -s ours
am: 0dba51f9f0  -s ours

Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
Suprabh Shukla [Wed, 16 Aug 2017 19:46:49 +0000 (19:46 +0000)]
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
am: 72beaddfd4  -s ours

Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea  -s ours am: 889036189b  -s ours
am: 9acf640efd  -s ours

Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f...
Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2  -s ours
am: 78a9d598f1  -s ours

Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea  -s ours
am: 889036189b  -s ours

Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52
am: 616c84ccb0  -s ours

Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
Suprabh Shukla [Wed, 16 Aug 2017 19:39:49 +0000 (19:39 +0000)]
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
am: ccad4a3621

Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2  -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f
Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea  -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
am: 1370eb3d52

Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126

6 years agoDisabling the activate button when paused am: af5d8b9b03
Suprabh Shukla [Wed, 16 Aug 2017 19:33:34 +0000 (19:33 +0000)]
Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece

Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd

6 years agoDisabling the activate button when paused am: 9ffee0d534
Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05

6 years agoDisabling the activate button when paused am: de5df8b090
Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]
Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250

6 years agoDisabling the activate button when paused am: 8e08a9bb71
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am: 05185952c8  -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a  -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3

6 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a
am: d68bd495ec

Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91

6 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0
am: 00143e1a7a

Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864