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

Commit d314de0a authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Return reasonable phone type if no sim inserted. 

With no sim, there's no subscription, no default phone, etc.
If we're asked for phone type for an invalid sub, just use the
first phone.

bug: 20760370
Change-Id: Ide7b0679e7253e1f1ce563a68fbbec1ff8c24daf
parent 9622c0cc

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.