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

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

Merge "Fix KeyguardController::mDisplayStates leak"

parents 22260862 bcfd5347

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

+1 −2
Original line number Diff line number Diff line
@@ -1035,8 +1035,6 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> 


        releaseSelfIfNeeded();



        mSupervisor.getKeyguardController().onDisplayRemoved(mDisplayId);



        if (!mAllSleepTokens.isEmpty()) {

            mSupervisor.mSleepTokens.removeAll(mAllSleepTokens);

            mAllSleepTokens.clear();
@@ -1049,6 +1047,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> 
            mWindowContainerController.removeContainer();

            mWindowContainerController = null;

            mSupervisor.removeChild(this);

            mSupervisor.getKeyguardController().onDisplayRemoved(mDisplayId);

        }

    }