From acf5b57d0a58fea50ec3c0533e631db394494975 Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Wed, 12 Feb 2020 20:37:08 +0800
Subject: [PATCH] Update the current user id for MagnificationController

If the cached user ID is not updated after switching user,
the persistent magnification scale setting would be the
last user's manginification scale setting.

Bug: 148831149
Test: atest MagnificationControllerTest
Change-Id: Icef2834cb482bef753191feaf988b28831a2e691
---
 .../server/accessibility/AccessibilityManagerService.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index ba29bc88f145e..055bb4c53b850 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2050,6 +2050,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
             return;
         }
 
+        if (mMagnificationController != null) {
+            mMagnificationController.setUserId(userState.mUserId);
+        }
+
         if (mUiAutomationManager.suppressingAccessibilityServicesLocked()
                 && mMagnificationController != null) {
             mMagnificationController.unregisterAll();