Commit Graph

21304 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jeff Sharkey
019f31b499 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:34 +00:00
Suprabh Shukla
a92a7e400f Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours
am: 694ab09ff3  -s ours

Change-Id: Ib0587f73a715928275159027c09286127d063684
2017-08-16 19:55:02 +00:00
Suprabh Shukla
694ab09ff3 Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours
am: 29c1777ca5  -s ours

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197
2017-08-16 19:48:32 +00:00
Suprabh Shukla
29c1777ca5 Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours
am: 9acf640efd  -s ours

Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0
2017-08-16 19:44:31 +00:00
Suprabh Shukla
0dba51f9f0 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
am: 78a9d598f1  -s ours

Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
2017-08-16 19:43:31 +00:00
Suprabh Shukla
9acf640efd Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours
am: 889036189b  -s ours

Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
2017-08-16 19:40:32 +00:00
Suprabh Shukla
78a9d598f1 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2  -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea  -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
2017-08-16 19:37:01 +00:00
Suprabh Shukla
93a9e9f7f2 Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
2017-08-16 19:32:31 +00:00
Suprabh Shukla
d27e28eab7 Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
779237e37f Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
2017-08-16 19:25:59 +00:00
Suprabh Shukla
9ffee0d534 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.


Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:43:10 +00:00
Suprabh Shukla
de5df8b090 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:40:37 +00:00
Suprabh Shukla
af5d8b9b03 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 02:37:37 +00:00
Phil Weaver
a801d5e8ec Merge "Back-port ag/2491664" into mnc-dev
am: 7b3ca9886e

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
2017-07-18 23:29:03 +00:00
Phil Weaver
7b3ca9886e Merge "Back-port ag/2491664" into mnc-dev 2017-07-18 23:21:17 +00:00
Phil Weaver
4c70016a94 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
am: 4b029f8b0d

Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
2017-07-18 20:38:01 +00:00
Phil Weaver
f6b1267780 Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
am: 9d889600a9

Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
2017-07-18 20:35:06 +00:00
Phil Weaver
4b029f8b0d Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
am: c84dc8feb3

Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
2017-07-18 20:28:31 +00:00
Phil Weaver
9d889600a9 Back-port ag/2491664 am: 1d21738bd6
am: 4150739791  -s ours

Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
2017-07-18 20:25:56 +00:00
Phil Weaver
c84dc8feb3 Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b

Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
2017-07-18 18:36:26 +00:00
Phil Weaver
cbbdc18c7b Merge "Back-port ag/2491664" into lmp-dev
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
2017-07-18 18:26:18 +00:00
Phil Weaver
4150739791 Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
2017-07-18 18:26:16 +00:00
Phil Weaver
41492a1e2c Merge "Back-port ag/2491664" into lmp-dev 2017-07-18 18:19:39 +00:00
Phil Weaver
cc395469bc Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-17 16:38:07 -07:00
Phil Weaver
1d21738bd6 Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-13 00:03:49 +00:00
Phil Weaver
4a40ef7688 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4 am: b72ffa47a4 -s ours
am: bb12830bf9

Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
2017-07-12 22:23:16 +00:00
Phil Weaver
bb12830bf9 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours am: 98e0930394 -s ours am: df045253a4
am: b72ffa47a4  -s ours

Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
2017-07-12 22:19:08 +00:00