Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev (08b7f533) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/SubscriptionsPreferenceController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -456,7 +456,11 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
		}

		@Override
		public void onTelephonyDisplayInfoChanged(TelephonyDisplayInfo telephonyDisplayInfo) {
		public void onTelephonyDisplayInfoChanged(int subId,
		TelephonyDisplayInfo telephonyDisplayInfo) {
		if (subId != mSubsPrefCtrlInjector.getDefaultDataSubscriptionId()) {
		return;
		}
		mTelephonyDisplayInfo = telephonyDisplayInfo;
		update();
		}

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -37,8 +37,9 @@ public class TelephonyDisplayInfoListener {
		private TelephonyManager mBaseTelephonyManager;
		private Callback mCallback;
		private Map<Integer, PhoneStateListener> mListeners;
		private Map<Integer, TelephonyDisplayInfo> mDisplayInfos;

		private TelephonyDisplayInfo mTelephonyDisplayInfo =
		private static final TelephonyDisplayInfo mDefaultTelephonyDisplayInfo =
		new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,
		TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);
		/**
		@@ -48,19 +49,20 @@ public class TelephonyDisplayInfoListener {
		/**
		* Used to notify TelephonyDisplayInfo change.
		*/
		void onTelephonyDisplayInfoChanged(TelephonyDisplayInfo telephonyDisplayInfo);
		void onTelephonyDisplayInfoChanged(int subId, TelephonyDisplayInfo telephonyDisplayInfo);
		}

		public TelephonyDisplayInfoListener(Context context, Callback callback) {
		mBaseTelephonyManager = context.getSystemService(TelephonyManager.class);
		mCallback = callback;
		mListeners = new HashMap<>();
		mDisplayInfos = new HashMap<>();
		}
		/**
		* Get TelephonyDisplayInfo.
		*/
		public TelephonyDisplayInfo getTelephonyDisplayInfo() {
		return mTelephonyDisplayInfo;
		public TelephonyDisplayInfo getTelephonyDisplayInfo(int subId) {
		return mDisplayInfos.get(subId);
		}

		/** Resumes listening telephony display info changes to the set of ids from the last call to
		@@ -85,15 +87,17 @@ public class TelephonyDisplayInfoListener {
		for (int idToRemove : Sets.difference(currentIds, ids)) {
		stopListening(idToRemove);
		mListeners.remove(idToRemove);
		mDisplayInfos.remove(idToRemove);
		}
		for (int idToAdd : Sets.difference(ids, currentIds)) {
		PhoneStateListener listener = new PhoneStateListener() {
		@Override
		public void onDisplayInfoChanged(TelephonyDisplayInfo telephonyDisplayInfo) {
		mTelephonyDisplayInfo = telephonyDisplayInfo;
		mCallback.onTelephonyDisplayInfoChanged(telephonyDisplayInfo);
		mDisplayInfos.put(idToAdd, telephonyDisplayInfo);
		mCallback.onTelephonyDisplayInfoChanged(idToAdd, telephonyDisplayInfo);
		}
		};
		mDisplayInfos.put(idToAdd, mDefaultTelephonyDisplayInfo);
		mListeners.put(idToAdd, listener);
		startListening(idToAdd);
		}

tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -364,7 +364,8 @@ public class SubscriptionsPreferenceControllerTest {

		mController.onResume();
		mController.displayPreference(mPreferenceScreen);
		mController.onTelephonyDisplayInfoChanged(telephonyDisplayInfo);
		mController.onTelephonyDisplayInfoChanged(sub.get(0).getSubscriptionId(),
		telephonyDisplayInfo);

		assertThat(mPreferenceCategory.getPreference(0).getSummary()).isEqualTo(expectedSummary);
		}
		@@ -388,7 +389,8 @@ public class SubscriptionsPreferenceControllerTest {

		mController.onResume();
		mController.displayPreference(mPreferenceScreen);
		mController.onTelephonyDisplayInfoChanged(telephonyDisplayInfo);
		mController.onTelephonyDisplayInfoChanged(sub.get(0).getSubscriptionId(),
		telephonyDisplayInfo);

		assertThat(mPreferenceCategory.getPreference(0).getSummary()).isEqualTo(expectedSummary);
		}
		@@ -414,7 +416,8 @@ public class SubscriptionsPreferenceControllerTest {

		mController.onResume();
		mController.displayPreference(mPreferenceScreen);
		mController.onTelephonyDisplayInfoChanged(telephonyDisplayInfo);
		mController.onTelephonyDisplayInfoChanged(sub.get(0).getSubscriptionId(),
		telephonyDisplayInfo);

		assertThat(mPreferenceCategory.getPreference(0).getSummary()).isEqualTo(expectedSummary);
		}