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

* commit '4ebd1e42a78dcb0ee219548b89f3733320bbc029':
  Change to use DATA_ROAMING setting correctly with subId.
This commit is contained in:
Amit Mahajan
2014-11-27 03:11:57 +00:00
committed by Android Git Automerger

View File

@@ -3557,6 +3557,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) {