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

Commit e93c5c2c authored Jan 23, 2024 by Vaibhav Devmurari Committed by Android (Google) Code Review Jan 23, 2024

Merge "Fix memory leak where SC for drag is never released" into main

parents 14420376 325b0aff

core/java/android/view/View.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -28492,6 +28492,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		surface.destroy();
		}
		session.kill();
		surfaceControl.release();
		}
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -469,8 +469,7 @@ class DragDropController {

		case MSG_REMOVE_DRAG_SURFACE_TIMEOUT: {
		synchronized (mService.mGlobalLock) {
		mService.mTransactionFactory.get()
		.reparent((SurfaceControl) msg.obj, null).apply();
		mService.mTransactionFactory.get().remove((SurfaceControl) msg.obj).apply();
		}
		break;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -270,7 +270,7 @@ class DragState {
		}
		if (mSurfaceControl != null) {
		if (!mRelinquishDragSurfaceToDropTarget && !relinquishDragSurfaceToDragSource()) {
		mTransaction.reparent(mSurfaceControl, null).apply();
		mTransaction.remove(mSurfaceControl).apply();
		} else {
		mDragDropController.sendTimeoutMessage(MSG_REMOVE_DRAG_SURFACE_TIMEOUT,
		mSurfaceControl, DragDropController.DRAG_TIMEOUT_MS);