Merge "Fixed crash in getActiveDataSubscriptionId" into qt-r1-dev (07d66def) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -3779,11 +3779,16 @@ public class SubscriptionController extends ISub.Stub {
		final long token = Binder.clearCallingIdentity();

		try {
		int subId = PhoneSwitcher.getInstance().getActiveDataSubId();
		if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
		subId = getDefaultDataSubId();
		PhoneSwitcher phoneSwitcher = PhoneSwitcher.getInstance();
		if (phoneSwitcher != null) {
		int activeDataSubId = phoneSwitcher.getActiveDataSubId();
		if (SubscriptionManager.isUsableSubscriptionId(activeDataSubId)) {
		return activeDataSubId;
		}
		return subId;
		}
		// If phone switcher isn't ready, or active data sub id is not available, use default
		// sub id from settings.
		return getDefaultDataSubId();
		} finally {
		Binder.restoreCallingIdentity(token);
		}