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

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

Merge "Unregister configuration listener when remove container"

parents 4e4ebfff 3a77f283

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

+3 −0
Original line number Diff line number Diff line
@@ -746,6 +746,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
    @Override

    void removeImmediately() {

        onRemovedFromDisplay();

        if (mActivityRecord != null) {

            mActivityRecord.unregisterConfigurationChangeListener(this);

        }

        super.removeImmediately();

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta 
        if (DEBUG_STACK) Slog.i(TAG, "removeTask: removing taskId=" + mTaskId);

        EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "removeTask");

        mDeferRemoval = false;

        if (mTaskRecord != null) {

            mTaskRecord.unregisterConfigurationChangeListener(this);

        }



        super.removeImmediately();

    }