Merge "Avoid setting preferred phone with no phones" (71db1cdc) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1047,6 +1047,11 @@ public class PhoneSwitcher extends Handler {
	}		}

	private void transitionToEmergencyPhone() {		private void transitionToEmergencyPhone() {
			if (mNumPhones <= 0) {
			log("No phones: unable to reset preferred phone for emergency");
			return;
			}

	if (mPreferredDataPhoneId != DEFAULT_EMERGENCY_PHONE_ID) {		if (mPreferredDataPhoneId != DEFAULT_EMERGENCY_PHONE_ID) {
	log("No active subscriptions: resetting preferred phone to 0 for emergency");		log("No active subscriptions: resetting preferred phone to 0 for emergency");
	mPreferredDataPhoneId = DEFAULT_EMERGENCY_PHONE_ID;		mPreferredDataPhoneId = DEFAULT_EMERGENCY_PHONE_ID;