From 9c4b4e14a0c2e94e280e233a5a8d4443b8c18cb2 Mon Sep 17 00:00:00 2001
From: Vania Desmonda <vaniadesmonda@google.com>
Date: Wed, 27 Apr 2022 11:20:19 +0100
Subject: [PATCH] Avoid calling updateSurface twice when dimming is applied.

Test: manual, atest WallpaperManagerServiceTest
Bug: 229715857
Change-Id: Ib8c4939fea503ee71bf71a95dc71f10fd2956614
---
 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 425dbb9cb204d..0ec95c6870905 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -904,7 +904,6 @@ 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() {
@@ -941,6 +940,7 @@ 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;