Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7166eb92 authored by Joe Kaushal's avatar Joe Kaushal Committed by android-build-merger
Browse files

Merge "Avoid setting preferred phone with no phones" am: a843d87e am:... 

Merge "Avoid setting preferred phone with no phones" am: a843d87e am: 71db1cdc am: b2297f1a am: 2ea77b91
am: cfb7ac8e

Change-Id: Ic1c503a64a66f9e6a5f7c9d80ce2dfa9ce034236
parents b1f726b8 cfb7ac8e

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

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



    private void transitionToEmergencyPhone() {

        if (mNumPhones <= 0) {

            log("No phones: unable to reset preferred phone for emergency");

            return;

        }



        if (mPreferredDataPhoneId != DEFAULT_EMERGENCY_PHONE_ID) {

            log("No active subscriptions: resetting preferred phone to 0 for emergency");

            mPreferredDataPhoneId = DEFAULT_EMERGENCY_PHONE_ID;