PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prompt credentials for installing/deleting sounds"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-10 18:11:56 +00:00
committed by Android (Google) Code Review
parent c260bcc6df cccf3244b6
commit 765062ac3d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DefaultRingtonePreference.java
View File

@@ -46,7 +46,7 @@ public class DefaultRingtonePreference extends RingtonePreference {
@Override
public void performClick() {
if (mUserId != UserHandle.USER_CURRENT) {
if (Utils.unlockWorkProfileIfNecessary(getContext(), mUserId) ||
if (Utils.confirmWorkProfileCredentialsIfNecessary(getContext(), mUserId) ||
Utils.startQuietModeDialogIfNecessary(getContext(),
UserManager.get(getContext()), mUserId)) {
return;

13
src/com/android/settings/Utils.java
View File

@@ -1161,6 +1161,18 @@ public final class Utils extends com.android.settingslib.Utils {
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 @@ public final class Utils extends com.android.settingslib.Utils {
} else {
return false;
}
}
public static CharSequence getApplicationLabel(Context context, String packageName) {