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

Merge "Check for null before using user switcher view" into tm-qpr-dev am: c32d4f4355

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19397151

Change-Id: Ie26ae64065b5fec48d88d37490c7842729ab1936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Stetson
2022-07-27 17:07:21 +00:00
committed by Automerger Merge Worker
parent c663f20465 c32d4f4355
commit af36b9eb96
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
View File

@@ -167,6 +167,7 @@ public class UserSwitcherController implements Dumpable {
private final AtomicBoolean mGuestIsResetting; private final AtomicBoolean mGuestIsResetting;
private final AtomicBoolean mGuestCreationScheduled; private final AtomicBoolean mGuestCreationScheduled;
private FalsingManager mFalsingManager; private FalsingManager mFalsingManager;
@Nullable
private View mView; private View mView;
private String mCreateSupervisedUserPackage; private String mCreateSupervisedUserPackage;
private GlobalSettings mGlobalSettings; private GlobalSettings mGlobalSettings;
@@ -572,9 +573,11 @@ public class UserSwitcherController implements Dumpable {
protected void switchToUserId(int id) { protected void switchToUserId(int id) {
try { try {
if (mView != null) {
mInteractionJankMonitor.begin(InteractionJankMonitor.Configuration.Builder mInteractionJankMonitor.begin(InteractionJankMonitor.Configuration.Builder
.withView(InteractionJankMonitor.CUJ_USER_SWITCH, mView) .withView(InteractionJankMonitor.CUJ_USER_SWITCH, mView)
.setTimeout(MULTI_USER_JOURNEY_TIMEOUT)); .setTimeout(MULTI_USER_JOURNEY_TIMEOUT));
}
mLatencyTracker.onActionStart(LatencyTracker.ACTION_USER_SWITCH); mLatencyTracker.onActionStart(LatencyTracker.ACTION_USER_SWITCH);
pauseRefreshUsers(); pauseRefreshUsers();
mActivityManager.switchUser(id); mActivityManager.switchUser(id);