resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp

am: d2477357e8

* commit 'd2477357e86f453b8aef9e4255edf55625c5cd3d':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: Ieb25454381616d68458e8416ffe933b77dcec9fd

src/com/android/settings/ApnEditor.java

@@ -262,6 +262,21 @@ public class ApnEditor extends InstrumentedPreferenceActivity
     @Override
     public void onResume() {
         super.onResume();
+
+        if (mUri == null && mNewApn) {
+            // The URI could have been deleted when activity is paused,
+            // therefore, it needs to be restored.
+            mUri = getContentResolver().insert(getIntent().getData(), new ContentValues());
+            if (mUri == null) {
+                Log.w(TAG, "Failed to insert new telephony provider into "
+                        + getIntent().getData());
+                finish();
+                return;
+            }
+            mCursor = managedQuery(mUri, sProjection, null, null);
+            mCursor.moveToFirst();
+        }
+
     }
 
     @Override
@@ -608,6 +623,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
         // If it's a new APN and a name or apn haven't been entered, then erase the entry
         if (force && mNewApn && name.length() < 1 && apn.length() < 1) {
             getContentResolver().delete(mUri, null, null);
+            mUri = null;
             return false;
         }