Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 6affc2707b (14b026be) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControlViewHost.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -177,6 +177,17 @@ public class SurfaceControlViewHost {
		mAccessibilityEmbeddedConnection = mViewRoot.getAccessibilityEmbeddedConnection();
		}

		/**
		* @hide
		*/
		@Override
		protected void finalize() throws Throwable {
		// We aren't on the UI thread here so we need to pass false to
		// doDie
		mViewRoot.die(false /* immediate */);
		}


		/**
		* Return a SurfacePackage for the root SurfaceControl of the embedded hierarchy.
		* Rather than be directly reparented using {@link SurfaceControl.Transaction} this
		@@ -273,6 +284,6 @@ public class SurfaceControlViewHost {
		*/
		public void release() {
		// ViewRoot will release mSurfaceControl for us.
		mViewRoot.die(false /* immediate */);
		mViewRoot.die(true /* immediate */);
		}
		}