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

Extract and fix logic for showing rac dialog.

Browse Source 
Added tests to make sure the logic makes sense.

Bug: 335745726
Test: make, manual, atest SubscriptionUtilRoboTest, atest SubscriptionUtilTest, atest ResetNetworkTest
Change-Id: I7092f2747f1ca1f9ef4dc99275a916b9e24d8b28
This commit is contained in:
Rafael Higuera Silva
2024-04-23 17:31:23 +00:00
parent c6005fb22a
commit 36d99e8b09
5 changed files with 87 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ResetNetwork.java
View File

@@ -158,7 +158,7 @@ public class ResetNetwork extends InstrumentedFragment {
.setTitleRes(R.string.reset_mobile_network_settings_confirm_title)
.setSourceMetricsCategory(getMetricsCategory());
if (resetSims && SubscriptionUtil.shouldShowRacDialog(context)) {
if (resetSims && SubscriptionUtil.shouldShowRacDialogWhenErasingAllEsims(context)) {
context.startActivity(
EuiccRacConnectivityDialogActivity.getIntent(context, launcher.toIntent()));
} else {

2
src/com/android/settings/network/EraseEuiccDataController.java
View File

@@ -50,7 +50,7 @@ public class EraseEuiccDataController extends BasePreferenceController {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false;
}
if (SubscriptionUtil.shouldShowRacDialog(mContext)) {
if (SubscriptionUtil.shouldShowRacDialogWhenErasingAllEsims(mContext)) {
EuiccRacConnectivityDialogFragment.show(mHostFragment);
} else {
EraseEuiccDataDialogFragment.show(mHostFragment);

25
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -542,9 +542,7 @@ public class SubscriptionUtil {
return;
}
if (isCarrierRac(context, carrierId)
&& (!isConnectedToWifi(context)
|| isConnectedToMobileDataWithDifferentSubId(context, subId))) {
if (shouldShowRacDialogWhenErasingEsim(context, subId, carrierId)) {
context.startActivity(EuiccRacConnectivityDialogActivity.getIntent(context, subId));
} else {
context.startActivity(DeleteEuiccSubscriptionDialogActivity.getIntent(context, subId));
@@ -883,18 +881,35 @@ public class SubscriptionUtil {
}
/**
* Check if warning dialog should be presented when erasing all eSIMS.
* Check if warning dialog should be presented when erasing all eSIMs.
*
* @param context Context to check if any sim carrier use RAC and device Wi-Fi connection.
* @return {@code true} if dialog should be presented to the user.
*/
public static boolean shouldShowRacDialog(@NonNull Context context) {
public static boolean shouldShowRacDialogWhenErasingAllEsims(@NonNull Context context) {
if (sEnableRacDialogForTesting != null) {
return sEnableRacDialogForTesting;
}
return !isConnectedToWifi(context) && hasSubscriptionWithRacCarrier(context);
}
/**
* Check if warning dialog should be presented when erasing eSIM.
*
* @param context Context to check if any sim carrier use RAC and device Wi-Fi connection.
* @param subId Subscription ID for the single eSIM.
* @param carrierId Carrier ID for the single eSIM.
* @return {@code true} if dialog should be presented to the user.
*/
@VisibleForTesting
static boolean shouldShowRacDialogWhenErasingEsim(
@NonNull Context context, int subId, int carrierId) {
return isCarrierRac(context, carrierId)
&& !isConnectedToWifi(context)
&& !isConnectedToMobileDataWithDifferentSubId(context, subId);
}
/**
* Retrieves NetworkCapabilities for the active network.
*