Commit Graph

659609 Commits

Author SHA1 Message Date
Robert Carr
bb40e5e7fd [automerger skipped] DO NOT MERGE: WM: Call Transaction#sanitize am: d1de60acda -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16804436

Change-Id: I4db405693ba04a3eec41b8f89fd2a2c0f08c7a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 22:31:55 +00:00
Rob Carr
0d84110c37 Merge "DO NOT MERGE: WM: Call Transaction#sanitize" into sc-v2-dev 2022-04-05 22:14:00 +00:00
Nader Jawad
f0f218dd01 Merge "Update the global light position based on the rotation of the surface." into sc-v2-dev 2022-04-04 22:27:36 +00:00
TreeHugger Robot
8c10a6aa0d Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: I892a79e6b627eb1e8e58007613a5855b7e74250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 15:06:37 +00:00
TreeHugger Robot
5b62c51502 Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071224

Change-Id: Ib7bf62ea0ad68e3a104d426f7f1d912597cc471e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 14:46:51 +00:00
TreeHugger Robot
be7735efcb Merge "Prevent exfiltration of system files via user image settings." into sc-dev 2022-04-01 14:29:48 +00:00
Derek Sollenberger
832342d7ed Update the global light position based on the rotation of the surface.
Vulkan enables clients like HWUI to manage buffer rotation directly, but
in doing so HWUI must transform any point lights so that they end up in
the correct place relative to the display.

