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

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

Merge "Use committed display state in WallpaperService" into tm-qpr-dev am: 805e82ed 

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



Change-Id: Id790b05e1245f0c21de74df52d5b32280874d390
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a27edaa 805e82ed

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;