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

Commit f0cabba3 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in setTransparentRegion."

parents cd2a3ea5 1f4e0ccb

services/java/com/android/server/wm/WindowManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -6919,8 +6919,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                                (Pair<WindowStateAnimator, Region>) msg.obj;

                    final WindowStateAnimator winAnimator = pair.first;

                    winAnimator.setTransparentRegionHint(pair.second);



                    scheduleAnimationLocked();

                    break;

                }

services/java/com/android/server/wm/WindowStateAnimator.java

+4 −0
Original line number Diff line number Diff line
@@ -943,6 +943,10 @@ class WindowStateAnimator { 
    }



    void setTransparentRegionHint(final Region region) {

        if (mSurface == null) {

            Slog.w(TAG, "setTransparentRegionHint: null mSurface after mHasSurface true");

            return;

        }

        if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,

            ">>> OPEN TRANSACTION setTransparentRegion");

        Surface.openTransaction();