Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f02c47d8 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Only updateDisplayDecoration if not the default 

The default value for DISPLAY_DECORATION is false. If there's a new
SurfaceControl, we only need to set the flag if it's true. This avoids
applying an unnecesary transaction.

It also prevents a boot failure which is independently fixed by
Ib11d46439db57b90486bad07dd90f2cf0822182a.

Bug: 211797674
Bug: 211835607
Bug: 212402133
Test: boots
Change-Id: Iccb662f9a6312b547b3d28fa1f5c1e9ff5dce9eb
parent 906fe67b

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -2845,7 +2845,10 @@ public final class ViewRootImpl implements ViewParent, 
                if (mSurfaceControl.isValid()) {

                    updateOpacity(mWindowAttributes, dragResizing,

                            surfaceControlChanged /*forceUpdate */);

                    if (surfaceControlChanged) {

                    // No need to updateDisplayDecoration if it's a new SurfaceControl and

                    // mDisplayDecorationCached is false, since that's the default for a new

                    // SurfaceControl.

                    if (surfaceControlChanged && mDisplayDecorationCached) {

                        updateDisplayDecoration();

                    }

                }