commit d0e5bc8db01b6501cdb4c8c602f3b9419834a8f0
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 05 07:51:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 05 07:51:01 2018 +0000
tree a7e62598440a486b004526f02b0287056f2b2692
parent 222608627ff876fcce0eb70e445e6d49bc7cacb9
parent bcfd5347a13a794757a9ddda28f9579d3cccf633

Merge "Fix KeyguardController::mDisplayStates leak"

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

diff --git a/services/core/java/com/android/server/wm/ActivityDisplay.java b/services/core/java/com/android/server/wm/ActivityDisplay.java
index f8c4ca2..5fb1def 100644
--- a/services/core/java/com/android/server/wm/ActivityDisplay.java
+++ b/services/core/java/com/android/server/wm/ActivityDisplay.java
@@ -1035,8 +1035,6 @@
 
         releaseSelfIfNeeded();
 
-        mSupervisor.getKeyguardController().onDisplayRemoved(mDisplayId);
-
         if (!mAllSleepTokens.isEmpty()) {
             mSupervisor.mSleepTokens.removeAll(mAllSleepTokens);
             mAllSleepTokens.clear();
@@ -1049,6 +1047,7 @@
             mWindowContainerController.removeContainer();
             mWindowContainerController = null;
             mSupervisor.removeChild(this);
+            mSupervisor.getKeyguardController().onDisplayRemoved(mDisplayId);
         }
     }