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

Commit 25e3f0d8 authored by Wink Saville's avatar Wink Saville
Browse files

Have SubscriptionInfo.getDataRoaming return proper value. 

In DcTrackerBase.setDataOnRoamingEnabled
call mSubscriptionManager.setDataRoaming so SubscriptionInfo.getDataRoaming
returns valid information.

Bug: 18784668
Change-Id: Ibeef8049cfa2673fd6044ed726b0750383c8a355
parent a097459c

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

+24 −6
Original line number Diff line number Diff line
@@ -771,11 +771,22 @@ public abstract class DcTrackerBase extends Handler { 
     * Modify {@link android.provider.Settings.Global#DATA_ROAMING} value.

     */

    public void setDataOnRoamingEnabled(boolean enabled) {

        final int phoneSubId = mPhone.getSubId();

        if (getDataOnRoamingEnabled() != enabled) {

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

            final int phoneSubId = mPhone.getSubId();

            Settings.Global.putInt(resolver, Settings.Global.DATA_ROAMING + phoneSubId, enabled ? 1 : 0);

            int roaming = enabled ? 1 : 0;

            Settings.Global.putInt(resolver, Settings.Global.DATA_ROAMING + phoneSubId, roaming);

            mSubscriptionManager.setDataRoaming(roaming, phoneSubId);

            // will trigger handleDataOnRoamingChange() through observer

            if (DBG) {

               log("setDataOnRoamingEnabled: set phoneSubId=" + phoneSubId

                       + " isRoaming=" + enabled);

            }

        } else {

            if (DBG) {

                log("setDataOnRoamingEnabled: unchanged phoneSubId=" + phoneSubId

                        + " isRoaming=" + enabled);

             }

        }

    }
@@ -783,15 +794,22 @@ public abstract class DcTrackerBase extends Handler { 
     * Return current {@link android.provider.Settings.Global#DATA_ROAMING} value.

     */

    public boolean getDataOnRoamingEnabled() {

        boolean isRoaming;

        final int phoneSubId = mPhone.getSubId();



        try {

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

            final int phoneSubId = mPhone.getSubId();

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

                    phoneSubId) != 0;

            isRoaming = TelephonyManager.getIntWithSubId(resolver,

                    Settings.Global.DATA_ROAMING, phoneSubId) != 0;

        } catch (SettingNotFoundException snfe) {

            return "true".equalsIgnoreCase(SystemProperties.get("ro.com.android.dataroaming",

            if (DBG) log("getDataOnRoamingEnabled: SettingNofFoundException snfe=" + snfe);

            isRoaming = "true".equalsIgnoreCase(SystemProperties.get("ro.com.android.dataroaming",

                    "false"));

        }

        if (DBG) {

            log("getDataOnRoamingEnabled: phoneSubId=" + phoneSubId + " isRoaming=" + isRoaming);

        }

        return isRoaming;

    }



    /**