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

Commit 5e571128 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed display name not saved after carrier changed 

The caller needs to specify the name changing source, otherwise
telephony resets it to default after SIM swapped.

Bug: 130237749
Test: Manual
Change-Id: Iaa46db7bf22a35cb583faae069c9f2519ba4f94f
parent fa1c69ee

src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
                            mSubId);

                    String newName = mNameView.getText().toString();

                    if (currentInfo != null && !currentInfo.getDisplayName().equals(newName)) {

                        mSubscriptionManager.setDisplayName(newName, mSubId);

                        mSubscriptionManager.setDisplayName(newName, mSubId,

                                SubscriptionManager.NAME_SOURCE_USER_INPUT);

                    }

                })

                .setNegativeButton(android.R.string.cancel, null);

tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java

+3 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class RenameMobileNetworkDialogFragmentTest { 
        final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);

        negativeButton.performClick();



        verify(mSubscriptionMgr, never()).setDisplayName(anyString(), anyInt());

        verify(mSubscriptionMgr, never()).setDisplayName(anyString(), anyInt(), anyInt());

    }



    @Test
@@ -118,7 +118,8 @@ public class RenameMobileNetworkDialogFragmentTest { 
        positiveButton.performClick();



        final ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);

        verify(mSubscriptionMgr).setDisplayName(captor.capture(), eq(mSubscriptionId));

        verify(mSubscriptionMgr).setDisplayName(captor.capture(), eq(mSubscriptionId),

                eq(SubscriptionManager.NAME_SOURCE_USER_INPUT));

        assertThat(captor.getValue()).isEqualTo("test2");

    }