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

Merge "Fix 4 broken work profile tests"

Browse Source
This commit is contained in:
Robin Lee
2017-02-01 14:31:07 +00:00
committed by Android (Google) Code Review
parent 9c2979e214 805d59dc1d
commit b5edf1a7a0
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/AudioHelper.java
View File

@@ -42,6 +42,10 @@ public class AudioHelper {
return Utils.getManagedProfileId(um, UserHandle.myUserId());
}
public boolean isUserUnlocked(UserManager um, @UserIdInt int userId) {
return um.isUserUnlocked(userId);
}
public Context createPackageContextAsUser(@UserIdInt int profileId) {
return Utils.createPackageContextAsUser(mContext, profileId);
}

4
src/com/android/settings/notification/WorkSoundPreferenceController.java
View File

@@ -160,8 +160,8 @@ public class WorkSoundPreferenceController extends PreferenceController implemen
}
private CharSequence updateRingtoneName(Context context, int type) {
if (context == null || !UserManager.get(context).isUserUnlocked(context.getUserId())) {
return context.getString(R.string.managed_profile_not_available_label);
if (context == null || !mHelper.isUserUnlocked(mUserManager, context.getUserId())) {
return mContext.getString(R.string.managed_profile_not_available_label);
}
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
return Ringtone.getTitle(context, ringtoneUri, false /* followSettingsUri */,