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
Hugh Chen
425430345d
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I739376349571d5d917a34eabf121f1347626379a
2021-05-11 06:41:00 +00:00
TreeHugger Robot
256de04464
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I8462c36866641491631cfcc8aed8bdde8b5ea984
2021-05-11 06:40:53 +00:00
Hugh Chen
6fee770ea0
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7fdb4bbb527008c0f64cab9d8c101f4301f92c62
2021-05-11 06:40:52 +00:00
TreeHugger Robot
e790b378c3
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Ic3753ba1c4945113050f87feb611f23d1cd5b79e
2021-05-11 06:40:46 +00:00
Hugh Chen
933f807885
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours
...
am skip reason: skipped by user hughchen
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I27a2ef608420e73b9ae797cbcdc73d82228312c5
2021-05-11 06:40:46 +00:00
TreeHugger Robot
045aa65893
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3a7d52f4c65391196464641f9cf20436b58762c1
2021-05-11 06:32:20 +00:00
Hugh Chen
8dbc94fcbe
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
2021-05-11 06:32:19 +00:00
TreeHugger Robot
e5e19dd41a
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
2021-05-11 06:32:12 +00:00
Hugh Chen
392fb7a4f7
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
2021-05-11 06:32:04 +00:00
Hugh Chen
effac8a0c1
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
2021-05-11 06:32:02 +00:00
TreeHugger Robot
94e5b18951
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I0deadd94935bad2a6cae221c11054eb33557f22e
2021-05-11 06:24:14 +00:00
Hugh Chen
fe87f1ac34
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours am: 9bbcb55a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I668163c48cd6de7ac9236a878550d7a80eb9c7ac
2021-05-11 06:24:14 +00:00
TreeHugger Robot
24ef90eaaa
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If31a9fca9d45ae3d0408874a34427f8ca8984f49
2021-05-11 06:24:06 +00:00
Hugh Chen
3607e825b9
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
2021-05-11 06:24:06 +00:00
TreeHugger Robot
fc721d09cb
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie84e9ff000ff0860ec83d704ffe61c2d74164f96
2021-05-11 06:18:45 +00:00
Hugh Chen
9bbcb55a23
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours am: 53ff99b8b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie3e897ff1e8259b5d24dc1291e0683f325c2d7fe
2021-05-11 06:18:44 +00:00
TreeHugger Robot
38a2b32e94
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I0431e3135de7bb952fa8e8185b6eef44a1c24dc7
2021-05-11 06:18:37 +00:00
Hugh Chen
8a4f60b143
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
2021-05-11 06:18:35 +00:00
TreeHugger Robot
9724c735da
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ia0822c53ab65ce90334aee521be99886945d41e8
2021-05-11 06:16:53 +00:00
Hugh Chen
53ff99b8b4
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I23ab4bb935d65f3afda82333291d0ea7a187428a
2021-05-11 06:16:53 +00:00
TreeHugger Robot
54f47d0953
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
2021-05-11 06:16:43 +00:00
Hugh Chen
7b05629834
RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
2021-05-11 06:16:42 +00:00
TreeHugger Robot
f9c99c40d2
Merge changes Ia51528f2,Id27a7809 into pi-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-11 06:03:54 +00:00
TreeHugger Robot
75e33fb315
Merge changes Ia51528f2,Id27a7809 into oc-mr1-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-11 06:03:45 +00:00