Android Build Merger (Role)
7b2b84c617
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
...
Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8
2018-04-02 17:48:47 +00:00
Android Build Merger (Role)
ee220e0238
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
...
Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107
2018-04-02 17:48:45 +00:00
Android Build Merger (Role)
e25ebddfdc
[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
...
Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7
2018-04-02 17:48:43 +00:00
Hansong Zhang
4f58c19afa
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
2018-04-02 10:48:18 -07:00
Android Build Merger (Role)
ca801490c1
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1
...
Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913
2018-02-13 00:43:50 +00:00
Android Build Merger (Role)
6827142bd1
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9
...
Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028
2018-02-13 00:43:46 +00:00
Android Build Merger (Role)
ddd9cb6be9
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff
...
Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c
2018-02-13 00:43:44 +00:00
Android Build Merger (Role)
5755ec9bff
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861
...
Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247
2018-02-13 00:43:40 +00:00
Android Build Merger (Role)
eb76bf9861
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25
...
Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8
2018-02-13 00:43:37 +00:00
Android Build Merger (Role)
59ab695e25
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10
...
Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801
2018-02-13 00:43:34 +00:00
Android Build Merger (Role)
d923718d10
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49
...
Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7
2018-02-13 00:43:27 +00:00
Antony Sargent
0a7ae11c49
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
2018-02-13 00:43:21 +00:00
Antony Sargent
acacd658f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
...
am: 9867a3ef85
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
...
am: 3d7dbd6407
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
...
am: 24f063a207
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
...
am: 9cf1fc73f1
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
...
am: eee62e1846
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846
Reword bluetooth confirmation dialog am: e14d38a383
...
am: b2b401b5f3
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3
Reword bluetooth confirmation dialog
...
am: e14d38a383
2017-12-05 17:13:36 +00:00
Antony Sargent
e14d38a383
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
2017-11-15 18:38:43 +00:00
Fan Zhang
d15a81f882
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
2017-11-03 00:31:01 +00:00
Fan Zhang
3c19043e9c
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
2017-11-03 00:28:34 +00:00
Fan Zhang
e6a8f354fc
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
2017-11-03 00:26:03 +00:00
Fan Zhang
dbbcf65c96
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
2017-11-03 00:22:09 +00:00
Fan Zhang
7690482014
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
2017-11-03 00:19:51 +00:00
Fan Zhang
5f02135c42
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours
...
am: 1de093b1a1
2017-11-03 00:17:43 +00:00
Fan Zhang
1de093b1a1
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours
...
am: b17703e871
2017-11-03 00:15:15 +00:00
Fan Zhang
b17703e871
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
...
am: 1c040c7414
2017-11-03 00:13:11 +00:00
Fan Zhang
1c040c7414
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
2017-11-03 00:07:32 +00:00
Fan Zhang
1aefa2529a
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
2017-11-02 16:04:58 -07:00
Fan Zhang
9d865d0c3e
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
2017-10-31 23:04:53 +00:00
Fan Zhang
3d94477fb8
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
2017-10-31 23:02:45 +00:00
Fan Zhang
4d9e11990d
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
2017-10-31 23:00:42 +00:00
Fan Zhang
0c0728a947
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5
...
am: b4db530aa5
2017-10-31 22:59:07 +00:00
Fan Zhang
b4db530aa5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
...
am: 769e1e31f5
2017-10-31 22:57:12 +00:00
Fan Zhang
769e1e31f5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
...
am: cd66862b08
2017-10-31 22:54:07 +00:00
Fan Zhang
cd66862b08
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
...
am: 8bffdc2613
2017-10-31 22:50:43 +00:00
Fan Zhang
8bffdc2613
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
2017-10-31 22:47:13 +00:00
Fan Zhang
adabc7561b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da
...
am: 80af194f8b
2017-10-31 21:21:53 +00:00
Fan Zhang
80af194f8b
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
...
am: e79c26a9da
2017-10-31 21:16:32 +00:00
Fan Zhang
e79c26a9da
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
...
am: e69c4dcb8f
2017-10-31 21:11:26 +00:00
Fan Zhang
5c1a1363c7
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
2017-10-31 21:03:52 +00:00
Fan Zhang
e69c4dcb8f
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
2017-10-31 21:03:08 +00:00
Fan Zhang
1cc50ae190
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
2017-10-31 19:38:07 +00:00
Jeff Sharkey
397a3555b5
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
2017-10-18 20:26:31 +00:00
Jeff Sharkey
8f2a69fad3
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
2017-10-18 20:25:25 +00:00
Jeff Sharkey
629553fb49
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
2017-10-18 20:06:55 +00:00
Jeff Sharkey
85cb0b43da
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
2017-10-18 20:06:00 +00:00
Jeff Sharkey
d88820f3f6
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
2017-10-18 19:40:12 +00:00
Jeff Sharkey
e341fe95bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours
...
am: 416ecb20a3
2017-10-18 19:39:10 +00:00
