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

Commit f9e0978a authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Added removed null checks around calls to WindowSurfaceController 

The checks were removed in the refactor in
e6a8351b

Bug: 25564523
Change-Id: Ia7c571fa48bc5c14bb76c3aa5b6fcbcc7323ed2f
parent 42817202

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -475,9 +475,11 @@ class WindowStateAnimator { 
        if (!mLastHidden) {

        if (!mLastHidden) {

            //dump();

            //dump();

            mLastHidden = true;

            mLastHidden = true;

            if (mSurfaceController != null) {

                mSurfaceController.hideInTransaction(reason);

                mSurfaceController.hideInTransaction(reason);

            }

            }

        }

        }

    }





    boolean finishDrawingLocked() {

    boolean finishDrawingLocked() {

        final boolean startingWindow =

        final boolean startingWindow =
@@ -537,7 +539,9 @@ class WindowStateAnimator { 
            return;

            return;

        }

        }

        if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(mWin, "SET FREEZE LAYER", null);

        if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(mWin, "SET FREEZE LAYER", null);

        if (mSurfaceController != null) {

            mSurfaceController.setLayer(mAnimLayer + 1);

            mSurfaceController.setLayer(mAnimLayer + 1);

        }

        mDestroyPreservedSurfaceUponRedraw = true;

        mDestroyPreservedSurfaceUponRedraw = true;

        mSurfaceDestroyDeferred = true;

        mSurfaceDestroyDeferred = true;

        destroySurfaceLocked();

        destroySurfaceLocked();
@@ -1327,6 +1331,10 @@ class WindowStateAnimator { 
    }

    }





    void setTransparentRegionHintLocked(final Region region) {

    void setTransparentRegionHintLocked(final Region region) {

        if (mSurfaceController == null) {

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

            return;

        }

        mSurfaceController.setTransparentRegionHint(region);

        mSurfaceController.setTransparentRegionHint(region);

    }

    }
@@ -1373,10 +1381,16 @@ class WindowStateAnimator { 
    }

    }





    void setOpaqueLocked(boolean isOpaque) {

    void setOpaqueLocked(boolean isOpaque) {

        if (mSurfaceController == null) {

            return;

        }

        mSurfaceController.setOpaque(isOpaque);

        mSurfaceController.setOpaque(isOpaque);

    }

    }





    void setSecureLocked(boolean isSecure) {

    void setSecureLocked(boolean isSecure) {

        if (mSurfaceController == null) {

            return;

        }

        mSurfaceController.setSecure(isSecure);

        mSurfaceController.setSecure(isSecure);

    }

    }