commit d38a88c01d15c1f69cc7d7c698bdb6b386fa1434
author Mick Lin <Mick.Lin@mediatek.com> Tue Jan 27 11:33:54 2015 +0800
committer The Android Automerger <android-build@google.com> Thu Jan 29 15:11:01 2015 -0800
tree e00cf1ce941b43246ccdc32bb1e5f77d8022b438
parent 641fc113cd2605bf44dd6cf22735f6680e2a6b0f

[DS] Correct the access method for telephony system property

Bug: 18675498
Change-Id: I8da86cfc62b55727229aaade776289fa7e8d099f

src/com/android/mms/util/DownloadManager.java

diff --git a/src/com/android/mms/util/DownloadManager.java b/src/com/android/mms/util/DownloadManager.java
index b6d9f49..713dff8 100644
--- a/src/com/android/mms/util/DownloadManager.java
+++ b/src/com/android/mms/util/DownloadManager.java
@@ -35,6 +35,8 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.mms.LogTag;
@@ -178,13 +180,15 @@
     }
 
     static boolean isRoaming() {
-        // TODO: fix and put in Telephony layer
-        String roaming = SystemProperties.get(
-                TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, null);
-        if (LOCAL_LOGV) {
-            Log.v(TAG, "roaming ------> " + roaming);
+        return isRoaming(SubscriptionManager.getDefaultSmsSubId());
+    }
+
+    static boolean isRoaming(int subId) {
+        TelephonyManager teleMgr = TelephonyManager.getDefault();
+        if (teleMgr == null) {
+            return false;
         }
-        return "true".equals(roaming);
+        return teleMgr.isNetworkRoaming(subId);
     }
 
     public void markState(final Uri uri, int state) {