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

Guard NPE in RingtonePrefController

Browse Source 
Fixes: 126416474
Test: robotests
Change-Id: I02d0279ae107e7c03668849beaea8aa0463b4da6
This commit is contained in:
Fan Zhang
2019-02-26 15:45:17 -08:00
parent 7c261409d2
commit f1b5989706
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/notification/RingtonePreferenceControllerBase.java
View File

@@ -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(
mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);
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));
}
}

22
tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
View File

@@ -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,14 +56,26 @@ 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 {
extends RingtonePreferenceControllerBase {
RingtonePreferenceControllerBaseTestable(Context context) {
super(context);
}