Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Nick Chameyev
2023-03-20 11:23:04 +00:00
committed by Automerger Merge Worker
parent 4a27edaa39 805e82edbf
commit 7b40cb6bef
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -1430,7 +1430,7 @@ public abstract class WallpaperService extends Service {
com.android.internal.R.dimen.config_wallpaperDimAmount); com.android.internal.R.dimen.config_wallpaperDimAmount);
mWallpaperDimAmount = mDefaultDimAmount; mWallpaperDimAmount = mDefaultDimAmount;
mPreviousWallpaperDimAmount = mWallpaperDimAmount; mPreviousWallpaperDimAmount = mWallpaperDimAmount;
mDisplayState = mDisplay.getState(); mDisplayState = mDisplay.getCommittedState();
mDisplayInstallOrientation = mDisplay.getInstallOrientation(); mDisplayInstallOrientation = mDisplay.getInstallOrientation();
if (DEBUG) Log.v(TAG, "onCreate(): " + this); if (DEBUG) Log.v(TAG, "onCreate(): " + this);
@@ -1521,7 +1521,8 @@ public abstract class WallpaperService extends Service {
return; return;
} }
if (!mDestroyed) { 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; boolean visible = mVisible && mDisplayState != Display.STATE_OFF;
if (mReportedVisible != visible) { if (mReportedVisible != visible) {
mReportedVisible = visible; mReportedVisible = visible;