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

Merge "Prompt to start user before choosing a new ringtone"

Browse Source
This commit is contained in:
Robin Lee
2017-01-27 14:03:12 +00:00
committed by Android (Google) Code Review
parent 47b02f3f07 2953f31b61
commit 0c341d7357
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ import android.util.Log;
public class DefaultRingtonePreference extends RingtonePreference {
private static final String TAG = "DefaultRingtonePreference";
private int mUserId;
private int mUserId = UserHandle.USER_CURRENT;
protected Context mUserContext;
public DefaultRingtonePreference(Context context, AttributeSet attrs) {
@@ -40,21 +40,19 @@ public class DefaultRingtonePreference extends RingtonePreference {
public void setUserId(int userId) {
mUserId = userId;
Context context = getContext();
mUserContext = Utils.createPackageContextAsUser(context, mUserId);
mUserContext = Utils.createPackageContextAsUser(getContext(), mUserId);
}
@Override
public void performClick() {
if (!Utils.startQuietModeDialogIfNecessary(getContext(), UserManager.get(getContext()),
mUserId)) {
super.performClick();
if (mUserId != UserHandle.USER_CURRENT) {
if (Utils.unlockWorkProfileIfNecessary(getContext(), mUserId) ||
Utils.startQuietModeDialogIfNecessary(getContext(),
UserManager.get(getContext()), mUserId)) {
return;
}
}
}
public void clearUserId(int userId) {
mUserId = UserHandle.USER_CURRENT;
mUserContext = getContext();
super.performClick();
}
@Override

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

@@ -160,9 +160,8 @@ public class WorkSoundPreferenceController extends PreferenceController implemen
}
private CharSequence updateRingtoneName(Context context, int type) {
if (context == null) {
Log.e(TAG, "Unable to update ringtone name, no context provided");
return null;
if (context == null || !UserManager.get(context).isUserUnlocked(context.getUserId())) {
return context.getString(R.string.managed_profile_not_available_label);
}
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, type);
return Ringtone.getTitle(context, ringtoneUri, false /* followSettingsUri */,