Merge "Fix GraphicBuffer leaks in system_server" into oc-dev (a40bb1ed) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ class TaskSnapshotSurface implements StartingSurface {
		private final Rect mStableInsets = new Rect();
		private final Rect mContentInsets = new Rect();
		private final Rect mFrame = new Rect();
		private final TaskSnapshot mSnapshot;
		private TaskSnapshot mSnapshot;
		private final CharSequence mTitle;
		private boolean mHasDrawn;
		private long mShownTime;
		@@ -267,6 +267,9 @@ class TaskSnapshotSurface implements StartingSurface {
		mHasDrawn = true;
		}
		reportDrawn();

		// In case window manager leaks us, make sure we don't retain the snapshot.
		mSnapshot = null;
		}

		private void drawSizeMatchSnapshot(GraphicBuffer buffer) {

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

+38 −33

Original line number	Diff line number	Diff line
		@@ -655,6 +655,7 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon

		final LinkedList<WindowContainer> thisParentChain = mTmpChain1;
		final LinkedList<WindowContainer> otherParentChain = mTmpChain2;
		try {
		getParents(thisParentChain);
		other.getParents(otherParentChain);

		@@ -688,6 +689,10 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon
		final WindowList<WindowContainer> list = commonAncestor.mChildren;
		return list.indexOf(thisParentChain.peekLast()) > list.indexOf(otherParentChain.peekLast())
		? 1 : -1;
		} finally {
		mTmpChain1.clear();
		mTmpChain2.clear();
		}
		}

		private void getParents(LinkedList<WindowContainer> parents) {

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

+37 −15

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ import com.android.internal.util.ToBooleanFunction;
		import com.android.server.input.InputWindowHandle;

		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.Comparator;
		import java.util.LinkedList;
		@@ -170,7 +171,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		final int mOwnerUid;
		/** The owner has {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW} */
		final boolean mOwnerCanAddInternalSystemWindow;
		final IWindowId mWindowId;
		final WindowId mWindowId;
		WindowToken mToken;
		// The same object as mToken if this is an app window and null for non-app windows.
		AppWindowToken mAppToken;
		@@ -587,20 +588,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		mAppToken = mToken.asAppWindowToken();
		mOwnerUid = ownerId;
		mOwnerCanAddInternalSystemWindow = ownerCanAddInternalSystemWindow;
		mWindowId = new IWindowId.Stub() {
		@Override
		public void registerFocusObserver(IWindowFocusObserver observer) {
		WindowState.this.registerFocusObserver(observer);
		}
		@Override
		public void unregisterFocusObserver(IWindowFocusObserver observer) {
		WindowState.this.unregisterFocusObserver(observer);
		}
		@Override
		public boolean isFocused() {
		return WindowState.this.isFocused();
		}
		};
		mWindowId = new WindowId(this);
		mAttrs.copyFrom(a);
		mViewVisibility = viewVisibility;
		mPolicy = mService.mPolicy;
		@@ -4435,6 +4423,40 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}
		}

		private static final class WindowId extends IWindowId.Stub {
		private final WeakReference<WindowState> mOuter;

		private WindowId(WindowState outer) {

		// Use a weak reference for the outer class. This is important to prevent the following
		// leak: Since we send this class to the client process, binder will keep it alive as
		// long as the client keeps it alive. Now, if the window is removed, we need to clear
		// out our reference so even though this class is kept alive we don't leak WindowState,
		// which can keep a whole lot of classes alive.
		mOuter = new WeakReference<>(outer);
		}

		@Override
		public void registerFocusObserver(IWindowFocusObserver observer) {
		final WindowState outer = mOuter.get();
		if (outer != null) {
		outer.registerFocusObserver(observer);
		}
		}
		@Override
		public void unregisterFocusObserver(IWindowFocusObserver observer) {
		final WindowState outer = mOuter.get();
		if (outer != null) {
		outer.unregisterFocusObserver(observer);
		}
		}
		@Override
		public boolean isFocused() {
		final WindowState outer = mOuter.get();
		return outer != null && outer.isFocused();
		}
		}

		boolean usesRelativeZOrdering() {
		if (!isChildWindow()) {
		return false;