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

Merge "Make KeyguardManager.setLock API available to SUW on non auto variants."

Browse Source
This commit is contained in:
Dmitry Dementyev
2022-01-31 16:19:39 +00:00
committed by Android (Google) Code Review
parent 37da147fdf 33e06ed28b
commit daf3b7d955
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/KeyguardManager.java
View File

@@ -746,7 +746,7 @@ public class KeyguardManager {
if (!hasPermission(Manifest.permission.SET_INITIAL_LOCK)) {
throw new SecurityException("Requires SET_INITIAL_LOCK permission.");
}
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
return true;
}
private boolean hasPermission(String permission) {
@@ -814,6 +814,8 @@ public class KeyguardManager {
/**
* Set the lockscreen password after validating against its expected complexity level.
*
* Below {@link android.os.Build.VERSION_CODES#S_V2}, this API will only work
* when {@link PackageManager.FEATURE_AUTOMOTIVE} is present.
* @param lockType - type of lock as specified in {@link LockTypes}
* @param password - password to validate; this has the same encoding
* as the output of String#getBytes

11
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -20,6 +20,7 @@ import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE;
import static android.Manifest.permission.MANAGE_BIOMETRIC;
import static android.Manifest.permission.READ_CONTACTS;
import static android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS;
import static android.Manifest.permission.SET_INITIAL_LOCK;
import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_DETAIL;
import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_MESSAGE;
import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_TITLE;
@@ -1650,9 +1651,13 @@ public class LockSettingsService extends ILockSettings.Stub {
"This operation requires secure lock screen feature");
}
if (!hasPermission(PERMISSION) && !hasPermission(SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS)) {
throw new SecurityException(
"setLockCredential requires SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS or "
+ PERMISSION);
if (hasPermission(SET_INITIAL_LOCK) && savedCredential.isNone()) {
// SET_INITIAL_LOCK can only be used if credential is not set.
} else {
throw new SecurityException(
"setLockCredential requires SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS or "
+ PERMISSION);
}
}
final long identity = Binder.clearCallingIdentity();