TreeHugger Robot
fe40f85cca
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-09 15:46:04 +00:00
Bill Yi
5a160fbc8d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I377d6f3d7f4af04a0cb9797fe95bff881b17e8b3
2021-04-09 06:59:47 -07:00
Bill Yi
a626332f65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I422132510dd25b392386f53bc9e1a77c5b483bf1
2021-04-09 06:11:06 -07:00
TreeHugger Robot
4602a52b36
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-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: I87e3d728a2c10c857062b706541a26c939b09902
2021-04-06 16:06:59 +00:00
TreeHugger Robot
8ad7f62a65
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-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: Ic3d1e0553dee77abe9930df9f70423f41048af21
2021-04-06 15:20:44 +00:00
Arc Wang
bd35c42fd6
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Ic69d0cc8020b52a65c9d60a03e98e6c8ad753e60
2021-04-06 15:06:21 +00:00
TreeHugger Robot
47c4492d09
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-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: I03ab6cfd3dcf31340f4beacc1782881db3fa7bde
2021-04-06 14:40:35 +00:00
Arc Wang
767f72b09b
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I5a1cc56ebca9f1f9dc289a4622b4db22a62a6f73
2021-04-06 14:19:47 +00: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
Arc Wang
30ab86df65
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I02b3f057bfb03aa1e2d57ba0ce22854df6690bd9
2021-04-06 13:37:25 +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
Arc Wang
4c1e380701
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I21ed6d8435f63c4184f606bdffbd9e7739a04445
2021-04-06 13:01:25 +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
83d11bebe2
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ic9a7c0fb856096e02a20f40fa723a00b62d92819
2021-04-06 12:35:26 +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
e1660daab4
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I19629b5e098a176da1fe21e020deb8a78c6069ad
2021-04-06 11:43:37 +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
e5fe80f5a8
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I347494e3adb066c885d130b72f398d62c68e2ed6
2021-04-06 10:24:10 +00:00
TreeHugger Robot
1dcc4ee8a1
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Id2b2b68996481b1a177a284ef99dbd44bff0946b
2021-04-06 09:59:08 +00:00
TreeHugger Robot
e4749c3458
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I3a5f7ae870c60965676dc776120dc220c336b471
2021-04-06 09:37:39 +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
bcfa963d8c
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: I216ace1db29e22ea1697ad026b5c2203dc3bcfa0
2021-04-06 09:00:37 +00:00
TreeHugger Robot
7a09c0613f
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-06 08:23:13 +00:00
TreeHugger Robot
759dc67158
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev
2021-04-06 08:22:07 +00:00
Pavel Grafov
9ca72695fd
Prevent disconnecting admin-configured VPN am: 735a216da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: Ifdd9d0de8d3b91f4cef6dbf470bd43f0f2ba7d47
2021-04-02 19:02:16 +00:00
Pavel Grafov
735a216da3
Prevent disconnecting admin-configured VPN
...
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.
Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-04-01 12:39:32 +01:00
TreeHugger Robot
2103dda97c
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-23 05:05:47 +00:00
Bill Yi
a1d35aad4e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77c6e5117bcfaeac74a85a013190873900e7501d
2021-03-22 20:08:20 +00:00
Bill Yi
5dc25d8afa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69f56fb22074981f0776f0f8b76e98ea83a14d3f
2021-03-22 19:38:12 +00:00
Weng Su
754285bec8
[automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6
-s ours am: 1e8d908cfc
-s ours am: 1a4cf947f5
-s ours am: 097d262fda
-s ours
...
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
is already in history. Skip tag was found from reverted change Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509
Change-Id: I86b3367f08ff5896cd56fe13a77384a723cc2ec5
2021-03-19 05:06:22 +00:00
Weng Su
097d262fda
[automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6
-s ours am: 1e8d908cfc
-s ours am: 1a4cf947f5
-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: Icd1b51ce7924bd3362fe3a1bd37b9ea1043bc03b
2021-03-19 04:23:28 +00:00
Weng Su
1a4cf947f5
[automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1f6
-s ours am: 1e8d908cfc
-s ours
...
am skip reason: skip tag Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6
is already in history. Skip tag was found from reverted change Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509
Change-Id: I7f8489b6c9d256a98b5d4f0dbb30231a1c542cc0
2021-03-19 04:02:57 +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
TreeHugger Robot
3bb6f3afa1
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-15 06:35:45 +00:00
Bill Yi
0c4a622b49
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
2021-03-14 17:36:32 +00:00
Andras Kloczl
4989788b15
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-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: I85edfd864b3d25d5616f65e0b78c630800b8ba7b
2021-03-11 11:04:11 +00:00
András Klöczl
a8dc64691b
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours am: fca809b408
-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: I7dcea0dea2ecbdfd2f997801f8003ae347f49b9b
2021-03-11 11:04:03 +00:00
Andras Kloczl
7ed616c466
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours am: a95829294d
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53017d6891c267f1023198cd5e53887d15c30aeb
2021-03-11 11:03:54 +00:00
Andras Kloczl
cb10105fe1
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-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: I668e9b33db1da19a9c8f3962df55354887d07309
2021-03-11 10:59:57 +00:00
András Klöczl
fca809b408
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-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: Idb18b517ec93e78c3a32d2276948703764387350
2021-03-11 10:59:37 +00:00
Andras Kloczl
4f095b1a6b
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-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: If83710ea2b67104d3f3cbc1ce55f32ed129770cf
2021-03-11 10:42:24 +00:00
András Klöczl
e690821501
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-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: Ic2052e3022c61172aac54fb1855d500eb3f0755a
2021-03-11 10:42:15 +00:00
Andras Kloczl
a95829294d
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
2021-03-11 10:42:06 +00:00
Andras Kloczl
6355d222cd
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0
-s ours am: 373b53a7cc
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I745498eef55d159e98e6d1b2d549fc20a05c59e4
2021-03-11 10:28:59 +00:00