OSDN Git Service
Android Build Merger (Role) [Wed, 2 May 2018 22:37:16 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b skipped:
3e48235bf6
Change-Id: Iea466a1bb688d8ff74cbb6cf964fbd7205705960
Android Build Merger (Role) [Wed, 2 May 2018 22:37:15 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b
Change-Id: I5beeaa99ef0cafa7ac716dc0745c90855954dc60
Android Build Merger (Role) [Wed, 2 May 2018 22:37:13 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
Change-Id: Ie0c9a58d5b24ae22fa183f656c2378fa957da7c1
Android Build Merger (Role) [Wed, 2 May 2018 22:37:12 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b
Android Build Merger (Role) [Wed, 2 May 2018 22:37:10 +0000 (22:37 +0000)]
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0
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
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617 skipped:
b1f00ebf9c
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]
Merge changes from topic "am-
e8b13d24-dee0-4f84-89d4-
8a7d110f6ec1" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
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
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:50 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617 skipped:
b1f00ebf9c
Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:48 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238 am:
7b2b84c617
Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:47 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc am:
ee220e0238
Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:45 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa am:
e25ebddfdc
Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107
Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:43 +0000 (17:48 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
4f58c19afa
Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7
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:11 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1 am:
41be25548e skipped:
74ff24d1c6
Change-Id: Idfc539317dd20a0216bb635fa0e014509d451069
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:10 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1 am:
41be25548e
Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:08 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667 am:
84061c71d1
Change-Id: I1a16852bc9676bf785836576bf034d0a1dc8cf4b
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:07 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2 am:
bab8dca667
Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8
Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:05 +0000 (17:45 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am:
ac6c49d2b0 am:
5b98c9f4a3 am:
dfe4cc74f7 skipped:
d276b38666 am:
5d27bdb6d2
Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029
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:56 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861 skipped:
5755ec9bff skipped:
ddd9cb6be9 skipped:
6827142bd1 skipped:
ca801490c1 skipped:
fb6a179745
Change-Id: Ib8ff63887495bec58823610df2bfe993d024bb12
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:53 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861 skipped:
5755ec9bff skipped:
ddd9cb6be9 skipped:
6827142bd1 skipped:
ca801490c1
Change-Id: Ife59d44c290cc17fb50bf252e0d5018e694249f4
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:50 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861 skipped:
5755ec9bff skipped:
ddd9cb6be9 skipped:
6827142bd1
Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:46 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861 skipped:
5755ec9bff skipped:
ddd9cb6be9
Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028
Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:44 +0000 (00:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0a7ae11c49 skipped:
d923718d10 skipped:
59ab695e25 skipped:
eb76bf9861 skipped:
5755ec9bff
Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c
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:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1
am:
db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85
am:
acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407
am:
9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207
am:
3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1
am:
24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
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
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +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 am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours
am:
e981e0b855 -s ours
Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49
Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +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 am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours
am:
d15a81f882 -s ours
Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016
Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +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 am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours
am:
3c19043e9c -s ours
Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +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 am:
dbbcf65c96 -s ours
am:
e6a8f354fc -s ours
Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da
Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +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
am:
dbbcf65c96 -s ours
Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf
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 23:11:55 +0000 (23:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours
am:
7da421a293 -s ours
Change-Id: Ia717917794165cb2846f0836c9e42350028a3095
Fan Zhang [Tue, 31 Oct 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours
am:
9d865d0c3e -s ours
Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
Fan Zhang [Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours
am:
3d94477fb8 -s ours
Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours
am:
4d9e11990d -s ours
Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
Fan Zhang [Tue, 31 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours
am:
0c0728a947 -s ours
Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
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 [Tue, 31 Oct 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b
am:
0c59dca90d -s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
Fan Zhang [Tue, 31 Oct 2017 21:23:57 +0000 (21:23 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b
am:
adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
Fan Zhang [Tue, 31 Oct 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da
am:
80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
Fan Zhang [Tue, 31 Oct 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f
am:
e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
Fan Zhang [Tue, 31 Oct 2017 21:11:26 +0000 (21:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am:
e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
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
Fan Zhang [Tue, 31 Oct 2017 18:25:36 +0000 (18:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +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 am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
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
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +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 am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
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
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +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 am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
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
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +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 am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
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
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +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
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
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
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