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

Add new dialogue and RAC logic.

Browse Source 
A new dialogue will pop up if the eSIM that is being deleted has carrier
Vodafone DE and does not have wifi connection or connection from another
sim.

Test: make, atest SubscriptionUtilTest and tested manually
Bug: 316419093
Change-Id: I957b67339a0ab651f38984e7d1061a8aff8fe2a1
This commit is contained in:
Rafael Higuera Silva
2024-02-28 17:40:00 +00:00
parent 383097f192
commit 48fee33ea2
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,9 +49,11 @@ import com.android.settings.flags.Flags;
import com.android.settings.network.helper.SelectableSubscriptions;
import com.android.settings.network.helper.SubscriptionAnnotation;
import com.android.settings.network.telephony.DeleteEuiccSubscriptionDialogActivity;
import com.android.settings.network.telephony.EuiccRacConnectivityDialogActivity;
import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -557,13 +559,21 @@ public class SubscriptionUtil {
* @param context {@code Context}
* @param subId The id of subscription need to be deleted.
*/
public static void startDeleteEuiccSubscriptionDialogActivity(Context context, int subId) {
public static void startDeleteEuiccSubscriptionDialogActivity(Context context, int subId,
int carrierId) {
if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
Log.i(TAG, "Unable to delete subscription due to invalid subscription ID.");
return;
}
// TODO(b/325693582): Add verification if carrier is RAC and logic for new dialog
context.startActivity(DeleteEuiccSubscriptionDialogActivity.getIntent(context, subId));
final int[] carriersThatUseRAC = context.getResources().getIntArray(
R.array.config_carrier_use_rac);
boolean isCarrierRac = Arrays.stream(carriersThatUseRAC).anyMatch(cid -> cid == carrierId);
if (isCarrierRac && !isConnectedToWifiOrDifferentSubId(context, subId)) {
context.startActivity(EuiccRacConnectivityDialogActivity.getIntent(context, subId));
} else {
context.startActivity(DeleteEuiccSubscriptionDialogActivity.getIntent(context, subId));
}
}
/**