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

Commit b8584dec authored by Arc Wang's avatar Arc Wang Committed by Android Build Coastguard Worker
Browse files

[DO NOT MERGE] 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 16823545)
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
parent e0722bee

src/com/android/settings/DefaultRingtonePreference.java

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

import android.net.Uri;

import android.util.AttributeSet;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



public class DefaultRingtonePreference extends RingtonePreference {

    private static final String TAG = "DefaultRingtonePreference";
@@ -43,6 +46,24 @@ 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);

    }



    @VisibleForTesting

    void setActualDefaultRingtoneUri(Uri ringtoneUri) {

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

    }

tests/unit/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ android_test { 
        "androidx.test.espresso.core",

        "androidx.test.espresso.contrib-nodeps",

        "androidx.test.espresso.intents-nodeps",

        "androidx.test.ext.junit",

        "mockito-target-minus-junit4",

        "platform-test-annotations",

        "truth-prebuilt",

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

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.ContentResolver;

import android.content.Context;

import android.media.RingtoneManager;

import android.net.Uri;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



/** Unittest for DefaultRingtonePreference. */

@RunWith(AndroidJUnit4.class)

public class DefaultRingtonePreferenceTest {



    private DefaultRingtonePreference mDefaultRingtonePreference;



    @Mock

    private ContentResolver mContentResolver;

    @Mock

    private Uri mRingtoneUri;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        Context context = spy(ApplicationProvider.getApplicationContext());

        doReturn(mContentResolver).when(context).getContentResolver();



        mDefaultRingtonePreference = spy(new DefaultRingtonePreference(context, null /* attrs */));

        doReturn(context).when(mDefaultRingtonePreference).getContext();

        when(mDefaultRingtonePreference.getRingtoneType())

                .thenReturn(RingtoneManager.TYPE_RINGTONE);

        mDefaultRingtonePreference.setUserId(1);

    }



    @Test

    public void onSaveRingtone_nullMimeType_shouldNotSetRingtone() {

        when(mContentResolver.getType(mRingtoneUri)).thenReturn(null);



        mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);



        verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);

    }



    @Test

    public void onSaveRingtone_notAudioMimeType_shouldNotSetRingtone() {

        when(mContentResolver.getType(mRingtoneUri)).thenReturn("text/plain");



        mDefaultRingtonePreference.onSaveRingtone(mRingtoneUri);



        verify(mDefaultRingtonePreference, never()).setActualDefaultRingtoneUri(mRingtoneUri);

    }

}