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

Commit 460dd83d authored by Robert Carr's avatar Robert Carr Committed by Presubmit Automerger Backend
Browse files

[automerge] ActivityRecordInputSink: Ensure timely release of SurfaceControl 2p: 51ae378d 

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

Bug: 228810413
Change-Id: I606cc6434cc7579aaedf8b7489641b2e8869411d
parents db68b7db 51ae378d

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;

        }

    }



}