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

Commit 805e82ed authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

Merge "Use committed display state in WallpaperService" into tm-qpr-dev

parents dd5d243b 71f5a23c

core/java/android/service/wallpaper/WallpaperService.java

+3 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ public abstract class WallpaperService extends Service { 
                    com.android.internal.R.dimen.config_wallpaperDimAmount);

            mWallpaperDimAmount = mDefaultDimAmount;

            mPreviousWallpaperDimAmount = mWallpaperDimAmount;

            mDisplayState = mDisplay.getState();

            mDisplayState = mDisplay.getCommittedState();

            mDisplayInstallOrientation = mDisplay.getInstallOrientation();



            if (DEBUG) Log.v(TAG, "onCreate(): " + this);
@@ -1521,7 +1521,8 @@ public abstract class WallpaperService extends Service { 
                return;

            }

            if (!mDestroyed) {

                mDisplayState = mDisplay == null ? Display.STATE_UNKNOWN : mDisplay.getState();

                mDisplayState = mDisplay == null ? Display.STATE_UNKNOWN :

                        mDisplay.getCommittedState();

                boolean visible = mVisible && mDisplayState != Display.STATE_OFF;

                if (mReportedVisible != visible) {

                    mReportedVisible = visible;