commit 3312c97dbdf95d2f2bcd183c7bdc35ee8ac8f519
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 12 14:40:53 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 12 14:40:53 2024 +0000
tree 4475aea21a33cd049f3e217e2efff88056027afb
parent f0667d2942704fd847ed13f5b88045eaf301da95
parent 9414a01991e0dc66e5c3174bcb97e16a11c96770

Merge "[automerger skipped] Merge "Backport fixes and enable new Dagger Validations" into main am: 3cd9445048 am: 7fe423a15d -s ours" into main

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index c3efcb1..885baf6 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2691,6 +2691,7 @@
                 }
 
                 float maxDimAmount = getHighestDimAmountFromMap(wallpaper.mUidToDimAmount);
+                if (wallpaper.mWallpaperDimAmount == maxDimAmount) return;
                 wallpaper.mWallpaperDimAmount = maxDimAmount;
                 // Also set the dim amount to the lock screen wallpaper if the lock and home screen
                 // do not share the same wallpaper