Hugh Chen
f4f2fae306
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 03:14:31 +00:00
Hugh Chen
9356205dfc
RESTRICT AUTOMERGE Update string
...
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5
)
2021-06-18 02:46:16 +00:00
TreeHugger Robot
51f4ffc818
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-15 15:02:11 +00:00
Bill Yi
acf3c5c098
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibdaa7a59ef596ef9bbcd939ba148b62c972100c4
2021-06-15 13:37:16 +00:00
Bill Yi
532ae047f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia1ba0b60387c6aa399159adb1d5f0f5dc2bb9f79
2021-06-15 13:33:58 +00:00
Chen Xu
3bdcdae23f
Merge "UK emergency alert app rename" into rvc-qpr-dev
2021-06-08 19:50:39 +00:00
Chen Xu
3b8c6118c1
UK emergency alert app rename
...
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit f7e3d57023
)
Merged-in: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
2021-06-08 18:09:46 +00:00
TreeHugger Robot
020cfbe13a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-07 04:57:07 +00:00
Bill Yi
bb3b29aa23
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7d61282d38d4d53fd15c2a5d2d9b72777cd8375
2021-06-07 03:34:10 +00:00
Bill Yi
d5ad833f15
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia726dc7609d52ae736e34e5a3a5ef35f0f5104a0
2021-06-07 03:30:43 +00:00
TreeHugger Robot
23e3a2b7f2
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-03 19:01:32 +00:00
Bill Yi
4eb046c301
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia0c5f6521d4f9753287aeefae610ae6168ebac1a
2021-06-03 14:38:44 +00:00
Bill Yi
6df7694b57
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie80bb50e4314ed1517c9cce073508f00232952bb
2021-06-03 14:35:21 +00:00
TreeHugger Robot
4e684f517b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-01 05:55:43 +00:00
Bill Yi
39b57ddbbd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e2b849238606332cab7d4168f157994b3d913f9
2021-05-31 03:58:48 +00:00
Bill Yi
f86b5a5360
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibc82d8b02c404d3f36e19f6291dd013245641f45
2021-05-31 03:55:25 +00:00
TreeHugger Robot
660d37d895
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-27 18:21:27 +00:00
Bill Yi
186570767c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia41b67be42cb2f033d3860f3c3192506bcca4e83
2021-05-26 23:22:59 +00:00
Bill Yi
f8a2c62f84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2948411834089541f69de7ce2d4f1efa9a06c9b6
2021-05-26 23:19:33 +00:00
TreeHugger Robot
64d9cc56c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-25 14:30:07 +00:00
Bill Yi
b57f6bc1df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib5ebb974b502948bf0cde019f6794cc2a569fee1
2021-05-25 06:37:45 +00:00
Bill Yi
6939c1fa2e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9423848ce271f93fbe4cc1045f8ef99f34e601d1
2021-05-25 06:34:22 +00:00
Bill Yi
fb9fbf219d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib996a2402a98bdfa5f1e0ba8550f89bc7a4ea2f9
2021-05-22 12:37:46 +00:00
TreeHugger Robot
e7e5a9afbc
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-20 13:57:45 +00:00
Bill Yi
751558e277
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a2de6f91ee8de5cad4a8edaa66873ddd1c795ef
2021-05-20 06:11:46 +00:00
Bill Yi
43e1bda57a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I183b7e7e5d5e82c5a3ce7814bf65eb6ca7118bdc
2021-05-20 06:08:32 +00:00
TreeHugger Robot
6ab5e4327c
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-18 14:43:32 +00:00
Bill Yi
863787066f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I709fca4e70ea54241c6bb553dbfa327a469021fe
2021-05-18 07:45:52 +00:00
Bill Yi
8cecd68c0c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib190cfbca4b19a2c8281647d630837128ba64c8a
2021-05-18 07:42:30 +00:00
Bill Yi
7b7b6f180b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d2438e12168ac22fedf915c1f1ebb6e28b04ef3
2021-05-13 09:43:43 +00:00
TreeHugger Robot
8b37f0a2cf
Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev
2021-05-13 04:30:42 +00:00
TreeHugger Robot
d8cacc526a
Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-13 01:33:00 +00:00
Jakub Pawlowski
aab008b6be
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours am: 8ae86914d6
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: If34b09d6e20810bb672c0e88ad21d6a8903ddcb8
2021-05-12 20:55:59 +00:00
Jakub Pawlowski
123cb13df8
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I64eb60c0041ffd2f07b2b879fd2daf082a6b331e
2021-05-12 20:55:50 +00:00
Jakub Pawlowski
8ae86914d6
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I1cd894a5924c4afc52256d85f9a19da5a2cede22
2021-05-12 20:36:51 +00:00
Jakub Pawlowski
c714533fd2
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
2021-05-12 20:36:41 +00:00
Jakub Pawlowski
31c29a0791
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I145082eccf613bb5729b67a7f58a34f3c913184e
2021-05-12 20:19:24 +00:00
Jakub Pawlowski
52ea712e3b
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
2021-05-12 20:19:16 +00:00
Jakub Pawlowski
8797825bc1
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I65f86808c2d2455c98c022ad52680597c58ff148
2021-05-12 20:04:53 +00:00
Jakub Pawlowski
d6ed1528cb
Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
2021-05-12 19:47:21 +00:00
Jakub Pawlowski
9d99e0b3ff
Prevent drawing on top of DevicePickerActivity
...
Bug: 182584940
Merged-In: I8b27b397bce1708a42b96b1b647c64e23142c468
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
2021-05-12 19:27:32 +00:00
Jakub Pawlowski
3a2ab54f36
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev
2021-05-12 19:27:19 +00:00
Hugh Chen
c556938807
RESTRICT AUTOMERGE Fix unable to send file via OPP
...
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.
This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.
Bug: 186490534
Bug: 179386960
Bug: 179386068
Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0
)
2021-05-11 15:45:18 +00:00
TreeHugger Robot
9d3c9dd867
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:52 +00:00
TreeHugger Robot
842c67d794
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:11 +00:00
Bill Yi
90b6d35a97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic4a811f25ada99c36d1a521a6086cc940d81449c
2021-05-11 08:57:23 +00:00
Bill Yi
99513c4e86
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I72187de3a8b04a71d8ea473d599dc33258717b2f
2021-05-11 08:54:08 +00:00
TreeHugger Robot
9ebe07d216
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I338cea4bb8314f2490ef37b982d82c4f7f4e35ba
2021-05-11 06:41:09 +00:00
Hugh Chen
e90fdbf747
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
am: fe87f1ac34
-s ours am: 8dbc94fcbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Icf7882fc0640bf49580efee8d38170869af50847
2021-05-11 06:41:08 +00:00
TreeHugger Robot
0e37bc27a2
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I3b95a45ef89a2c7d3c651e67f01dabd45897331d
2021-05-11 06:41:01 +00:00