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

Merge "Move guest creation to background thread" into sc-dev am: 2599b29073

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

Change-Id: I0165115ab9b76b27213de6eb7824fa9e63a6908e
This commit is contained in:
Peter Kalauskas
2021-07-27 15:25:45 +00:00
committed by Automerger Merge Worker
parent 97dc391718 2599b29073
commit c2360bad51
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,8 @@ import com.android.systemui.R;
import com.android.systemui.SystemUISecondaryUserService; import com.android.systemui.SystemUISecondaryUserService;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dagger.qualifiers.UiBackground;
import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.plugins.qs.DetailAdapter;
@@ -138,7 +138,7 @@ public class UserSwitcherController implements Dumpable {
private SparseBooleanArray mForcePictureLoadForUserId = new SparseBooleanArray(2); private SparseBooleanArray mForcePictureLoadForUserId = new SparseBooleanArray(2);
private final UiEventLogger mUiEventLogger; private final UiEventLogger mUiEventLogger;
public final DetailAdapter mUserDetailAdapter; public final DetailAdapter mUserDetailAdapter;
private final Executor mUiBgExecutor; private final Executor mBgExecutor;
private final boolean mGuestUserAutoCreated; private final boolean mGuestUserAutoCreated;
private final AtomicBoolean mGuestIsResetting; private final AtomicBoolean mGuestIsResetting;
private final AtomicBoolean mGuestCreationScheduled; private final AtomicBoolean mGuestCreationScheduled;
@@ -158,7 +158,7 @@ public class UserSwitcherController implements Dumpable {
IActivityTaskManager activityTaskManager, IActivityTaskManager activityTaskManager,
UserDetailAdapter userDetailAdapter, UserDetailAdapter userDetailAdapter,
SecureSettings secureSettings, SecureSettings secureSettings,
@UiBackground Executor uiBgExecutor) { @Background Executor bgExecutor) {
mContext = context; mContext = context;
mUserTracker = userTracker; mUserTracker = userTracker;
mBroadcastDispatcher = broadcastDispatcher; mBroadcastDispatcher = broadcastDispatcher;
@@ -169,7 +169,7 @@ public class UserSwitcherController implements Dumpable {
mGuestResumeSessionReceiver = new GuestResumeSessionReceiver( mGuestResumeSessionReceiver = new GuestResumeSessionReceiver(
this, mUserTracker, mUiEventLogger, secureSettings); this, mUserTracker, mUiEventLogger, secureSettings);
mUserDetailAdapter = userDetailAdapter; mUserDetailAdapter = userDetailAdapter;
mUiBgExecutor = uiBgExecutor; mBgExecutor = bgExecutor;
if (!UserManager.isGuestUserEphemeral()) { if (!UserManager.isGuestUserEphemeral()) {
mGuestResumeSessionReceiver.register(mBroadcastDispatcher); mGuestResumeSessionReceiver.register(mBroadcastDispatcher);
} }
@@ -718,7 +718,7 @@ public class UserSwitcherController implements Dumpable {
return; return;
} }
mUiBgExecutor.execute(() -> { mBgExecutor.execute(() -> {
int newGuestId = createGuest(); int newGuestId = createGuest();
mGuestCreationScheduled.set(false); mGuestCreationScheduled.set(false);
mGuestIsResetting.set(false); mGuestIsResetting.set(false);