am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev

* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
This commit is contained in:
Amit Mahajan
2014-12-01 19:32:06 +00:00
committed by Android Git Automerger

View File

@@ -3553,6 +3553,9 @@ public class TelephonyManager {
if (name.equals(Settings.Global.MOBILE_DATA)) {
default_val = "true".equalsIgnoreCase(
SystemProperties.get("ro.com.android.mobiledata", "true")) ? 1 : 0;
} else if (name.equals(Settings.Global.DATA_ROAMING)) {
default_val = "true".equalsIgnoreCase(
SystemProperties.get("ro.com.android.dataroaming", "false")) ? 1 : 0;
}
if (default_val != val) {