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

Commit f91bf163 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan Committed by Steve Kondik
Browse files

telephony: MSim: propagate roaming and data settings to SIM 

Update SIM-specific setting when global setting is set by API
rather than the MSim configuration dialog. (e.g. QuickSettings)

Change-Id: I1ea4aad02055be6bcc9132d6d91a65826b6765b2
parent 7e580a6c

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

+13 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.os.SystemProperties; 
import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.telephony.MSimTelephonyManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.EventLog;
@@ -689,6 +690,11 @@ public abstract class DcTrackerBase extends Handler { 
            final ContentResolver resolver = mPhone.getContext().getContentResolver();

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

            // will trigger handleDataOnRoamingChange() through observer



            if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

                int sub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

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

            }

        }

    }
@@ -1360,6 +1366,13 @@ public abstract class DcTrackerBase extends Handler { 
                mUserDataEnabled = enabled;

                Settings.Global.putInt(mPhone.getContext().getContentResolver(),

                        Settings.Global.MOBILE_DATA, enabled ? 1 : 0);



                if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {

                    int sub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

                    Settings.Global.putInt(mPhone.getContext().getContentResolver(),

                            Settings.Global.MOBILE_DATA + sub, enabled ? 1 : 0);

                }



                if (getDataOnRoamingEnabled() == false &&

                        mPhone.getServiceState().getRoaming() == true) {

                    if (enabled) {