Merge "Fixed ANR during boot up" into main (79fae788) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/PhoneSwitcher.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -1491,8 +1491,9 @@ public class PhoneSwitcher extends Handler {
		mPreferredDataPhoneId = mEmergencyOverride.mPhoneId;
		mLastSwitchPreferredDataReason = DataSwitch.Reason.DATA_SWITCH_REASON_UNKNOWN;
		} else {
		if (isAnyVoiceCallActiveOnDevice()) {
		int imsRegTech = mImsRegTechProvider.get(mContext, mPhoneIdInVoiceCall);
		if (isAnyVoiceCallActiveOnDevice() && imsRegTech != REGISTRATION_TECH_IWLAN) {
		if (imsRegTech != REGISTRATION_TECH_IWLAN) {
		if (imsRegTech != REGISTRATION_TECH_CROSS_SIM) {
		mPreferredDataPhoneId = shouldSwitchDataDueToInCall()
		? mPhoneIdInVoiceCall : getFallbackDataPhoneIdForInternetRequests();
		@@ -1503,6 +1504,9 @@ public class PhoneSwitcher extends Handler {
		} else {
		mPreferredDataPhoneId = getFallbackDataPhoneIdForInternetRequests();
		}
		} else {
		mPreferredDataPhoneId = getFallbackDataPhoneIdForInternetRequests();
		}
		}

		mPreferredDataSubId.set(SubscriptionManager.getSubscriptionId(mPreferredDataPhoneId));