Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mistake in SurfaceView lifetime refactoring."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-29 18:04:53 +00:00
committed by Android (Google) Code Review
parent ec2b60ef29 de63cc6e8f
commit bc056fcb73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/SurfaceView.java
View File

@@ -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;
}