Andras Kloczl
6746add669
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Weng Su
efb2543e93
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
2021-03-05 18:12:04 +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
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
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
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
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
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 4f7edf692f
is in history
Original change: https://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
721f43dcdc
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev
2020-12-08 22:56:46 +00:00
TreeHugger Robot
a91519976e
Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev
2020-12-07 19:19:14 +00:00
Eugene Susla
22864c728b
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: I689123f39fc3399d71f873025605319131ff19ab
2020-12-07 19:01:56 +00:00
Eugene Susla
74ca730b4a
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
Change-Id: Idd2522623b35128ccc207d99d21371aefa0c4454
2020-12-07 18:47:31 +00:00
Eugene Susla
7bd20e27ab
[automerger skipped] RESTRICT AUTOMERGE am: bd4d6d8138
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998691
Change-Id: Ia78ec5e90df9f6b8744c30cde67806eaff01ccbb
2020-12-07 16:45:24 +00:00
Jakub Pawlowski
4f7edf692f
Prevent overlay drawing on top of Bluetooth activity dialog
...
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-11-19 13:47:53 +01:00
Chris Manton
1951d27669
Add bluetooth package to permission request intent
...
Limit the component that may resolve this intent to the
bluetooth package.
Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
2020-11-19 10:20:24 +00:00
Eugene Susla
0c870fd7df
RESTRICT AUTOMERGE
...
Prevent non-system overlays from showing over notification listener consent dialog
Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
2020-11-16 14:47:34 -08:00
Eugene Susla
bd4d6d8138
RESTRICT AUTOMERGE
...
Prevent non-system overlays from showing over notification listener consent dialog
Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
2020-11-05 14:24:50 -08:00
Eugene Susla
2e82aa5d05
RESTRICT AUTOMERGE
...
Prevent non-system overlays from showing over notification listener consent dialog
Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
2020-11-05 12:51:27 -08:00
Sunny Shao
5181948f08
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628
-s ours am: b2eac1654f
-s ours am: e615d96b9b
-s ours am: 6a0a44ba16
-s ours
...
am skip reason: Change-Id I85842db3faa558ea61bc878ca76ff6d8ce1a4b03 with SHA-1 7359b3840f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: Ice249457ed0a3143ea8b494087052567789935b2
2020-08-04 09:04:48 +00:00
Jakub Pawlowski
682c00d893
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423
am: 2094f01676
am: 0b7ce7660c
am: fa8d015bdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I9d95c5c44b0d6379ae3732ba1687c86ad8ab1b6d
2020-08-04 09:04:40 +00:00
Jakub Pawlowski
ea460a8527
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8
am: a0c963ba95
am: 368fc30e37
am: 988d9633c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I531919ef123c1aa829a26a595fcf0d6544ef2578
2020-08-04 09:04:14 +00:00
Sunny Shao
0240abd711
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d
am: fcc0b2872d
-s ours am: e791be54f2
-s ours am: 83cadecf04
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: Idd2cdb719c044148bd3bf099a4397652f040083d
2020-08-04 09:03:27 +00:00
Mill Chen
c54d68ea09
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2
-s ours am: 5045f120af
am: 7bdd4b3273
-s ours am: 5f16b03f50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: Iee5c21fab842219b73c82ae3f0a62673e1430de5
2020-08-04 09:03:04 +00:00
Mill Chen
2bbc2529a8
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae
-s ours am: a6a08263f2
am: 1958831a8c
am: 5c7ca93bf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: If7237344621406198999bcbdbd810a40bbe98a09
2020-08-04 09:02:24 +00:00
Sunny Shao
6a0a44ba16
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628
-s ours am: b2eac1654f
-s ours am: e615d96b9b
-s ours
...
am skip reason: Change-Id I85842db3faa558ea61bc878ca76ff6d8ce1a4b03 with SHA-1 7359b3840f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I001b0d88f1cbc4cf793639fab87df0c54379632c
2020-08-04 08:48:50 +00:00
Jakub Pawlowski
fa8d015bdb
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423
am: 2094f01676
am: 0b7ce7660c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I558bc394013060be07bc4fb76b0e394f8b1e513b
2020-08-04 08:48:41 +00:00
Jakub Pawlowski
988d9633c2
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8
am: a0c963ba95
am: 368fc30e37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I8e629bb072063071da36122eedfeb779ce9407fb
2020-08-04 08:48:31 +00:00
Sunny Shao
83cadecf04
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d
am: fcc0b2872d
-s ours am: e791be54f2
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: I130a98ea9e2d07fd48c2c8acaa4602a2bd6249f0
2020-08-04 08:48:22 +00:00
Mill Chen
5f16b03f50
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2
-s ours am: 5045f120af
am: 7bdd4b3273
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: I6515961532875a1030dff6d99660017acdbc35e1
2020-08-04 08:48:16 +00:00
Mill Chen
5c7ca93bf1
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae
-s ours am: a6a08263f2
am: 1958831a8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: Id92037ce698599cb422700f9bafd7f1f54e45779
2020-08-04 08:48:03 +00:00
Sunny Shao
e615d96b9b
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628
-s ours am: b2eac1654f
-s ours
...
am skip reason: Change-Id I85842db3faa558ea61bc878ca76ff6d8ce1a4b03 with SHA-1 7359b3840f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I2df4dc15510dd99bc6e340f7d56157c9d1b58c2b
2020-08-04 08:37:13 +00:00