diff options
| author | Mick Lin <Mick.Lin@mediatek.com> | 2015-01-27 11:33:54 +0800 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2015-01-29 12:02:26 -0800 |
| commit | cb184442b093c64416c93ef6f15d0d7dd7f7692c (patch) | |
| tree | e00cf1ce941b43246ccdc32bb1e5f77d8022b438 | |
| parent | 7bcab2da1afebf3eda3fb96402c507c0fea7f627 (diff) | |
| download | Mms-cb184442b093c64416c93ef6f15d0d7dd7f7692c.tar.gz | |
[DS] Correct the access method for telephony system propertyandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
Bug: 18675498
Change-Id: I8da86cfc62b55727229aaade776289fa7e8d099f
| -rw-r--r-- | src/com/android/mms/util/DownloadManager.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/mms/util/DownloadManager.java b/src/com/android/mms/util/DownloadManager.java index b6d9f497..713dff8b 100644 --- a/src/com/android/mms/util/DownloadManager.java +++ b/src/com/android/mms/util/DownloadManager.java @@ -35,6 +35,8 @@ import android.telephony.ServiceState; 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 @@ public class DownloadManager { } 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) { |