Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove SystemUI exclusion for sandboxing" into sc-dev am: 12be709039 am: 8d22989fa3

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

Change-Id: I7b002dca0eac96e346b189da251ab9731945ed2e
This commit is contained in:
Naomi Musgrave
2021-05-25 12:24:26 +00:00
committed by Automerger Merge Worker
parent 6f2da0dd7e 8d22989fa3
commit 5327bcf021
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -16,7 +16,6 @@
package com.android.server.wm; package com.android.server.wm;
import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
import static android.app.ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND; import static android.app.ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
import static android.app.ActivityOptions.ANIM_CLIP_REVEAL; import static android.app.ActivityOptions.ANIM_CLIP_REVEAL;
@@ -90,7 +89,6 @@ import static android.content.pm.ActivityInfo.SIZE_CHANGES_SUPPORTED_OVERRIDE;
import static android.content.pm.ActivityInfo.SIZE_CHANGES_UNSUPPORTED_OVERRIDE; import static android.content.pm.ActivityInfo.SIZE_CHANGES_UNSUPPORTED_OVERRIDE;
import static android.content.pm.ActivityInfo.isFixedOrientationLandscape; import static android.content.pm.ActivityInfo.isFixedOrientationLandscape;
import static android.content.pm.ActivityInfo.isFixedOrientationPortrait; import static android.content.pm.ActivityInfo.isFixedOrientationPortrait;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.content.res.Configuration.ASSETS_SEQ_UNDEFINED; import static android.content.res.Configuration.ASSETS_SEQ_UNDEFINED;
import static android.content.res.Configuration.EMPTY; import static android.content.res.Configuration.EMPTY;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
@@ -279,7 +277,6 @@ import android.os.SystemClock;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.permission.PermissionManager;
import android.service.dreams.DreamActivity; import android.service.dreams.DreamActivity;
import android.service.dreams.DreamManagerInternal; import android.service.dreams.DreamManagerInternal;
import android.service.voice.IVoiceInteractionSession; import android.service.voice.IVoiceInteractionSession;
@@ -7474,11 +7471,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
@Override @Override
public boolean providesMaxBounds() { public boolean providesMaxBounds() {
// System and SystemUI should always be able to access the physical display bounds, // System should always be able to access the DisplayArea bounds, so do not provide it with
// so do not provide it with the overridden maximum bounds. // compat max window bounds.
// TODO(b/179179513) check WindowState#mOwnerCanAddInternalSystemWindow instead if (getUid() == SYSTEM_UID) {
if (getUid() == SYSTEM_UID || PermissionManager.checkPermission(INTERNAL_SYSTEM_WINDOW,
getPid(), info.applicationInfo.uid) == PERMISSION_GRANTED) {
return false; return false;
} }
// Do not sandbox to activity window bounds if the feature is disabled. // Do not sandbox to activity window bounds if the feature is disabled.