Remove CURRENT column check when querying for MMS APN

CURRENT column is not properly updated in telephony therefore may cause
MMS service's failure to load APN from system. Removing the CURRENT
column check temporarily to allow MMS to work.

b/17471739

Change-Id: Iaf05f4ea9d5b70a92f52c0ddd109a7676057d8f7

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/mms/service/ApnSettings.java b/src/com/android/mms/service/ApnSettings.java
index 5d59855..4e43685 100644
--- a/src/com/android/mms/service/ApnSettings.java
+++ b/src/com/android/mms/service/ApnSettings.java
@@ -67,11 +67,14 @@ public class ApnSettings {
         if (Log.isLoggable(TAG, Log.VERBOSE)) {
             Log.v(TAG, "ApnSettings: apnName " + apnName);
         }
-        String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
+        // TODO: CURRENT semantics is currently broken in telephony. Revive this when it is fixed.
+        //String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
+        String selection = null;
         String[] selectionArgs = null;
         apnName = apnName != null ? apnName.trim() : null;
         if (!TextUtils.isEmpty(apnName)) {
-            selection += " AND " + Telephony.Carriers.APN + "=?";
+            //selection += " AND " + Telephony.Carriers.APN + "=?";
+            selection = Telephony.Carriers.APN + "=?";
             selectionArgs = new String[]{ apnName };
         }
         Cursor cursor = null;