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

Commit c5db5502 authored by wilsonshih's avatar wilsonshih
Browse files

Ignore windowDisablePreview when launching from system surface. 

Ignore windowDisablePreview flag if the activity is launched from
system surface, which include system uid, home and system ui.

Bug: 182879994
Test: CTS pass without been affect.
Change-Id: I7b9eaf92aa59a7dea0e5ce4f18c847adedd5b742
parent 64aa8161

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