Merge "Lock all profile tasks if keyguard is locked too" (7f9f8647) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -12044,14 +12044,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		final long ident = Binder.clearCallingIdentity();
		try {
		if (mUserController.shouldConfirmCredentials(userId)) {
		final int currentUserId = mUserController.getCurrentUserIdLocked();
		if (!mKeyguardController.isKeyguardLocked()) {
		// If the device is not locked, we will prompt for credentials immediately.
		mStackSupervisor.lockAllProfileTasks(userId);
		} else {
		if (mKeyguardController.isKeyguardLocked()) {
		// Showing launcher to avoid user entering credential twice.
		final int currentUserId = mUserController.getCurrentUserIdLocked();
		startHomeActivityLocked(currentUserId, "notifyLockedProfile");
		}
		mStackSupervisor.lockAllProfileTasks(userId);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);