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

Commit 0c5c8570 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Return reasonable phone type if no sim inserted." into mnc-dev

parents a2cbb3e6 d314de0a

telephony/java/android/telephony/TelephonyManager.java

+9 −2
Original line number Diff line number Diff line
@@ -944,10 +944,17 @@ public class TelephonyManager { 
    /** {@hide} */

    @SystemApi

    public int getCurrentPhoneType(int subId) {

        int phoneId = SubscriptionManager.getPhoneId(subId);

        int phoneId;

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            // if we don't have any sims, we don't have subscriptions, but we

            // still may want to know what type of phone we've got.

            phoneId = 0;

        } else {

            phoneId = SubscriptionManager.getPhoneId(subId);

        }

        try{

            ITelephony telephony = getITelephony();

            if (telephony != null) {

            if (telephony != null && subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                return telephony.getActivePhoneTypeForSubscriber(subId);

            } else {

                // This can happen when the ITelephony interface is not up yet.