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

Commit f1b59897 authored by Fan Zhang's avatar Fan Zhang
Browse files

Guard NPE in RingtonePrefController 

Fixes: 126416474
Test: robotests
Change-Id: I02d0279ae107e7c03668849beaea8aa0463b4da6
parent 7c261409

src/com/android/settings/notification/RingtonePreferenceControllerBase.java

+11 −6
Original line number Diff line number Diff line
@@ -50,13 +50,18 @@ public abstract class RingtonePreferenceControllerBase extends AbstractPreferenc 
    }



    private void updateSummary(Preference preference) {

        Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(mContext, getRingtoneType());

        final CharSequence summary = Ringtone.getTitle(

        final Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(

                mContext, getRingtoneType());



        final CharSequence summary;

        if (ringtoneUri == null) {

            summary = null;

        } else {

            summary = Ringtone.getTitle(

                    mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);

        }

        if (summary != null) {

            ThreadUtils.postOnMainThread(() -> {

                preference.setSummary(summary);

            });

            ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));

        }

    }

tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java

+17 −5
Original line number Diff line number Diff line
@@ -20,31 +20,31 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.media.RingtoneManager;

import android.provider.Settings;



import androidx.preference.Preference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class RingtonePreferenceControllerBaseTest {



    @Mock

    private Context mContext;



    private RingtonePreferenceControllerBase mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new RingtonePreferenceControllerBaseTestable(mContext);

    }
@@ -56,12 +56,24 @@ public class RingtonePreferenceControllerBaseTest { 
    @Test

    public void updateState_shouldSetSummary() {

        Preference preference = mock(Preference.class);

        Settings.System.putString(mContext.getContentResolver(), Settings.System.RINGTONE,

                "content://test/ringtone");



        mController.updateState(preference);



        verify(preference).setSummary(anyString());

    }



    @Test

    public void updateState_nullRingtone_shouldNotGetTitle() {

        Preference preference = mock(Preference.class);

        Settings.System.putString(mContext.getContentResolver(), Settings.System.RINGTONE, null);



        mController.updateState(preference);



        verify(preference, never()).setSummary(anyString());

    }



    private class RingtonePreferenceControllerBaseTestable

            extends RingtonePreferenceControllerBase {

        RingtonePreferenceControllerBaseTestable(Context context) {