Commit Graph

27367 Commits

Author SHA1 Message Date
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
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
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
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
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
Jeff Sharkey
2bf724509c DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours
am: 19fa568b39

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

Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
2017-10-18 18:39:25 +00:00
Jeff Sharkey
19fa568b39 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours
am: 45fc104958  -s ours

Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
2017-10-18 18:29:15 +00:00
Jeff Sharkey
5b2a431787 DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 4cfc684346  -s ours

Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
2017-10-18 18:28:28 +00:00
Jeff Sharkey
45fc104958 DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 5ef2cfac97  -s ours

Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
2017-10-11 23:03:25 +00:00
Jeff Sharkey
86cc9a681d DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours
am: 004f90f35e

Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
2017-10-11 20:46:28 +00:00
Jeff Sharkey
b3d4bc8239 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours
am: 89791cb5c3

Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
2017-10-11 20:45:04 +00:00
Jeff Sharkey
004f90f35e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43  -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f  -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
2017-10-11 20:34:40 +00:00
Jeff Sharkey
ba66bb8a43 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
am: 95bbef26d7

Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb

Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
2017-10-11 20:31:41 +00:00
Jeff Sharkey
95bbef26d7 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
2017-10-11 20:28:13 +00:00
Jeff Sharkey
556688abdb DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 019f31b499

Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e
2017-10-11 20:26:40 +00:00
Jeff Sharkey
7c41707eaf DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: f32a4fad5d

Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b
2017-10-11 20:25:11 +00:00
Jeff Sharkey
e38a7f42ab DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 94e678c188

Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11
2017-10-11 20:24:31 +00:00
Jeff Sharkey
5ef2cfac97 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 3f218e8431)
2017-10-03 20:32:03 +00:00
Jeff Sharkey
4cfc684346 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 3f218e8431)
2017-10-03 20:31:54 +00:00
Jeff Sharkey
94e678c188 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 3f218e8431)
2017-10-03 20:31:44 +00:00