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
cb2b575a9d
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: Iaf718af21458079e30afc205e0888bb7e1da58ca
2021-05-11 06:18:12 +00:00
Hugh Chen
e914289a2c
RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442
Change-Id: I5c756e1ae08c73f8a20ceacb106eb51b9cc3267b
2021-05-11 06:18:11 +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
TreeHugger Robot
f45fa1bf85
Merge changes Ia51528f2,Id27a7809 into rvc-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:28 +00:00
TreeHugger Robot
4074cd5e48
Merge changes Ia51528f2,Id27a7809 into qt-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:19 +00:00
Jakub Pawlowski
68f799a4c6
Prevent drawing on top of DevicePickerActivity
...
Bug: 182584940
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
2021-05-10 19:50:49 +02:00
TreeHugger Robot
2450eeb436
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-07 23:17:12 +00:00
Bill Yi
b5d257a72d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib60837c4552e1516120c5c6f988fc4b103788f4a
2021-05-07 16:50:54 +00:00
Bill Yi
3bc6bf4361
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33d29fb6c9a4362b326a72b354aa44a219b813ba
2021-05-07 16:47:30 +00:00
TreeHugger Robot
fd32dc93c9
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: Ia72b0e0d3827762aed6b92b100d5979df3f130f0
2021-05-06 06:53:25 +00:00
TreeHugger Robot
21ab21168b
Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev
2021-05-06 06:30:13 +00:00
Weng Su
7a8de548ce
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ia231ae0efc338828b1cdf84d1330234b10af0aaa
2021-05-06 00:42:38 +00:00
Weng Su
41b7d11496
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I76f3b2ce80dd10bffb768862de34bc94b1f3d4b2
2021-05-06 00:16:30 +00:00
Weng Su
632eb0d54a
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I45816ca240725b57db5a68ac1b960dab5b8f1b0b
2021-05-05 23:59:31 +00:00
Hugh Chen
2deb2829ea
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-04 08:17:35 +00:00
Hugh Chen
f727d5cf2a
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-04 08:11:01 +00:00
Hugh Chen
51755e9a33
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-04 06:04:05 +00:00
Hugh Chen
5de62d1955
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-04 06:00:16 +00:00
Bill Yi
c73e6bf08d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2ca2d581603839530c4ed567babd3ee82442234e
2021-05-04 00:04:12 +00:00
TreeHugger Robot
fb47f1e143
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-30 02:35:40 +00:00
Bill Yi
6bb78b6d1b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I273a20694088e7716213b38d7983319fc10ef3fb
2021-04-29 20:52:24 +00:00
Bill Yi
9b1f0ab131
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97875f1775c63f4a62f82808da766d37da190f2f
2021-04-29 20:48:53 +00:00
Weng Su
1f24c6a968
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 14:38:27 +00:00
Weng Su
649bed1524
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 13:11:33 +00:00
Tsung-Mao Fang
656dcf8334
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours am: 4c05b195d7
-s ours am: a66212e11d
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: Ia31fdf9137868aa85df1ea723f94e6d0092c3f93
2021-04-29 07:22:51 +00:00
Tsung-Mao Fang
a66212e11d
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours am: 4c05b195d7
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I8cf58ae2e0a0632dc97b2cb049225959fd570828
2021-04-29 07:06:42 +00:00
Tsung-Mao Fang
4c05b195d7
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I08c75393a497f2d3784ea89376c5a0d0abf7517e
2021-04-29 06:51:51 +00:00
Tsung-Mao Fang
4d7853f35c
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I1433418c4c0ffbf0e0337f6a03c03c22d594d349
2021-04-29 06:38:45 +00:00
Tsung-Mao Fang
26f3013c32
Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: Iac38c0d7f7517c8d4ecac036e73524d37c66fb6e
2021-04-29 06:21:38 +00:00
TreeHugger Robot
e8413529ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 16:16:39 +00:00
TreeHugger Robot
c430db5ca3
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-27 15:55:21 +00:00
Tsung-Mao Fang
92d5e58003
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: If97943cb25cbbe5388a9b5d28faa50b4df156aad
2021-04-27 12:55:29 +00:00
Tsung-Mao Fang
f470b78ff2
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I4dd08163fb97a16c88aa23bdc39851b327034940
2021-04-27 12:30:50 +00:00
Tsung-Mao Fang
6ac45a7ceb
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I80b527b2bb891b3944a11ceecf296fdefaefff72
2021-04-27 12:15:53 +00:00
Bill Yi
4012b44f4f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I829f3d222f9d37b06d9d6f3408f0f67297162a76
2021-04-27 11:30:15 +00:00
Bill Yi
02a535e27d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f604c21a5a6dc46c093cab5eadd178e5b931837
2021-04-27 11:26:41 +00:00
Hugh Chen
c2adcb2d3a
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will not allow to set package name and class name to avoid
the attacker.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
(cherry picked from commit 8adedc6249
)
2021-04-26 03:45:59 +00:00