From ceb55ed11b00d7032ef8518d59742ba641201199 Mon Sep 17 00:00:00 2001
From: Vania Desmonda <vaniadesmonda@google.com>
Date: Tue, 10 May 2022 08:05:22 +0000
Subject: [PATCH] Revert "Avoid calling updateSurface twice when dimming is
 applied."

This reverts commit 9c4b4e14a0c2e94e280e233a5a8d4443b8c18cb2.

Reason for revert: Causes increased memory as reported in b/231834913

Change-Id: I95884e6f8b8416a6b8c85637dab5540f09eb89e1
---
 core/java/android/service/wallpaper/WallpaperService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 0ec95c6870905..425dbb9cb204d 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -904,6 +904,7 @@ public abstract class WallpaperService extends Service {
             // based on its default wallpaper color hints.
             mShouldDim = dimAmount != 0f || mShouldDimByDefault;
             updateSurfaceDimming();
+            updateSurface(false, false, true);
         }
 
         private void updateSurfaceDimming() {
@@ -940,7 +941,6 @@ public abstract class WallpaperService extends Service {
             } else {
                 Log.v(TAG, "Setting wallpaper dimming: " + 0);
                 surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();
-                updateSurface(false, false, true);
             }
 
             mPreviousWallpaperDimAmount = mWallpaperDimAmount;