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

Merge "Ignore windowDisablePreview when launching from system surface." into sc-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2021-04-09 01:09:34 +00:00
committed by Android (Google) Code Review
parent db4ff9ef89 c5db55023b
commit a8b73e2075
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1887,6 +1887,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
return selectedTheme;
}
// Whether this activity launched from system or Home or SystemUI
private boolean launchedFromSystemSurface() {
return launchedFromUid == Process.SYSTEM_UID || launchedFromUid == Process.ROOT_UID
|| launchedFromHomeProcess
|| mAtmService.getSysUiServiceComponentLocked().getPackageName().equals(
launchedFromPackage);
}
private boolean validateStartingWindowTheme(String pkg, int theme) {
// If this is a translucent window, then don't show a starting window -- the current
// effect (a full-screen opaque starting window that fades away to the real contents
@@ -1913,7 +1921,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
"Translucent=%s Floating=%s ShowWallpaper=%s Disable=%s",
windowIsTranslucent, windowIsFloating, windowShowWallpaper,
windowDisableStarting);
if (windowIsTranslucent || windowIsFloating || windowDisableStarting) {
// If this activity is launched from system surface, ignore windowDisableStarting
if (windowIsTranslucent || windowIsFloating
|| (windowDisableStarting && !launchedFromSystemSurface())) {
return false;
}
if (windowShowWallpaper