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

Commit 2248941d authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev

parents c26fabff 81524c89

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

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr 
    @Override

    public int getAvailabilityStatus(int subId) {

        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);

        if (mTelephonyManager == null) {

            Log.w(LOG_TAG, "Telephony manager not yet initialized");

            mTelephonyManager = mContext.getSystemService(TelephonyManager.class);

        }

        boolean visible =

                SubscriptionManager.isUsableSubscriptionId(subId)

                && carrierConfig != null

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

+1 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class EnabledNetworkModePreferenceController extends 
    public EnabledNetworkModePreferenceController(Context context, String key) {

        super(context, key);

        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);

        mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);

    }



    @Override
@@ -145,7 +146,6 @@ public class EnabledNetworkModePreferenceController extends 
        mSubId = subId;

        mTelephonyManager = mContext.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(mSubId);

        mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);

        mBuilder = new PreferenceEntriesBuilder(mContext, mSubId);



        if (mAllowedNetworkTypesListener == null) {