Bug: 195934485
Bug: 205493984
Test: atest CtsUiRenderingTestCases
Change-Id: I84b43ad5f422b042c40e89477c31685b7726ce3f
Merged-In: I84b43ad5f422b042c40e89477c31685b7726ce3f
(cherry picked from commit 0784f240b8)
2022-04-01 13:37:33 +00:00
TreeHugger Robot
b9573bc095 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I7c745490d1c259c67244b740fc5941d08bf2faca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:52:36 +00:00
Oli Lan
03b2b4d180 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I8c2ddb167b04561a822608aa3adc4458f7b546a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:52:29 +00:00
TreeHugger Robot
2f5a38fcab [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I308b372b6946e7368535bbd5fb43a3988f5e24fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:36:54 +00:00
Oli Lan
90f9e26f77 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I48ef33ccadeaa8156f3995af9ec044a0f3d28af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:36:43 +00:00
TreeHugger Robot
ce83bd7860 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I1dfc5c3ca4833559ce1e69dacec1cca1dcf88f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:18:59 +00:00
Oli Lan
fc3dc6e083 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I48e8e94d01e2389d60e88b3613e420eae1029a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:18:52 +00:00
TreeHugger Robot
263e7f5af1 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: If7590cdc14f8e54fab61a60ae2554af8d1203d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:55:26 +00:00
Oli Lan
42ce04bda8 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I3e326c5956805fa28de724b38deaf1f76c9c3afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:55:13 +00:00
TreeHugger Robot
49903f64b5 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I1a456fa7eec0d7e30b075709e758aa73681fddc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:29:45 +00:00
Oli Lan
8ad62a15f7 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I1dc9ab48fc62f35935bb959acafb66725f1cdd19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:29:27 +00:00
TreeHugger Robot
0fdbb79d9c Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I219f4c00fc8b13a7df45deed925ba9b0db7433f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:51:55 +00:00
Oli Lan
9b7e9a00b8 RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663

Change-Id: I7be9a10eaa67ba96c3ef905fbb3a88b3ce6d44b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:51:51 +00:00
TreeHugger Robot
6923c0d102 Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev 2022-03-30 18:33:40 +00:00
Oli Lan
9c4a46cae8 Prevent non-admin users from deleting system apps. am: 6c870e1579 am: 15ab50ec29 am: d719add201 am: a6038bd5cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864

Change-Id: I688f747552cc32683f855c777762bf135291eaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:06:37 +00:00
Oli Lan
a6038bd5cc Prevent non-admin users from deleting system apps. am: 6c870e1579 am: 15ab50ec29 am: d719add201
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864

Change-Id: I8f57f2990d6c1e2b0f52331bf6f7d1663cf66ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 14:50:34 +00:00
Oli Lan
d719add201 Prevent non-admin users from deleting system apps. am: 6c870e1579 am: 15ab50ec29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864

Change-Id: Ie4d1088736fb3f99d8f8a20c9cf1e8eb87a674cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 14:33:58 +00:00
Oli Lan
15ab50ec29 Prevent non-admin users from deleting system apps. am: 6c870e1579
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17408864

Change-Id: I40bc39502ae92a42aa44a6ed89fb4079aec52048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 14:16:04 +00:00
Oli Lan
a7621e0ce0 RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.
This addresses a security issue where the guest user can remove updates
for system apps.

With this CL, attempts to uninstall/downgrade system apps will fail if
attempted by a non-admin user.

This is a backport of ag/17352264.

Bug: 170646036
Test: manual, try uninstalling system app update as guest
Change-Id: I5bbaaf83d035c500bfc02ff4b9b0e7fb1e7c2feb
Merged-In: I4e959e296cca9bbdfc8fccc5e5e0e654ca524165
2022-03-30 14:02:19 +00:00
TreeHugger Robot
f709e34b90 Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev 2022-03-29 20:19:40 +00:00
Oli Lan
6c870e1579 Prevent non-admin users from deleting system apps.
This addresses a security issue where the guest user can remove updates
for system apps.

With this CL, attempts to uninstall/downgrade system apps will fail if
attempted by a non-admin user.

This is a backport of ag/17352264.

Bug: 170646036
Test: manual, try uninstalling system app update as guest
Change-Id: I79c3bf303e729e00d8fb12c40330bc10c5ffec6e
Merged-In: I4e959e296cca9bbdfc8fccc5e5e0e654ca524165
2022-03-29 16:14:46 +00:00
TreeHugger Robot
c0b5023cb2 Merge "Limit broadcast by user" into sc-v2-dev 2022-03-29 14:32:13 +00:00
Rubin Xu
e56c084d4b Merge "Secure REMOTE_BUGREPORT_DISPATCH" into sc-v2-dev 2022-03-28 10:10:02 +00:00
Tom Chen
2f44835733 Merge "[DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845" into sc-v2-dev 2022-03-25 22:04:43 +00:00
TreeHugger Robot
24506955d1 Merge "RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task" into sc-v2-dev 2022-03-25 19:52:44 +00:00
Ming-Shin Lu
1060493404 RESTRICT AUTOMERGE: Polish IME transition from fullscreen task to split-screen task
As the new split-screen behavior that the root task of the split-screen
can be in the recents task, so using quick switch can switch between
the split-screen task and other fullscreen tasks.

So if the IME shown on the fullscreen task, when quick switch to
the split-screen task, basically the expected result will be IME
attached on the fullscreen task then won't expect IME moved to the
split-screen task.

However, the issue case is that seen the IME flicker on top of the
split-screen task and then disappeared.

The root case is in DC#computeImeParent didn't consider to not change
the new IME surface parent while the next IME input target has not yet
updated and settled the new IME visiblity, so IME may flicker if
changing the new IME parent too early.
(Typically the IME parent will be on the root displayArea when the
next target task is in multi-window mode)

We do defer changing IME parent from CL[1] when shouldImeAttachedToApp is
true, but this check didn't applied when switching to the split-screen
task, because shouldImeAttachedToApp will be false when the next IME
layering taget is in multi-window mode.

Simply move the above defer update IME parent logic out from
shouldImeAttachedToApp check to fix this IME flicker issue.

Also, remove shouldImeAttachedToApp check in
InsetsPolicy#adjustVisibilityForIme when the window is in insets frozen
state waiting for the next input started. Since there is no strong
reason to froze IME insets only when switching on fullscreen tasks.

[1]: I01b67b9a7fdf04f23ab05c244281f42518352ca5

Fix: 210391817
Test: atest DisplayContentTests#testComputeImeParent_inputTargetNotUpdate
Test: atest WindowStateTests#\
   testAdjustImeInsetsVisibilityWhenSwitchingApps_toAppInMultiWindowMode

Change-Id: I332c0e4fff62df5d7b793eda2767bb58fe85a938
2022-03-26 01:32:16 +08:00
Ayush Sharma
140e9ba400 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ia6430a6ec27185f33c08cd8120f9fa485370192d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:32:15 +00:00
Ayush Sharma
eba9a7f06e Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: If0707013d26acad6484e8f986d91b7a2a0f2d986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:08:28 +00:00
Ayush Sharma
65897f0efc Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Idab91471c022a0b2fce1ed765eda0a653eeb88b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:51:04 +00:00
TreeHugger Robot
97e13dbd32 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev
* changes:
  [DO NOT MERGE] Do not allow Bluetooth enabling during device shutting down
  [DO NOT MERGE] Handle SHUTDOWN Intent in BluetoothManagerService
2022-03-25 16:17:13 +00:00
Matt Pietal
6fea516344 Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev 2022-03-25 15:12:06 +00:00
Bernardo Rufino
5bc80b693d Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev 2022-03-25 13:55:52 +00:00
Ayush Sharma
40a1fd6bba Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: If3cd2a65495e018a9d9800ba7c9fa52ba49014f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 13:22:18 +00:00
Ayush Sharma
d06ee6d79d Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ie09dadfc516757cc6237538c55b9a70c9faee9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 13:00:47 +00:00
Ayush Sharma
936c9f03ea Fix security hole in GateKeeperResponse am: 5d2176df69 am: 25356fba35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: I440c492f0199a89f61356c21cc0f0be8d0649199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 12:54:22 +00:00
Ayush Sharma
efb797700e Fix security hole in GateKeeperResponse am: 658c53c47c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: I809144ca234b9cd144b59a4666f75c5b18cc6b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 12:41:07 +00:00
Ayush Sharma
25356fba35 Fix security hole in GateKeeperResponse am: 5d2176df69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385

Change-Id: Iaa20c957e0944a9ce72c1584d93c352d7ffeee40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 12:35:07 +00:00
TreeHugger Robot
d3e2ea81f2 Merge "Use flag to control the restart period value." into sc-v2-dev 2022-03-25 12:13:19 +00:00
Joanne Chung
c1840b3fd5 Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev 2022-03-25 10:54:51 +00:00
Bernardo Rufino
a451d5bae2 Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE
As part of go/untrusted-touches for S, we blocked touches from passing
windows of different UIDs regardless of targetSdk. For SAWs, we applied
an opacity rule where apps would be able to let touches pass through
(usually via FLAG_NOT_TOUCHABLE) as long as their cumulative opacity in
the touch area wasn't greater than 0.8.

This resulted in some overlay apps being broken, which we expected and
saw to some extent in df/dp/beta, but we had reached out and some apps
fixed the issue. But the issue seems to be more widespread and OEM has
escalated the issue, reporting it to be affecting them more severely
(see bug).

So, we automatically make SAW + FLAG_NOT_TOUCHABLE windows have 20%
transparency to try to honor FLAG_NOT_TOUCHABLE and let touches pass
through. Note that if the app has overlapping windows the cumulative
opacity would be taken into consideration and the touch could still be
blocked, but none among the apps I checked did that.

Test: atest -d android.server.wm.WindowUntrustedTouchTest
Test: Install and enable you.in.spark.energy.curved, verify touches work
      in the top part of the screen.
Bug: 218777508
Merged-In: I3a74e1cc43a36171ee10fbf68c4bfff538eee661
Change-Id: I3a74e1cc43a36171ee10fbf68c4bfff538eee661
2022-03-25 09:35:57 +00:00
jonerlin
68ce540e60 [DO NOT MERGE] Do not allow Bluetooth enabling during device
shutting down

Bug: 207521630
Test: reboot device in BLE_ON state, check log
Change-Id: I5e68ecd7816a6e636ebb9cef070dd32fbd9bf3c4
2022-03-25 08:48:53 +00:00
jonerlin
b20910f989 [DO NOT MERGE] Handle SHUTDOWN Intent in BluetoothManagerService
Bug: 207521630
Test: reboot device and check log
Change-Id: I23f8bfb1c6d5fcf9a09c9baaa1b6555188fe0e2e
2022-03-25 08:47:46 +00:00
Tiger Huang
baedc4fdda Merge "Fix setSystemBarsAppearances" into sc-v2-dev 2022-03-25 06:15:12 +00:00
Joanne Chung
475800990a Use flag to control the restart period value.
Bug: 224618257
Test: adb shell cmd device_config get/put voice_interaction \
restart_period_in_seconds works fine
Test: the value is expected by command: adb shell dumpsys \
voiceinteraction | grep RESTART_PERIOD_SECONDS

Change-Id: Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb
Merged-In: Icd8d19c2a482d0d6b9bf0432e2176ca10f3bd2eb
(cherry picked from commit 46e6944804)
2022-03-24 23:14:25 -07:00