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

Merge "Fix can't change notification sound for work profile." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-27 15:36:13 +00:00
committed by Android (Google) Code Review
parent a67d5e25a3 40fbcf333f
commit 07db5f4362
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ public class DefaultRingtonePreference extends RingtonePreference {
return; return;
} }
String mimeType = getContext().getContentResolver().getType(ringtoneUri); String mimeType = mUserContext.getContentResolver().getType(ringtoneUri);
if (mimeType == null) { if (mimeType == null) {
Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri
+ " ignored: failure to find mimeType (no access from this context?)"); + " ignored: failure to find mimeType (no access from this context?)");

1
tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java
View File

@@ -59,6 +59,7 @@ public class DefaultRingtonePreferenceTest {
when(mDefaultRingtonePreference.getRingtoneType()) when(mDefaultRingtonePreference.getRingtoneType())
.thenReturn(RingtoneManager.TYPE_RINGTONE); .thenReturn(RingtoneManager.TYPE_RINGTONE);
mDefaultRingtonePreference.setUserId(1); mDefaultRingtonePreference.setUserId(1);
mDefaultRingtonePreference.mUserContext = context;
} }
@Test @Test