diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-29 18:04:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-29 18:04:53 +0000 |
| commit | bc056fcb73129f2923f375cd3f7876132eca531a (patch) | |
| tree | d7fe93dc9f265d7e1d4cb172be4e73fb9c56d9e4 /core/java/android/view/SurfaceView.java | |
| parent | ec2b60ef29982eba99b42436fe45fee117746f9b (diff) | |
| parent | de63cc6e8fe619193f06921d9fc51cfb0de49d2f (diff) | |
Merge "Fix mistake in SurfaceView lifetime refactoring."
Diffstat (limited to 'core/java/android/view/SurfaceView.java')
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 2f0a4ebb84f8..59e9ed1512ee 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -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; } |