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

Fixed display name not saved after carrier changed

Browse Source 
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
This commit is contained in:
Jack Yu
2019-04-09 22:25:00 -07:00
parent fa1c69ee44
commit 5e571128c1
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
View File

@@ -99,7 +99,8 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
mSubId); mSubId);
String newName = mNameView.getText().toString(); String newName = mNameView.getText().toString();
if (currentInfo != null && !currentInfo.getDisplayName().equals(newName)) { 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); .setNegativeButton(android.R.string.cancel, null);

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

@@ -102,7 +102,7 @@ public class RenameMobileNetworkDialogFragmentTest {
final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
negativeButton.performClick(); negativeButton.performClick();
verify(mSubscriptionMgr, never()).setDisplayName(anyString(), anyInt()); verify(mSubscriptionMgr, never()).setDisplayName(anyString(), anyInt(), anyInt());
} }
@Test @Test
@@ -118,7 +118,8 @@ public class RenameMobileNetworkDialogFragmentTest {
positiveButton.performClick(); positiveButton.performClick();
final ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); 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"); assertThat(captor.getValue()).isEqualTo("test2");
} }