Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d90a68 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25865938'] into 24Q1-release. 

Change-Id: I3310fc40dda060f44990259e180937dbcdb756b6
parents bc068181 65edcbe0

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -779,4 +779,8 @@ 


    <!-- Package responsible for updating Mainline Modules -->

    <string name="config_mainline_module_update_package" translatable="false">com.android.vending</string>



    <!-- Whether to display pSIM conversion menu in Settings.-->

    <bool name="config_psim_conversion_menu_enabled">false</bool>



</resources>

src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.internal.telephony.util.TelephonyUtils;

import com.android.settings.R;

import com.android.settings.network.MobileNetworkRepository;

import com.android.settings.network.SubscriptionUtil;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -110,6 +111,9 @@ 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)) {

            return CONDITIONALLY_UNAVAILABLE;

        }

        if (findConversionSupportComponent()) {

            return mSubscriptionInfoEntity != null && mSubscriptionInfoEntity.isActiveSubscriptionId

                    && !mSubscriptionInfoEntity.isEmbedded && isActiveSubscription(subId)