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

Fix Settings restart during Reset mobile nework settings flow

Browse Source 
This CL avoids restarting Settings in the reset mobile flow when phone
process is restarted, by switching the usage of the stable content
provider connection to the unstable client.

The CL also arranges restarting phone process as the last reset
operation in the flow (later than RILD reset) to avoid any reset
operation get impacted by phone process restarting.

Since the permission to protect the TelephonyContentProvider has been
renamed, the CL also renames the requsted permision.

Bug: 347047105
Test: atest ResetNetworkOperationBuilderTest
Test: Reset mobile network feature test
Flag: EXEMPT resource update with minor refactoring
Change-Id: I7bfa79bc9d7451a4a03269704b0009a3730e287f
This commit is contained in:
Rambo Wang
2024-06-19 02:09:41 +00:00
parent a3894e6761
commit 5ac9d9c8fa
4 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.settings.network;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -28,11 +29,14 @@ import android.net.wifi.WifiManager;
import android.net.wifi.p2p.WifiP2pManager;
import android.os.Looper;
import android.os.RecoverySystem;
import android.os.RemoteException;
import android.os.SystemClock;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.ResetNetworkRequest;
@@ -257,15 +261,15 @@ public class ResetNetworkOperationBuilder {
*/
public ResetNetworkOperationBuilder restartPhoneProcess() {
Runnable runnable = () -> {
try {
mContext.getContentResolver().call(
getResetTelephonyContentProviderAuthority(),
METHOD_RESTART_PHONE_PROCESS,
/* arg= */ null,
/* extras= */ null);
Log.i(TAG, "Phone process was restarted.");
} catch (IllegalArgumentException iae) {
Log.w(TAG, "Fail to restart phone process: " + iae);
// Unstable content provider can avoid us getting killed together with phone process
try (ContentProviderClient client = getUnstableTelephonyContentProviderClient()) {
if (client != null) {
client.call(METHOD_RESTART_PHONE_PROCESS, /* arg= */ null, /* extra= */ null);
Log.i(TAG, "Phone process was restarted.");
}
} catch (RemoteException re) {
// It's normal to throw RE since phone process immediately dies
Log.i(TAG, "Phone process has been restarted: " + re);
}
};
mResetSequence.add(runnable);
@@ -279,15 +283,13 @@ public class ResetNetworkOperationBuilder {
*/
public ResetNetworkOperationBuilder restartRild() {
Runnable runnable = () -> {
try {
mContext.getContentResolver().call(
getResetTelephonyContentProviderAuthority(),
METHOD_RESTART_RILD,
/* arg= */ null,
/* extras= */ null);
Log.i(TAG, "RILD was restarted.");
} catch (IllegalArgumentException iae) {
Log.w(TAG, "Fail to restart RILD: " + iae);
try (ContentProviderClient client = getUnstableTelephonyContentProviderClient()) {
if (client != null) {
client.call(METHOD_RESTART_RILD, /* arg= */ null, /* extra= */ null);
Log.i(TAG, "RILD was restarted.");
}
} catch (RemoteException re) {
Log.w(TAG, "Fail to restart RILD: " + re);
}
};
mResetSequence.add(runnable);
@@ -322,9 +324,18 @@ public class ResetNetworkOperationBuilder {
* @return the authority of the telephony content provider that support methods
* resetPhoneProcess and resetRild.
*/
@VisibleForTesting
String getResetTelephonyContentProviderAuthority() {
private String getResetTelephonyContentProviderAuthority() {
return mContext.getResources().getString(
R.string.reset_telephony_stack_content_provider_authority);
}
/**
* @return the unstable content provider to avoid us getting killed with phone process
*/
@Nullable
@VisibleForTesting
public ContentProviderClient getUnstableTelephonyContentProviderClient() {
return mContext.getContentResolver().acquireUnstableContentProviderClient(
getResetTelephonyContentProviderAuthority());
}
}