Merge "Fixed IMEI crash in HH without SIM" into lmp-mr1-dev (4a69b13a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionController.java

+16 −9

Original line number	Diff line number	Diff line
		@@ -442,6 +442,7 @@ public class SubscriptionController extends ISub.Stub {
		enforceSubscriptionPermission();

		List<SubscriptionInfo> subList = getActiveSubscriptionInfoList();
		if (subList != null) {
		for (SubscriptionInfo si : subList) {
		if (si.getSimSlotIndex() == slotIdx) {
		if (DBG) {
		@@ -452,7 +453,13 @@ public class SubscriptionController extends ISub.Stub {
		}
		}
		if (DBG) {
		logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIdx=" + slotIdx + " subId=null");
		logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIdx=" + slotIdx
		+ " subId=null");
		}
		} else {
		if (DBG) {
		logd("[getActiveSubscriptionInfoForSimSlotIndex]+ subList=null");
		}
		}
		return null;
		}