Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev

This commit is contained in:
Rubin Xu
2019-05-27 19:50:06 +00:00
committed by Android (Google) Code Review
4 changed files with 98 additions and 13 deletions

View File

@@ -43,6 +43,12 @@ public abstract class DevicePolicyCache {
*/
public abstract boolean getScreenCaptureDisabled(@UserIdInt int userHandle);
/**
* Caches {@link DevicePolicyManager#getPasswordQuality(android.content.ComponentName)} of the
* given user with {@code null} passed in as argument.
*/
public abstract int getPasswordQuality(@UserIdInt int userHandle);
/**
* Empty implementation.
*/
@@ -53,5 +59,10 @@ public abstract class DevicePolicyCache {
public boolean getScreenCaptureDisabled(int userHandle) {
return false;
}
@Override
public int getPasswordQuality(int userHandle) {
return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
}
}