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

Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55

Browse Source 
am: d918a77820

* commit 'd918a778201c06721abe66208bcda413bcb7edcb':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: I90caa2d494ae370854392515593ce6c5fbfbdbe1
This commit is contained in:
Tony Mak
2016-05-18 17:15:06 +00:00
committed by android-build-merger
parent bf8a1a2593 d918a77820
commit b008d581fc
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); .getSystemService(Context.KEYGUARD_SERVICE);
final Intent credential = final Intent credential =
km.createConfirmDeviceCredentialIntent(null, null, userId); 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(); final ActivityRecord activityRecord = targetStack.topRunningActivityLocked();
if (activityRecord != null) { if (activityRecord != null) {
final IIntentSender target = mService.getIntentSenderLocked( 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 final KeyguardManager km = (KeyguardManager) mService.mContext
.getSystemService(KEYGUARD_SERVICE); .getSystemService(KEYGUARD_SERVICE);
return km.isDeviceLocked(userId); return km.isDeviceLocked(userId) && km.isDeviceSecure(userId);
} }
boolean isLockScreenDisabled(@UserIdInt int userId) { boolean isLockScreenDisabled(@UserIdInt int userId) {