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

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

Merge "Use committed display state in WallpaperService" into udc-dev

parents ff642bb9 7d3e0820

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

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

            mWallpaperDimAmount = mDefaultDimAmount;

            mPreviousWallpaperDimAmount = mWallpaperDimAmount;

            mDisplayState = mDisplay.getState();

            mDisplayState = mDisplay.getCommittedState();



            if (DEBUG) Log.v(TAG, "onCreate(): " + this);

            Trace.beginSection("WPMS.Engine.onCreate");
@@ -1548,7 +1548,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 (DEBUG) {

                    Log.v(