commit f362367f73be1a901a967bc9bc5d2d7af909a01a
author Caitlin Shkuratov <caitlinshk@google.com> Wed Jun 28 12:29:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 12:29:30 2023 +0000
tree c474acc21698aa2d640a4e59a5168d7278139478
parent 21f321e1c7d82132c345964865b4653eff7221f5
parent 5134b2421997804a8cccc798045457c46114dfe4

Merge "[CS] Remove unused ScrimController#setCurrentUser." into udc-qpr-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index 7cb0042..77525d2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -2210,7 +2210,6 @@
         if (mLockscreenWallpaper != null && !mWallpaperManager.isLockscreenLiveWallpaperEnabled()) {
             mLockscreenWallpaper.setCurrentUser(newUserId);
         }
-        mScrimController.setCurrentUser(newUserId);
         if (mWallpaperSupported) {
             mWallpaperChangedReceiver.onReceive(mContext, null);
         }

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 47c4023..c16e13c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -1476,10 +1476,6 @@
         }
     }
 
-    public void setCurrentUser(int currentUser) {
-        // Don't care in the base class.
-    }
-
     private void updateThemeColors() {
         if (mScrimBehind == null) return;
         int background = Utils.getColorAttr(mScrimBehind.getContext(),