Merge "Fixed display name not saved after carrier changed" into qt-dev (b3467600) · Commits · e / os / android_packages_apps_Settings

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);

+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");
		}