Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev

am: 9fa82a370b

Change-Id: If9af81bfa4d99eee0b211b7216b3ca9d1baa66f2
This commit is contained in:
Fan Zhang
2019-04-25 00:13:10 -07:00
committed by android-build-merger

View File

@@ -406,13 +406,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
} }
private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) { private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from( return SubscriptionManager.from(mContext).getActiveSubscriptionInfoForSimSlotIndex(slotId);
mContext).getActiveSubscriptionInfoList(true);
if (subscriptionInfoList != null && subscriptionInfoList.size() > slotId) {
return subscriptionInfoList.get(slotId);
} else {
return null;
}
} }
@VisibleForTesting @VisibleForTesting