OSDN Git Service
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into nyc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Android Build Merger (Role) [Thu, 24 May 2018 18:22:30 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282
Change-Id: Ieb0dfe22926f14109466bd00c9cac9ccaa04e057
Android Build Merger (Role) [Thu, 24 May 2018 18:22:29 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724
Change-Id: I2b731c3a29f4fde5a672c9224008e7be7e460b72
Android Build Merger (Role) [Thu, 24 May 2018 18:22:19 +0000 (18:22 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name
Bug:
62672248
Test: manual
Change-Id: Iab08b43768f0aedd690570eb59dcb71c14c04784
Android Build Merger (Role) [Wed, 2 May 2018 22:37:02 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug:
62672248
Test: manual
Change-Id: Id393c4296efef03f38b6e55396c83da9dd9c8b4c
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug:
62672248
Test: manual
Change-Id: Ia386cc2d98de086ed545e4fe6d41be20e9c24dc4
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev
Hansong Zhang [Mon, 2 Apr 2018 17:48:18 +0000 (10:48 -0700)]
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name
Bug:
72872376
Bug:
73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:03 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666
Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:02 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7
Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:00 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3
Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163
Android Build Merger (Role) [Mon, 2 Apr 2018 17:44:58 +0000 (17:44 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0
Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62
Hansong Zhang [Mon, 2 Apr 2018 17:42:26 +0000 (10:42 -0700)]
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name
Bug:
72872376
Bug:
73173182
Test: manual
Change-Id: I85f5f11c5803c3031bf9a56273c30c3ef305f63d
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:40 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861
Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:37 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25
Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:34 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10
Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:27 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49
Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Import translations. DO NOT MERGE
Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug:
62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846
am:
9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3
am:
eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383
am:
b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]
Reword bluetooth confirmation dialog
am:
e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug:
62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours
am:
7690482014 -s ours
Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a
Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours
am:
5f02135c42 -s ours
Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411
Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours
am:
1de093b1a1 -s ours
Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81
Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours
am:
b17703e871 -s ours
Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4
Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am:
1c040c7414 -s ours
Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9
Fan Zhang [Fri, 3 Nov 2017 00:07:32 +0000 (00:07 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
Fan Zhang [Tue, 10 Oct 2017 21:06:04 +0000 (14:06 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Test: manual
Fan Zhang [Tue, 31 Oct 2017 22:59:07 +0000 (22:59 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5
am:
b4db530aa5 -s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
Fan Zhang [Tue, 31 Oct 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08
am:
769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
Fan Zhang [Tue, 31 Oct 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613
am:
cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
Fan Zhang [Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am:
8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
Fan Zhang [Tue, 31 Oct 2017 22:47:13 +0000 (22:47 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
Fan Zhang [Fri, 22 Sep 2017 18:25:42 +0000 (11:25 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Fan Zhang [Tue, 31 Oct 2017 21:03:08 +0000 (21:03 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes:
64339515
Bug:
38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
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
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
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
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
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
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
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
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
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
Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
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
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
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
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
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
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
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
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)
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)
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)
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)
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)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am:
9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am:
af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am:
de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
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
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
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
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
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df
am:
4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec
am:
f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e
am:
a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
am:
7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 20:59:48 +0000 (20:59 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9
am:
55b3b1f349
Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
Phil Weaver [Tue, 18 Jul 2017 20:54:21 +0000 (20:54 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94
am:
46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
Phil Weaver [Tue, 18 Jul 2017 20:49:55 +0000 (20:49 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d
am:
57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780
am:
5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c