From 71f5a23c057d02900d64b377d0a4d2ba2d6abf89 Mon Sep 17 00:00:00 2001
From: Nick Chameyev <nickchameyev@google.com>
Date: Thu, 16 Mar 2023 11:01:11 +0000
Subject: Use committed display state in WallpaperService

Uses committed display state instead of
display state, so the wallpaper receive more
up-to-date information about visibility as
display power state could take a considerable
amount of time.

Test: manual, perfetto traces
Bug: 273204503
Change-Id: If747112d610822df116971b60b9a0b82a686a37a
Merged-In: If747112d610822df116971b60b9a0b82a686a37a
---
 core/java/android/service/wallpaper/WallpaperService.java | 5 +++--
 1 file 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;
-- 
cgit v1.2.3-59-g8ed1b