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 am: 60de630fee am: ac636e9678

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4b7d4f3c411a05b1d2279928e7831c7c420e37b
This commit is contained in:
Jiashen Wang
2020-12-17 18:52:41 +00:00
committed by Automerger Merge Worker
parent 007e0a8e69 ac636e9678
commit 5e9380f512
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

@@ -92,6 +92,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) {
@@ -106,6 +107,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);
@@ -130,11 +135,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
} }
restoreDefaultApn(mContext); restoreDefaultApn(mContext);
if (mEraseEsim) { return isResetSucceed;
return RecoverySystem.wipeEuiccData(mContext, mPackageName);
} else {
return true;
}
} }
@Override @Override