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

Commit 3da9f727 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Settings crashing while displaying phone number slice." into qt-dev

parents 6746e158 ae78184c

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
    private CharSequence getFirstPhoneNumber() {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

        if (subscriptionInfoList == null) {

        if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {

            return mContext.getText(R.string.device_info_default);

        }

tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java

+10 −0
Original line number Diff line number Diff line
@@ -149,6 +149,16 @@ public class PhoneNumberPreferenceControllerTest { 
        assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default));

    }



    @Test

    public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {

        List<SubscriptionInfo> infos = new ArrayList<>();

        when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(infos);



        CharSequence primaryNumber = mController.getSummary();



        assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default));

    }



    @Test

    public void isSliceable_shouldBeTrue() {

        assertThat(mController.isSliceable()).isTrue();