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

Commit 76d1ae86 authored by Arc Wang's avatar Arc Wang Committed by Evelyn Torres
Browse files

Verify ringtone from ringtone picker is audio 

To improve privacy.

Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580)
(cherry picked from commit 640eab60)
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
parent 3dc6e3e3

src/com/android/settings/DefaultRingtonePreference.java

+18 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.media.RingtoneManager;

import android.net.Uri;

import android.util.AttributeSet;

import android.util.Log;



public class DefaultRingtonePreference extends RingtonePreference {

    private static final String TAG = "DefaultRingtonePreference";
@@ -43,6 +44,23 @@ public class DefaultRingtonePreference extends RingtonePreference { 


    @Override

    protected void onSaveRingtone(Uri ringtoneUri) {

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

        if (mimeType == null) {

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

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

            return;

        }



        if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) {

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

                    + " ignored: associated mimeType:" + mimeType + " is not an audio type");

            return;

        }



        setActualDefaultRingtoneUri(ringtoneUri);

    }



    void setActualDefaultRingtoneUri(Uri ringtoneUri) {

        RingtoneManager.setActualDefaultRingtoneUri(mUserContext, getRingtoneType(), ringtoneUri);

    }