Merge "Fix mistake in SurfaceView lifetime refactoring." (bc056fcb) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -712,6 +712,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		mSurfaceAlpha = 1f;

		synchronized (mSurfaceControlLock) {
		mSurface.release();

		if (mRtHandlingPositionUpdates) {
		mRtReleaseSurfaces = true;
		return;
		@@ -725,7 +727,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		mTmpTransaction.remove(mBackgroundControl);
		mBackgroundControl = null;
		}
		mSurface.release();
		mTmpTransaction.apply();
		}
		}
		@@ -1198,7 +1199,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		mRtTransaction.remove(mBackgroundControl);
		mSurfaceControl = null;
		mBackgroundControl = null;
		mSurface.release();
		}
		mRtHandlingPositionUpdates = false;
		}