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

Remove more wrappers

Browse Source 
Bug: 76167422
Test: make RunSettingsRoboTests -j40
Change-Id: I0dc42c483ae92d508dec94e42573b55ced0e4bb0
This commit is contained in:
Fan Zhang
2018-03-30 11:33:08 -07:00
parent e645558049
commit c0c3eaa66c
19 changed files with 130 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
package com.android.settings;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.AlertDialog;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
@@ -27,6 +29,7 @@ import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RecoverySystem;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
@@ -41,13 +44,9 @@ import android.widget.Toast;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.wrapper.RecoverySystemWrapper;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.utils.ThreadUtils;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
/**
* Confirm and execute a reset of the network settings to a clean "just out of the box"
@@ -65,7 +64,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@VisibleForTesting boolean mEraseEsim;
@VisibleForTesting EraseEsimAsyncTask mEraseEsimTask;
@VisibleForTesting static RecoverySystemWrapper mRecoverySystem;
/**
* Async task used to erase all the eSIM profiles from the phone. If error happens during
@@ -82,7 +80,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override
protected Boolean doInBackground(Void... params) {
return mRecoverySystem.wipeEuiccData(mContext, mPackageName);
return RecoverySystem.wipeEuiccData(mContext, mPackageName);
}
@Override
@@ -218,7 +216,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
}
mRecoverySystem = new RecoverySystemWrapper();
}
@Override