commit 6a27f50138f6ab5a7f3141617e60e37bbb660be4
author Fabian Kozynski <kozynski@google.com> Tue Jul 30 14:36:52 2019 -0400
committer Fabian Kozynski <kozynski@google.com> Wed Jul 31 17:06:27 2019 +0000
tree 87dcbf5eb4273c6aab60f5d66c38fcb56515f4fb
parent 11d2f96544a170b77d4c7e0fd030a192b94e72c8

Mitigate IPC calls from MultiUserSwitcher

Reduce the calls to UserManager#hasUserRestriction when checking if the
switcher should be shown by reordering the conditions. In most cases,
the switcher is disabled (from settings) and it will short circuit.

TODO: actually remove the call from main thread

Test: manual, when device does not have multiple users, there are no
calls to UserManager
Bug: 138640355
Bug: 138661450

Change-Id: I35905d4d8a7194866f55009b86dff0a2a4214e1a

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
index c0a1b12..1d4d0bd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java
@@ -103,10 +103,11 @@
         final boolean userSwitcherEnabled = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.USER_SWITCHER_ENABLED, 0) != 0;
 
-        if (!UserManager.supportsMultipleUsers()
-                || mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)
+        // TODO(b/138661450) Move IPC calls to background
+        if (!userSwitcherEnabled
+                || !UserManager.supportsMultipleUsers()
                 || UserManager.isDeviceInDemoMode(mContext)
-                || !userSwitcherEnabled) {
+                || mUserManager.hasUserRestriction(UserManager.DISALLOW_USER_SWITCH)) {
             return false;
         }