diff options
| author | 2023-03-20 11:23:04 +0000 | |
|---|---|---|
| committer | 2023-03-20 11:23:04 +0000 | |
| commit | 7b40cb6bef3641aa831f2398eddfa034c7b5a65e (patch) | |
| tree | 685797bd243dd8d1a203a2a086afe02f731b85ca | |
| parent | 4a27edaa3953acc54e25575774201629881876bc (diff) | |
| parent | 805e82edbf190bfaa1d70b302a3033ac27676105 (diff) | |
Merge "Use committed display state in WallpaperService" into tm-qpr-dev am: 805e82edbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22109905
Change-Id: Id790b05e1245f0c21de74df52d5b32280874d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index e27af17ebc3d..8f76a1831605 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -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; |