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

Commit 4255481b authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Say a phone is disconnected if we can't find it. 

isDataDisconnected(subId) was returning false if it couldn't
find a phone servicing the given subscription.  That seems
wrong and led to ServiceStateTracker thinking it was connected
if there was no SIM inserted.  That in turn led to very slow
AirplaneMode engagement.

bug: 21427496
Change-Id: I762e5dae6bc4263e846245ddd49097e8bc204e12
parent 75b2c358

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

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ public class ProxyController { 
            Phone activePhone = mProxyPhones[phoneId].getActivePhone();

            return ((PhoneBase) activePhone).mDcTracker.isDisconnected();

        } else {

            return false;

            // if we can't find a phone for the given subId, it is disconnected.

            return true;

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ public class SubscriptionController extends ISub.Stub { 
            for (int i = 0; i < numSubs; i++) {

                dummyValues[i] = SubscriptionManager.DUMMY_SUBSCRIPTION_ID_BASE - slotIdx;

            }

            if (DBG) {

            if (VDBG) {

                logd("getDummySubIds: slotIdx=" + slotIdx

                    + " return " + numSubs + " DummySubIds with each subId=" + dummyValues[0]);

            }