Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf4f3bc authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Id71a472d51230eb640b3eb7b9d07f4eabf410b72
parents 44fe675e a8b73e20

services/core/java/com/android/server/wm/ActivityRecord.java

+11 −1
Original line number Diff line number Diff line
@@ -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