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

Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev

Browse Source
This commit is contained in:
Jiashen Wang
2020-12-17 17:44:31 +00:00
committed by Android (Google) Code Review
parent 0968b8603e c1ed4d5485
commit 60de630fee
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override @Override
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(Void... params) {
boolean isResetSucceed = true;
ConnectivityManager connectivityManager = (ConnectivityManager) ConnectivityManager connectivityManager = (ConnectivityManager)
mContext.getSystemService(Context.CONNECTIVITY_SERVICE); mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivityManager != null) { if (connectivityManager != null) {
@@ -101,6 +102,10 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
p2pFactoryReset(mContext); p2pFactoryReset(mContext);
if (mEraseEsim) {
isResetSucceed = RecoverySystem.wipeEuiccData(mContext, mPackageName);
}
TelephonyManager telephonyManager = (TelephonyManager) TelephonyManager telephonyManager = (TelephonyManager)
mContext.getSystemService(TelephonyManager.class) mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId); .createForSubscriptionId(mSubId);
@@ -125,11 +130,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
} }
restoreDefaultApn(mContext); restoreDefaultApn(mContext);
if (mEraseEsim) { return isResetSucceed;
return RecoverySystem.wipeEuiccData(mContext, mPackageName);
} else {
return true;
}
} }
@Override @Override