Change to use DATA_ROAMING setting correctly with subId. (191fcbb5) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -446,10 +446,10 @@ public class PhoneFactory {
		Rlog.d(LOG_TAG, "set mobile_data: " + enabled);

		// Update the current data roaming flag
		enabled = Settings.Global.getInt(sContext.getContentResolver(),
		Settings.Global.DATA_ROAMING + subId, 0) != 0;
		enabled = TelephonyManager.getIntWithSubId(sContext.getContentResolver(),
		Settings.Global.DATA_ROAMING, subId, 0) != 0;
		Settings.Global.putInt(sContext.getContentResolver(),
		Settings.Global.DATA_ROAMING, enabled ? 1 : 0);
		Settings.Global.DATA_ROAMING + subId, enabled ? 1 : 0);
		Rlog.d(LOG_TAG, "set data_roaming: " + enabled);
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -398,7 +398,8 @@ public abstract class DcTrackerBase extends Handler {

		public void register() {
		mResolver.registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.DATA_ROAMING), false, this);
		Settings.Global.getUriFor(Settings.Global.DATA_ROAMING + mPhone.getSubId()),
		false, this);
		}

		public void unregister() {
		@@ -755,9 +756,11 @@ public abstract class DcTrackerBase extends Handler {
		try {
		final ContentResolver resolver = mPhone.getContext().getContentResolver();
		final int phoneSubId = mPhone.getSubId();
		return Settings.Global.getInt(resolver, Settings.Global.DATA_ROAMING + phoneSubId) != 0;
		return TelephonyManager.getIntWithSubId(resolver, Settings.Global.DATA_ROAMING,
		phoneSubId) != 0;
		} catch (SettingNotFoundException snfe) {
		return false;
		return "true".equalsIgnoreCase(SystemProperties.get("ro.com.android.dataroaming",
		"false"));
		}
		}