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

Commit 5409c66e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into... 

Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into tm-mainline-prod am: 6520f173

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694571



Change-Id: Ia411bddaa878c96879d124b7dfc1f62e8b81c043
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c913030 6520f173

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

+2 −0
Original line number Diff line number Diff line
@@ -3967,6 +3967,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else {

            onRemovedFromDisplay();

        }

        mActivityRecordInputSink.releaseSurfaceControl();



        super.removeImmediately();

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -99,4 +99,11 @@ class ActivityRecordInputSink { 
        return inputWindowHandle;

    }



    void releaseSurfaceControl() {

        if (mSurfaceControl != null) {

            mSurfaceControl.release();

            mSurfaceControl = null;

        }

    }



}