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

Merge "Fix SurfaceView callback timings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-23 03:47:30 +00:00
committed by Android (Google) Code Review
parent d765a0634b 8685ce1dee
commit 60a6502567
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/ViewRootImpl.java
View File

@@ -2854,7 +2854,6 @@ public final class ViewRootImpl implements ViewParent,
return;
}
}
notifySurfaceCreated();
} else if (surfaceDestroyed) {
// If the surface has been removed, then reset the scroll
// positions.
@@ -2894,10 +2893,6 @@ public final class ViewRootImpl implements ViewParent,
}
}
if (!surfaceCreated && surfaceReplaced) {
notifySurfaceReplaced();
}
if (mDragResizing != dragResizing) {
if (dragResizing) {
mResizeMode = freeformResizing
@@ -3110,7 +3105,14 @@ public final class ViewRootImpl implements ViewParent,
}
}
if (surfaceDestroyed) {
// These callbacks will trigger SurfaceView SurfaceHolder.Callbacks and must be invoked
// after the measure pass. If its invoked before the measure pass and the app modifies
// the view hierarchy in the callbacks, we could leave the views in a broken state.
if (surfaceCreated) {
notifySurfaceCreated();
} else if (surfaceReplaced) {
notifySurfaceReplaced();
} else if (surfaceDestroyed) {
notifySurfaceDestroyed();
}