Commit Graph

28184 Commits

Author SHA1 Message Date
Antony Sargent
db6e747ab9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
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

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
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

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
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

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846 Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3 Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
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
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  -s ours

Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016
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  -s ours

Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
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  -s ours

Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da
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  -s ours

Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf
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  -s ours

Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a
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  -s ours

Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411
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  -s ours

Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81
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  -s ours

Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4
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  -s ours

Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9
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
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  -s ours

Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
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  -s ours

Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
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  -s ours

Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
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  -s ours

Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
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  -s ours

Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
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

Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
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

Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
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

Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
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
0c59dca90d Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b
am: adabc7561b

Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
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

Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
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

Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
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

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
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
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

Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
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

Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
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

Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
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

Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
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

Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
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

Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
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

Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
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

Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
2017-10-18 19:39:10 +00:00
Jeff Sharkey
07c4c8efed 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
2017-10-18 19:27:49 +00:00
Jeff Sharkey
416ecb20a3 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
2017-10-18 19:27:11 +00:00
Jeff Sharkey
91b1cb4b23 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
2017-10-18 19:21:53 +00:00
Jeff Sharkey
fad1e6a315 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9
am: c1ebc09ff0

Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
2017-10-18 19:20:50 +00:00
Jeff Sharkey
a954c8c716 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39
am: 2bf724509c

Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
2017-10-18 18:57:57 +00:00
Jeff Sharkey
c1ebc09ff0 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787
am: 9ba609cef9

Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
2017-10-18 18:57:03 +00:00