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

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

Merge "Say a phone is disconnected if we can't find it." into mnc-dev

parents 745e2f48 4255481b

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]);

            }