commit d0f3755197eef1a1c9a3b59765b1fc55c9115202
author Sanket Padawe <sanketpadawe@google.com> Sat Jan 24 00:06:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 24 00:06:37 2015 +0000
tree dd39a48c9948fa54ca9fb895a54d1d88871275ef
parent 489d03c0c3f7e360e89100ed05d03d347eff1538
parent 2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9

am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9

* commit '2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9':
  Hide APNs with type="ia" and apn=""

src/com/android/settings/ApnSettings.java

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 836a74d..61f741b 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -209,7 +209,7 @@
         Log.d(TAG, "mccmnc = " + mccmnc);
         final String where = "numeric=\""
             + mccmnc
-            + "\"";
+            + "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn", "type"}, where, null,