From 5e571128c1aebde7427b290d3be61bee1f169978 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 9 Apr 2019 22:25:00 -0700 Subject: [PATCH] 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 --- .../network/telephony/RenameMobileNetworkDialogFragment.java | 3 ++- .../telephony/RenameMobileNetworkDialogFragmentTest.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index 488f9300e2e..7a131d73313 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java index df523029414..70816eacfa8 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java @@ -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 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"); }