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

Merge "Add the condtions to show the pSIM conversion menu" into main

Browse Source
This commit is contained in:
Hyunho Shin
2024-01-15 05:12:40 +00:00
committed by Android (Google) Code Review
parent f08c87d002 3d2c417236
commit 4130a95c5d
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/config.xml
View File

@@ -793,4 +793,8 @@
<!-- Whether to display pSIM conversion menu in Settings.-->
<bool name="config_psim_conversion_menu_enabled">false</bool>
<!-- Array of carrier id to allow the pSIM conversion-->
<integer-array name="config_psim_conversion_menu_enabled_carrier" translatable="false">
</integer-array>
</resources>

16
src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
View File

@@ -51,6 +51,7 @@ import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceController implements
@@ -111,7 +112,8 @@ public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceCo
* To avoid showing users dialogs that can cause confusion,
* add conditions to allow conversion in the absence of active eSIM.
*/
if (!mContext.getResources().getBoolean(R.bool.config_psim_conversion_menu_enabled)) {
if (!mContext.getResources().getBoolean(R.bool.config_psim_conversion_menu_enabled)
|| !isPsimConversionSupport(subId)) {
return CONDITIONALLY_UNAVAILABLE;
}
if (findConversionSupportComponent()) {
@@ -238,4 +240,16 @@ public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceCo
}
return true;
}
private boolean isPsimConversionSupport(int subId) {
SubscriptionManager subscriptionManager = mContext.getSystemService(
SubscriptionManager.class);
SubscriptionInfo subInfo = subscriptionManager.getActiveSubscriptionInfo(subId);
if (subInfo == null) {
return false;
}
final int[] supportedCarriers = mContext.getResources().getIntArray(
R.array.config_psim_conversion_menu_enabled_carrier);
return Arrays.stream(supportedCarriers).anyMatch(id -> id == subInfo.getCarrierId());
}
}