Merge "Hide emergency APN in user settings"

src/com/android/settings/network/apn/ApnSettings.java

@@ -322,6 +322,8 @@ public class ApnSettings extends RestrictedSettingsFragment
         final StringBuilder where =
                 new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
                 + "user_visible!=0");
+        // Remove Emergency type, users should not mess with that
+        where.append(" AND NOT (type='emergency')");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");