Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev (7be1bcf2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -406,13 +406,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
		}

		private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
		final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(
		mContext).getActiveSubscriptionInfoList(true);
		if (subscriptionInfoList != null && subscriptionInfoList.size() > slotId) {
		return subscriptionInfoList.get(slotId);
		} else {
		return null;
		}
		return SubscriptionManager.from(mContext).getActiveSubscriptionInfoForSimSlotIndex(slotId);
		}

		@VisibleForTesting