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

Commit 37c531bb authored by donaldahn's avatar donaldahn Committed by Sungcheol Ahn
Browse files

[Telephony] phone state check for network request 

Bug: b/227577111
Test: Network config : Lab Amarisoft - Telstra, band 3, 7. LTE only.
 Device config: pSIM disabled, eSIM pin locked (or puk locked)
 test script: test_dsds_esim_puk1_locked_and_psim_disabled_airplane_on_lte
Test: (TMUS) Dialing, Receiving and SIM switching test on live network
Test: ATest PhoneSwitcherTest
Change-Id: I92a4ef47b37dab2fcc6f838585fc9ddb9e3b849c
Merged-In: I92a4ef47b37dab2fcc6f838585fc9ddb9e3b849c
parent c68af5f2

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

+10 −1
Original line number Diff line number Diff line
@@ -1426,8 +1426,17 @@ public class PhoneSwitcher extends Handler { 
            return false;

        }



        int phoneIdToHandle = phoneIdForRequest(networkRequest);

        NetworkRequest netRequest = networkRequest.getNativeNetworkRequest();

        int subId = getSubIdFromNetworkSpecifier(netRequest.getNetworkSpecifier());



        //if this phone is an emergency networkRequest

        //and subId is not specified that is invalid or default

        if (isAnyVoiceCallActiveOnDevice() && isEmergencyNetworkRequest(networkRequest)

                && (subId == DEFAULT_SUBSCRIPTION_ID || subId == INVALID_SUBSCRIPTION_ID)) {

            return phoneId == mPhoneIdInVoiceCall;

        }



        int phoneIdToHandle = phoneIdForRequest(networkRequest);

        return phoneId == phoneIdToHandle;

    }