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

2014-11-27 03:05:45 +00:00
parent 9b35b801fb 5ed82c8ca0
commit 4ebd1e42a7
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -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) {