Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
...
am: db6e747ab9
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
...
am: acacd658f1
2017-12-05 17:32:41 +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
Antony Sargent
f20e0a492b
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
2017-11-15 18:38:36 +00:00
Fan Zhang
ef61a45cf6
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
2017-11-03 00:38:04 +00:00
Fan Zhang
e981e0b855
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
2017-11-03 00:34:29 +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
76f30a360c
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
2017-10-31 23:11:55 +00:00
Fan Zhang
7da421a293
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
2017-10-31 23:08:25 +00: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
96cc88e218
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b
...
am: 0c59dca90d
2017-10-31 21:25:58 +00:00
Fan Zhang
0c59dca90d
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b
...
am: adabc7561b
2017-10-31 21:23:57 +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
Fan Zhang
e3d0bbcc80
Merge "Set device credential's Window flag to be SECURE." into oc-dev
2017-10-31 18:25:36 +00:00
Jeff Sharkey
a00521b3a0
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
2017-10-18 21:01:38 +00:00
Jeff Sharkey
a829548c12
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
2017-10-18 21:00:49 +00:00
Jeff Sharkey
a637e31547
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
2017-10-18 20:40:16 +00:00
Jeff Sharkey
2a2d92eee8
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
2017-10-18 20:39:11 +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
