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

Merge ab/7061308 into stage.

Browse Source 
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
This commit is contained in:
Xin Li
2021-02-21 09:25:11 -08:00
parent 9e3bb7026c 8e18b5b69d
commit ad3fa60e26
237 changed files with 32244 additions and 47288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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