Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev

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

@@ -467,6 +467,9 @@ public class ApnSettings extends RestrictedSettingsFragment
     }
 
     private boolean restoreDefaultApn() {
+        // Callback of data connection change could be some noise during the stage of restore.
+        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+
         showDialog(DIALOG_RESTORE_DEFAULTAPN);
         mRestoreDefaultApnMode = true;
 
@@ -517,6 +520,7 @@ public class ApnSettings extends RestrictedSettingsFragment
                         getResources().getString(
                                 R.string.restore_default_apn_completed),
                         Toast.LENGTH_LONG).show();
+                    restartPhoneStateListener(mSubId);
                     break;
             }
         }