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

Commit 652c1add authored by Wink Saville's avatar Wink Saville
Browse files

Add debug dataEnable. 

Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
parent 3ec379cf

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

+5 −3
Original line number Diff line number Diff line
@@ -218,20 +218,22 @@ public class PhoneFactory { 


    public static Phone getPhone(int phoneId) {

        Phone phone;

        String dbgInfo = "";



        synchronized (sLockProxyPhones) {

            if (!sMadeDefaults) {

                throw new IllegalStateException("Default phones haven't been made yet!");

                // CAF_MSIM FIXME need to introduce default phone id ?

            } else if (phoneId == SubscriptionManager.DEFAULT_PHONE_INDEX) {

                Rlog.d(LOG_TAG, "getPhone: phoneId == DEFAULT_PHONE_ID");

                dbgInfo = "phoneId == DEFAULT_PHONE_ID return sProxyPhone";

                phone = sProxyPhone;

            } else {

                Rlog.d(LOG_TAG, "getPhone: phoneId != DEFAULT_PHONE_ID");

                dbgInfo = "phoneId != DEFAULT_PHONE_ID return sProxyPhones[phoneId]";

                phone = (((phoneId >= 0)

                                && (phoneId < TelephonyManager.getDefault().getPhoneCount()))

                        ? sProxyPhones[phoneId] : null);

            }

            Rlog.d(LOG_TAG, "getPhone:- phone=" + phone);

            Rlog.d(LOG_TAG, "getPhone:- " + dbgInfo + " phoneId=" + phoneId + " phone=" + phone);

            return phone;

        }

    }

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+9 −2
Original line number Diff line number Diff line
@@ -776,6 +776,7 @@ public abstract class DcTrackerBase extends Handler { 
    public void setDataEnabled(boolean enable) {

        Message msg = obtainMessage(DctConstants.CMD_SET_USER_DATA_ENABLE);

        msg.arg1 = enable ? 1 : 0;

        if (DBG) log("setDataEnabled: sendMessage: enable=" + enable);

        sendMessage(msg);

    }
@@ -784,14 +785,20 @@ public abstract class DcTrackerBase extends Handler { 
     */

    public boolean getDataEnabled() {

        final ContentResolver resolver = mPhone.getContext().getContentResolver();

        boolean retVal;

        try {

            int phoneSubId = mPhone.getSubId();

            return TelephonyManager.getIntWithSubId(resolver, Settings.Global.MOBILE_DATA,

            retVal = TelephonyManager.getIntWithSubId(resolver, Settings.Global.MOBILE_DATA,

                    phoneSubId) != 0;

            if (DBG) log("getDataEnabled: getIntWithSubId retVal=" + retVal);

        } catch (SettingNotFoundException snfe) {

            return "true".equalsIgnoreCase(

            retVal = "true".equalsIgnoreCase(

                    SystemProperties.get("ro.com.android.mobiledata", "true"));

            if (DBG) {

                log("getDataEnabled: system property ro.com.android.mobiledata retVal=" + retVal);

            }

        }

        return retVal;

    }



    // abstract methods