Commit Graph

52304 Commits

Author SHA1 Message Date
TreeHugger Robot
d2ee0db550 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev 2021-04-09 15:58:30 +00:00
Arc Wang
636e70fbf2 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I43bb0f47a96719c61c5beb4ddf486b14cbdd6ee8
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-04-07 10:06:45 +08:00
TreeHugger Robot
04c2f0b19a [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours am: a5715ed5c9 -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812

Change-Id: Ic9924a9f19a55616cc0c754a4d7dbda9e02143bb
2021-04-06 14:02:52 +00:00
TreeHugger Robot
a5715ed5c9 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d -s ours
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812

Change-Id: Ife137461365b88bc33cc7e22d72ef4c6b2926357
2021-04-06 13:18:07 +00:00
Arc Wang
89d14a36dc Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Iec105d8ee74d6d2c869072866c4caffbd40d9a19
2021-04-06 13:01:40 +00:00
TreeHugger Robot
f43af46d1d Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev 2021-04-06 12:51:12 +00:00
Arc Wang
bcc7f89f85 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev 2021-04-06 12:37:52 +00:00
Arc Wang
eb2ac6e455 Revert "Hide non-system overlay window on ActivityPicker"
This reverts commit 855b1f428d.

Reason for revert: <b/184623294>

Change-Id: Ie1eb6f86feda56d6444971fa5dfd2c11357fab01
2021-04-06 12:29:38 +00:00
Arc Wang
9513326e44 Merge "Hide non-system overlay window on ActivityPicker" into qt-dev 2021-04-06 11:03:29 +00:00
Arc Wang
8a9fafb37d Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-04-06 11:02:10 +00:00
TreeHugger Robot
d0957376c0 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: If51aba7cfb3495b42335d90a1600734da17d4d42
2021-04-06 09:00:52 +00:00
TreeHugger Robot
7a09c0613f Merge "Hide non-system overlay window on ActivityPicker" into pi-dev 2021-04-06 08:23:13 +00:00
Weng Su
1e8d908cfc [automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509

Change-Id: I0673d0d8115819b39f0d9c3270dc2e98be11c2de
2021-03-19 03:29:28 +00:00
Weng Su
56dc96d1f6 Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev 2021-03-19 02:51:52 +00:00
Weng Su
f4432df069 [DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"
This reverts commit 32d5d3a3a3.

Bug: 174047492
Reason for revert:
Look like the WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS system flag is not supported in the pi-dev branch.

Change-Id: Iec3c28e8c148f83fc171d696b2fc67f359d03eb8
2021-03-18 09:02:20 +00:00
Andras Kloczl
b21072b773 [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41fd0e7c9aaef6aa0f4d0784ba916612f95e89dc
2021-03-11 10:28:53 +00:00
András Klöczl
28539c02dd [automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bfc7671ae0401b97ec24b32c53146926490809f
2021-03-11 10:28:43 +00:00
Andras Kloczl
94ed37dacf [automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e57866c554495b9f8fd8b48b9c03ccde9f8160
2021-03-11 10:24:31 +00:00
András Klöczl
f1125282f9 Merge "Prevent using invalid result uri during multi user image change" into pi-dev 2021-03-11 09:48:07 +00:00
Arc Wang
eac0ba87d0 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-03-11 07:48:07 +00:00
Arc Wang
855b1f428d Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109)
2021-03-11 07:47:37 +00:00
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