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

Commit 38182651 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge changes from topic... 

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

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;

        }

    }



}