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

Lock all profile tasks if keyguard is locked too

Browse Source 
Bug: 29244275
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest
Change-Id: I1df84aa1af675af68180a84440ef36adb003b42d
This commit is contained in:
Robin Lee
2017-01-23 15:22:35 +00:00
parent 3e6041557a
commit e7056216f8
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -11929,14 +11929,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);