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

Commit 73f2a2a4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix camera launch delay from Keyguard" into oc-dev

parents 29db4b35 45ca0544

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm; 
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;

import static com.android.server.wm.AppTransition.TRANSIT_UNSET;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION;
@@ -381,6 +380,7 @@ public class AppWindowContainerController 
                // if made visible again.

                wtoken.removeDeadWindows();

                wtoken.setVisibleBeforeClientHidden();

                mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);

            } else {

                if (!mService.mAppTransition.isTransitionSet()

                        && mService.mAppTransition.isReady()) {

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

+1 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import static com.android.server.wm.WindowManagerService.logWithStack; 


import android.annotation.NonNull;

import android.app.Activity;

import android.app.ActivityManager;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Binder;
@@ -526,7 +525,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        boolean delayed = setVisibility(null, false, TRANSIT_UNSET, true, mVoiceInteraction);



        mService.mOpeningApps.remove(this);

        mService.mUnknownAppVisibilityController.appRemoved(this);

        mService.mUnknownAppVisibilityController.appRemovedOrHidden(this);

        mService.mTaskSnapshotController.onAppRemoved(this);

        waitingToShow = false;

        if (mService.mClosingApps.contains(this)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ class UnknownAppVisibilityController { 
        return builder.toString();

    }



    void appRemoved(@NonNull AppWindowToken appWindow) {

    void appRemovedOrHidden(@NonNull AppWindowToken appWindow) {

        if (DEBUG_UNKNOWN_APP_VISIBILITY) {

            Slog.d(TAG, "App removed appWindow=" + appWindow);

            Slog.d(TAG, "App removed or hidden appWindow=" + appWindow);

        }

        mUnknownApps.remove(appWindow);

    }

services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class UnknownAppVisibilityControllerTest extends WindowTestsBase { 
    public void testAppRemoved() throws Exception {

        final AppWindowToken token = new WindowTestUtils.TestAppWindowToken(mDisplayContent);

        sWm.mUnknownAppVisibilityController.notifyLaunched(token);

        sWm.mUnknownAppVisibilityController.appRemoved(token);

        sWm.mUnknownAppVisibilityController.appRemovedOrHidden(token);

        assertTrue(sWm.mUnknownAppVisibilityController.allResolved());

    }

}