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

Merge "[Settings] Add some log" am: 190b9ae3fa am: cd59cb983e am: 724dfbda22

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

Change-Id: Icb61624f11f45e25dfb07c2d19e5386ce4c468bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2022-11-23 18:39:21 +00:00
committed by Automerger Merge Worker
parent 2de94ad9e7 724dfbda22
commit 7fabcb2a37
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/network/ResetNetworkOperationBuilder.java
View File

@@ -28,8 +28,10 @@ import android.net.wifi.WifiManager;
import android.net.wifi.p2p.WifiP2pManager;
import android.os.Looper;
import android.os.RecoverySystem;
import android.os.SystemClock;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.settings.network.apn.ApnSettings;
@@ -43,6 +45,10 @@ import java.util.function.Consumer;
*/
public class ResetNetworkOperationBuilder {
private static final String TAG = "ResetNetworkOpBuilder";
private static final boolean DRY_RUN = false;
private Context mContext;
private List<Runnable> mResetSequence = new ArrayList<Runnable>();
@@ -127,10 +133,17 @@ public class ResetNetworkOperationBuilder {
public ResetNetworkOperationBuilder resetEsim(String callerPackage,
Consumer<Boolean> resultCallback) {
Runnable runnable = () -> {
long startTime = SystemClock.elapsedRealtime();
if (!DRY_RUN) {
Boolean wipped = RecoverySystem.wipeEuiccData(mContext, callerPackage);
if (resultCallback != null) {
resultCallback.accept(wipped);
}
}
long endTime = SystemClock.elapsedRealtime();
Log.i(TAG, "Reset eSIM, takes " + (endTime - startTime) + " ms");
};
mResetSequence.add(runnable);
return this;
@@ -179,14 +192,21 @@ public class ResetNetworkOperationBuilder {
*/
public ResetNetworkOperationBuilder resetApn(int subscriptionId) {
Runnable runnable = () -> {
long startTime = SystemClock.elapsedRealtime();
Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
if (SubscriptionManager.isUsableSubscriptionId(subscriptionId)) {
uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(subscriptionId));
}
if (!DRY_RUN) {
ContentResolver resolver = mContext.getContentResolver();
resolver.delete(uri, null, null);
}
long endTime = SystemClock.elapsedRealtime();
Log.i(TAG, "Reset " + uri + ", takes " + (endTime - startTime) + " ms");
};
mResetSequence.add(runnable);
return this;
@@ -205,7 +225,14 @@ public class ResetNetworkOperationBuilder {
if (service == null) {
return;
}
Runnable runnable = () -> serviceAccess.accept(service);
Runnable runnable = () -> {
long startTime = SystemClock.elapsedRealtime();
if (!DRY_RUN) {
serviceAccess.accept(service);
}
long endTime = SystemClock.elapsedRealtime();
Log.i(TAG, "Reset " + serviceName + ", takes " + (endTime - startTime) + " ms");
};
mResetSequence.add(runnable);
}
}