Merge "avoid stopping app in case of accessing empty db"

src/com/android/settings/ApnSettings.java

@@ -164,6 +164,7 @@ public class ApnSettings extends PreferenceActivity implements
                 "_id", "name", "apn", "type"}, where, null,
                 Telephony.Carriers.DEFAULT_SORT_ORDER);
 
+        if (cursor != null) {
             PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
             apnList.removeAll();
 
@@ -203,6 +204,7 @@ public class ApnSettings extends PreferenceActivity implements
                 apnList.addPreference(preference);
             }
         }
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {