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

Always reparent SurfacePackage in setChildSurfacePackage.

Browse Source 
Currently, SurfaceView#setChildSurfacePackage only reparents a
provided SurfacePackage when there is no SurfaceControl already
present. This can lead to the SurfacePackage potentially never
being reparented.

This changelist addresses the issue by always reparenting the
SurfacePackage, following cleanup of the existing
SurfaceControl.

Bug: 197568243
Test: atest SurfaceControlViewHostTests#testCanReplaceSurfacePackage
Change-Id: Ib0bcfee5cb9801e1b1c4f1f300af9862141b12f3
This commit is contained in:
Bryce Lee
2021-08-23 16:24:01 -07:00
parent 04bed11734
commit 8379b15dc5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1889,10 +1889,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
public void setChildSurfacePackage(@NonNull SurfaceControlViewHost.SurfacePackage p) {
final SurfaceControl lastSc = mSurfacePackage != null ?
mSurfacePackage.getSurfaceControl() : null;
if (mSurfaceControl != null && lastSc != null) {
mTmpTransaction.reparent(lastSc, null).apply();
mSurfacePackage.release();
} else if (mSurfaceControl != null) {
if (mSurfaceControl != null) {
if (lastSc != null) {
mTmpTransaction.reparent(lastSc, null);
mSurfacePackage.release();
}
reparentSurfacePackage(mTmpTransaction, p);
mTmpTransaction.apply();
}