TreeHugger Robot
e0a922612f
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev
2021-03-04 23:48:51 +00:00
Weng Su
f71502fb10
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I578a0db27ddf400017d53edadcb13938f398210b
2021-03-04 23:05:59 +00:00
Weng Su
05d6fa9bcb
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
2021-02-03 10:00:07 +00:00
Weng Su
32d5d3a3a3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
2021-02-01 03:45:27 +00:00
Weng Su
faa5f6b5f6
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
2021-02-01 03:42:15 +00:00
Weng Su
58b0f2d5b3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
2021-02-01 03:39:30 +00:00
Bryan Ferris
857f330841
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41680fe10178c008dbf5a173f8c73892cb49422d
2021-01-08 03:17:10 +00:00
Bryan Ferris
f5477b05d9
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5
2021-01-08 02:56:12 +00:00
Bryan Ferris
12033fe425
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23717e289650bb8996db1e51e601b78515cdd81b
2021-01-08 02:12:14 +00:00
Bryan Ferris
8a79a4314d
Merge "RESTRICT AUTOMERGE Update String" into pi-dev
2021-01-08 01:35:51 +00:00
TreeHugger Robot
0b9260031d
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5baf77f1f44a4bcc5c6f6632c3658a1777f5af17
2021-01-07 08:19:36 +00:00
Hugh Chen
13a927cb9c
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6926664e21281b3f9567e430b62837ae09c02cd
2021-01-07 08:19:34 +00:00
TreeHugger Robot
af29a157db
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf935ec22f8f61936be068b4771af406ae56599b
2021-01-07 08:05:54 +00:00
Hugh Chen
5108e1bd83
RESTRICT AUTOMERGE Update String am: 19aeca103d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4b9032a22e5306c5e10ff54f75dd4739199605
2021-01-07 08:05:52 +00:00
TreeHugger Robot
c0cd669bef
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev
...
* changes:
RESTRICT AUTOMERGE Update String
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
2021-01-07 07:22:54 +00:00
Hugh Chen
fc0292dc19
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3dafec35dab7457e6301017b49cd9b3b92491869
2021-01-07 02:40:55 +00:00
Hugh Chen
d62def70c7
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e04a58a35ea2c11731a8ec2e8661080e28ccd77
2021-01-07 02:40:54 +00:00
TreeHugger Robot
6bae86bec6
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1180cd764b23ee4687e353777c68be177c2b71aa
2021-01-07 02:40:47 +00:00
Hugh Chen
84f9417fa2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I237872bf9d2d67b2da1087ebedd0c753b00bcfd2
2021-01-07 02:16:44 +00:00
Hugh Chen
535f5ba053
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I872358cea725ef692d6193a6d09eca966ecc3e8d
2021-01-07 02:16:43 +00:00
TreeHugger Robot
5bd40911f5
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb64d2ddbcf8659ff32029b93a266e89ed04cde5
2021-01-07 02:16:37 +00:00
Hugh Chen
77d2c798e5
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8d018bfd516557b7a643842a1538e59053f1706e
2021-01-07 01:56:51 +00:00
Hugh Chen
5036eee733
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec4bc73ee0fd32c31d67f8bb5fef7b1c1e31e32c
2021-01-07 01:56:50 +00:00
TreeHugger Robot
c5f7e582b4
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4601e6a2be1265e01baea5e73f34d7989d6fcad
2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e109407102ce058e806f3a239882dc8abaa36a7
2021-01-07 01:55:49 +00:00
TreeHugger Robot
1a6a1b12ef
Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev
2021-01-07 01:27:50 +00:00
Hugh Chen
085f70d48d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:34:43 -08:00
Hugh Chen
19aeca103d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:34:05 -08:00
Hugh Chen
bbe765f992
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:33:52 -08:00
Hugh Chen
ccbe74f555
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:33:12 -08:00
Hugh Chen
01a50db645
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:32:58 -08:00
Hugh Chen
48ec74592d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:31:39 -08:00
Hugh Chen
9037e43fa8
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:31:22 -08:00
TreeHugger Robot
f49e9d2196
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Jakub Pawlowski
24c8adbd0d
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692fhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e6c8911bbb7a22386468a0d077826151f7faceb
2020-12-09 13:48:57 +00:00
TreeHugger Robot
635029b87f
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
Jakub Pawlowski
d35af468b7
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692fhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I245a20b64373500c886a47d18da39500fd248c0f
2020-12-09 13:03:47 +00:00
TreeHugger Robot
cfdae774cd
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
Jakub Pawlowski
b15b6450fa
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692fhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26950e18ca79bb70e0a91492997242934ec19641
2020-12-09 12:16:57 +00:00
TreeHugger Robot
2117006bc6
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev
2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad
Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522
Prevent overlay drawing on top of Bluetooth activity dialog
...
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
TreeHugger Robot
4c4f83eb21
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev
2020-12-08 22:56:46 +00:00
TreeHugger Robot
a9892de23f
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a415856595ff465a67d7312d2d9c09a410e87af
2020-12-07 20:02:48 +00:00
Eugene Susla
bfee0284e1
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05 am: c8d81959a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8bb775b57acd051c5ce9658cdb0faeac152890f
2020-12-07 20:02:46 +00:00
