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

Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I48261545315b21c41a5c6802f7870e3a946d88ef
This commit is contained in:
Vishnu Nair
2021-07-19 23:29:28 +00:00
committed by Automerger Merge Worker
parent b4fe9c3215 861ba140a1
commit 9fd93a4133
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1081,7 +1081,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
|| mWindowSpaceTop != mLocation[1]; || mWindowSpaceTop != mLocation[1];
final boolean layoutSizeChanged = getWidth() != mScreenRect.width() final boolean layoutSizeChanged = getWidth() != mScreenRect.width()
|| getHeight() != mScreenRect.height(); || getHeight() != mScreenRect.height();
final boolean hintChanged = viewRoot.getSurfaceTransformHint() != mTransformHint; final boolean hintChanged = (viewRoot.getSurfaceTransformHint() != mTransformHint)
&& mRequestedVisible;
if (creating || formatChanged || sizeChanged || visibleChanged || if (creating || formatChanged || sizeChanged || visibleChanged ||
(mUseAlpha && alphaChanged) || windowVisibleChanged || (mUseAlpha && alphaChanged) || windowVisibleChanged ||
@@ -1227,7 +1228,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
// Therefore, we must explicitly recreate the {@link Surface} in these // Therefore, we must explicitly recreate the {@link Surface} in these
// cases. // cases.
if (mUseBlastAdapter) { if (mUseBlastAdapter) {
mSurface.transferFrom(mBlastBufferQueue.createSurfaceWithHandle()); if (mBlastBufferQueue != null) {
mSurface.transferFrom(mBlastBufferQueue.createSurfaceWithHandle());
}
} else { } else {
mSurface.createFrom(mSurfaceControl); mSurface.createFrom(mSurfaceControl);
} }
@@ -1237,7 +1240,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
private void setBufferSize(Transaction transaction) { private void setBufferSize(Transaction transaction) {
if (mUseBlastAdapter) { if (mUseBlastAdapter) {
mBlastSurfaceControl.setTransformHint(mTransformHint); mBlastSurfaceControl.setTransformHint(mTransformHint);
mBlastBufferQueue.update(mBlastSurfaceControl, mSurfaceWidth, mSurfaceHeight, mFormat); if (mBlastBufferQueue != null) {
mBlastBufferQueue.update(mBlastSurfaceControl, mSurfaceWidth, mSurfaceHeight,
mFormat);
}
} else { } else {
transaction.setBufferSize(mSurfaceControl, mSurfaceWidth, mSurfaceHeight); transaction.setBufferSize(mSurfaceControl, mSurfaceWidth, mSurfaceHeight);
} }