PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Misc change about ResetNetworkConfirm"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-08 08:10:16 +00:00
committed by Android (Google) Code Review
parent acc87f1d3f a5b25dfb06
commit 5894aa6948
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -72,6 +72,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@VisibleForTesting Activity mActivity;
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private ProgressDialog mProgressDialog;
private AlertDialog mAlertDialog;
/**
* Async task used to do all reset task. If error happens during
@@ -141,7 +142,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
.show();
} else {
new AlertDialog.Builder(mContext)
mAlertDialog = new AlertDialog.Builder(mContext)
.setTitle(R.string.reset_esim_error_title)
.setMessage(R.string.reset_esim_error_msg)
.setPositiveButton(android.R.string.ok, null /* listener */)
@@ -265,6 +266,12 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
mResetNetworkTask.cancel(true /* mayInterruptIfRunning */);
mResetNetworkTask = null;
}
if (mProgressDialog != null) {
mProgressDialog.dismiss();
}
if (mAlertDialog != null) {
mAlertDialog.dismiss();
}
super.onDestroy();
}