Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1340a91c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750



Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4d42c15 07db5f43

src/com/android/settings/DefaultRingtonePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class DefaultRingtonePreference extends RingtonePreference { 
            return;

        }



        String mimeType = getContext().getContentResolver().getType(ringtoneUri);

        String mimeType = mUserContext.getContentResolver().getType(ringtoneUri);

        if (mimeType == null) {

            Log.e(TAG, "onSaveRingtone for URI:" + ringtoneUri

                    + " ignored: failure to find mimeType (no access from this context?)");

tests/unit/src/com/android/settings/DefaultRingtonePreferenceTest.java

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class DefaultRingtonePreferenceTest { 
        when(mDefaultRingtonePreference.getRingtoneType())

                .thenReturn(RingtoneManager.TYPE_RINGTONE);

        mDefaultRingtonePreference.setUserId(1);

        mDefaultRingtonePreference.mUserContext = context;

    }



    @Test