diff options
author | Mick Lin <Mick.Lin@mediatek.com> | 2015-01-27 11:33:54 +0800 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-01-29 15:11:01 -0800 |
commit | d38a88c01d15c1f69cc7d7c698bdb6b386fa1434 (patch) | |
tree | e00cf1ce941b43246ccdc32bb1e5f77d8022b438 | |
parent | 641fc113cd2605bf44dd6cf22735f6680e2a6b0f (diff) | |
download | Mms-android-cts-5.1_r26.tar.gz |
[DS] Correct the access method for telephony system propertyandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-release
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) { |