Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mitigate IPC calls from MultiUserSwitcher" into qt-r1-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2019-08-01 12:58:34 +00:00
committed by Android (Google) Code Review
parent 22eceae195 6a27f50138
commit fd47f70b96
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,10 +103,11 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
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;
}