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

Commit a6665cfb authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "Use committed display state in WallpaperService" into udc-dev am: 66b76bb7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22119362



Change-Id: I55242307213ae2ef06dbba572f8b22af82416741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a66b3fc 66b76bb7

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(