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

This commit is contained in:
Nick Chameyev
2023-03-17 16:43:55 +00:00
committed by Android (Google) Code Review

View File

@@ -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(