TreeHugger Robot
aa63f727d7
Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316
Change-Id: I35c3a5e629ee537d127edef24200985fa0038b0b
2021-05-13 04:46:17 +00:00
Hugh Chen
7b3da742d1
RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316
Change-Id: Iab901770b71e25819117d5cc4a84813f083e0511
2021-05-13 04:46:14 +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
50b308df2e
[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: aab008b6be
-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: I5492bdd0db4d3ee60faf96a93ec8011a186b471a
2021-05-12 21:11:37 +00:00
Jakub Pawlowski
ed9a891fa1
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 123cb13df8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I4cc43b913f4d2b3a15355bcf0be91b2e63d6a2ed
2021-05-12 21:11:26 +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
Lucas Lin
b6e2b4239c
Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3
am: aa307b03a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475
Change-Id: I460d308ab370a662b63a43c7e027e355c7d36130
2021-05-12 17:59:57 +00:00
Lucas Lin
aa307b03a9
Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475
Change-Id: I18cd6578c4cec746aa1cfaba60822d857fab9b8d
2021-05-12 17:23:45 +00:00
Lucas Lin
2e7309ffd3
Merge "Use [set|get]PrivateDnsMode directly"
2021-05-12 17:09:50 +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
cefbb1d83a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I402572a820a93daf549d86a3345d3d861205d302
2021-05-11 14:30:51 +00:00
TreeHugger Robot
84ed78af0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Ife34138bc4382a1f63098546ffa67047d6a8e9c5
2021-05-11 14:30:44 +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
63cc6f167a
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
am: 9724c735da
am: fc721d09cb
am: 94e5b18951
am: 045aa65893
am: 9ebe07d216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I9807b38cc41d0a6318ba6514e850320472f4eac4
2021-05-11 06:58:44 +00:00
Hugh Chen
445869a724
[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
am: e90fdbf747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie8f2d68082238c1a5f67cef2fcb31b5228e4baf6
2021-05-11 06:58:43 +00:00
TreeHugger Robot
a6f32496f2
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
am: 38a2b32e94
am: 24ef90eaaa
am: e5e19dd41a
am: 0e37bc27a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I72ec88755fd1d41d47d2850f6b7bc33de49601c1
2021-05-11 06:58:33 +00:00
Hugh Chen
47666c2d15
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a
-s ours am: 8a4f60b143
am: 3607e825b9
-s ours am: 392fb7a4f7
am: 425430345d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If5e9c837a6abe536c14c4714ceb853cafc760052
2021-05-11 06:58:32 +00:00
TreeHugger Robot
3942491a7f
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 256de04464
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ie069b79899d0f1ec2804eb73a6a6c61f66dcfe17
2021-05-11 06:58:23 +00:00
Hugh Chen
8bf67a7f4b
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
am: 7b05629834
-s ours am: effac8a0c1
am: 6fee770ea0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I1067439941b49387c0c12d7945a1741a622c5dae
2021-05-11 06:58:22 +00:00
TreeHugger Robot
8be84e5e36
Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85
am: e790b378c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: Iad2d26bd6f41cb3aead971faa398a889db384b29
2021-05-11 06:58:14 +00:00
Hugh Chen
c740d7ad82
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
-s ours am: 933f807885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: If30e312d4b6c4e1d738f2549ff83455e942c3157
2021-05-11 06:58:12 +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