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

Merge "eSIM profile is not erased during Reset mobile network settings flow" into main

Browse Source
This commit is contained in:
Rambo Wang
2024-06-12 04:26:33 +00:00
committed by Android (Google) Code Review
parent 9cae01952c 98920c3714
commit 7ae5aaa69d
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ResetNetworkRequest.java
View File

@@ -270,6 +270,7 @@ public class ResetNetworkRequest {
if ((mResetOptions & RESET_IMS_STACK) != 0) {
builder.resetIms(mSubscriptionIdToResetIms);
}
// Reset phone process and RILD may impact above components, keep them at the end
if ((mResetOptions & RESET_PHONE_PROCESS) != 0) {
builder.restartPhoneProcess();
}

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

@@ -256,6 +256,7 @@ public class ResetNetworkOperationBuilder {
* @return this
*/
public ResetNetworkOperationBuilder restartPhoneProcess() {
Runnable runnable = () -> {
try {
mContext.getContentResolver().call(
getResetTelephonyContentProviderAuthority(),
@@ -266,6 +267,8 @@ public class ResetNetworkOperationBuilder {
} catch (IllegalArgumentException iae) {
Log.w(TAG, "Fail to restart phone process: " + iae);
}
};
mResetSequence.add(runnable);
return this;
}
@@ -275,6 +278,7 @@ public class ResetNetworkOperationBuilder {
* @return this
*/
public ResetNetworkOperationBuilder restartRild() {
Runnable runnable = () -> {
try {
mContext.getContentResolver().call(
getResetTelephonyContentProviderAuthority(),
@@ -285,6 +289,8 @@ public class ResetNetworkOperationBuilder {
} catch (IllegalArgumentException iae) {
Log.w(TAG, "Fail to restart RILD: " + iae);
}
};
mResetSequence.add(runnable);
return this;
}

8
tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
View File

@@ -188,7 +188,7 @@ public class ResetNetworkOperationBuilderTest {
doThrow(new IllegalArgumentException()).when(mContentProvider).call(
anyString(), anyString(), anyString(), any());
mBuilder.restartPhoneProcess();
mBuilder.restartPhoneProcess().build().run();
}
@Test
@@ -196,12 +196,12 @@ public class ResetNetworkOperationBuilderTest {
doThrow(new IllegalArgumentException()).when(mContentProvider).call(
anyString(), anyString(), anyString(), any());
mBuilder.restartRild();
mBuilder.restartRild().build().run();
}
@Test
public void restartPhoneProcess_withTelephonyContentProvider_shouldCallRestartPhoneProcess() {
mBuilder.restartPhoneProcess();
mBuilder.restartPhoneProcess().build().run();
verify(mContentProvider).call(
eq(mBuilder.getResetTelephonyContentProviderAuthority()),
@@ -212,7 +212,7 @@ public class ResetNetworkOperationBuilderTest {
@Test
public void restartRild_withTelephonyContentProvider_shouldCallRestartRild() {
mBuilder.restartRild();
mBuilder.restartRild().build().run();
verify(mContentProvider).call(
eq(mBuilder.getResetTelephonyContentProviderAuthority()),