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

Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: d918a77820

Browse Source 
am: b008d581fc

* commit 'b008d581fc4b3cc6e51e99b4bfeb1d06bef2bea7':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: Id3b0c0d4b1af8a63fb042f8106dc6b2d3926016c
This commit is contained in:
Tony Mak
2016-05-18 17:19:06 +00:00
committed by android-build-merger
parent 5f231e4d27 b008d581fc
commit ebe5cf225a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -620,6 +620,10 @@ class ActivityStarter {
.getSystemService(Context.KEYGUARD_SERVICE);
final Intent credential =
km.createConfirmDeviceCredentialIntent(null, null, userId);
// For safety, check null here in case users changed the setting after the checking.
if (credential == null) {
return;
}
final ActivityRecord activityRecord = targetStack.topRunningActivityLocked();
if (activityRecord != null) {
final IIntentSender target = mService.getIntentSenderLocked(

2
services/core/java/com/android/server/am/UserController.java
View File

@@ -1468,7 +1468,7 @@ final class UserController {
}
final KeyguardManager km = (KeyguardManager) mService.mContext
.getSystemService(KEYGUARD_SERVICE);
return km.isDeviceLocked(userId);
return km.isDeviceLocked(userId) && km.isDeviceSecure(userId);
}
boolean isLockScreenDisabled(@UserIdInt int userId) {