Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0
am: 99724f3a70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786 Change-Id: Ia35c3a1ed116f73e2e361b6b955badd20009dc8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -467,6 +467,9 @@ public class ApnSettings extends RestrictedSettingsFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean restoreDefaultApn() {
|
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);
|
showDialog(DIALOG_RESTORE_DEFAULTAPN);
|
||||||
mRestoreDefaultApnMode = true;
|
mRestoreDefaultApnMode = true;
|
||||||
|
|
||||||
@@ -517,6 +520,7 @@ public class ApnSettings extends RestrictedSettingsFragment
|
|||||||
getResources().getString(
|
getResources().getString(
|
||||||
R.string.restore_default_apn_completed),
|
R.string.restore_default_apn_completed),
|
||||||
Toast.LENGTH_LONG).show();
|
Toast.LENGTH_LONG).show();
|
||||||
|
restartPhoneStateListener(mSubId);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user