Prompt credentials for installing/deleting sounds
Actually we probably want to confirm credentials in all locked cases
not just when starting the user -- fewer corners to special case.
Fix: 34734809
Test: manual. set a work profile lock, screen off/on, open sound settings, try to set a work ringtone. first attempt should prompt for credentials, second attempt should not until next screen-off.
Change-Id: I1fea94f3b0d1b768b22741b887d9891f5e318549
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 803b8e5..b1c3ab3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1161,6 +1161,18 @@
if (!(new LockPatternUtils(context)).isSecure(userId)) {
return false;
}
+ return confirmWorkProfileCredentials(context, userId);
+ }
+
+ public static boolean confirmWorkProfileCredentialsIfNecessary(Context context, int userId) {
+ KeyguardManager km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+ if (!km.isDeviceLocked(userId)) {
+ return false;
+ }
+ return confirmWorkProfileCredentials(context, userId);
+ }
+
+ private static boolean confirmWorkProfileCredentials(Context context, int userId) {
final KeyguardManager km = (KeyguardManager) context.getSystemService(
Context.KEYGUARD_SERVICE);
final Intent unlockIntent = km.createConfirmDeviceCredentialIntent(null, null, userId);
@@ -1170,7 +1182,6 @@
} else {
return false;
}
-
}
public static CharSequence getApplicationLabel(Context context, String packageName) {