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

Commit ab937ca7 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am:... 

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 564f7029 am: 42b18ce6

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1646911

Change-Id: I6b1de543ddc3fe61160fbe1eaede47bc7a15fff3
parents 347bdd9b 42b18ce6

src/java/com/android/internal/telephony/CarrierServiceStateTracker.java

+4 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.TelephonyManager.NetworkTypeBitMask;



import com.android.internal.annotations.VisibleForTesting;

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

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

import com.android.telephony.Rlog;
@@ -272,8 +273,9 @@ public class CarrierServiceStateTracker extends Handler { 
            Rlog.e(LOG_TAG, "isCarrierConfigEnableNr: Cannot get config " + mPhone.getSubId());

            return false;

        }

        return config.getInt(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT)

                != CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;

        int[] nrAvailabilities = config.getIntArray(

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

        return !ArrayUtils.isEmpty(nrAvailabilities);

    }



    private boolean checkSupportedBitmask(@NetworkTypeBitMask long supportedBitmask,

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −4
Original line number Diff line number Diff line
@@ -4571,10 +4571,9 @@ public class GsmCdmaPhone extends Phone { 
            loge("didn't get the carrier_nr_availability_int from the carrier config.");

            return;

        }

        mIsCarrierNrSupported = config.getInt(

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT,

                CarrierConfigManager.CARRIER_NR_AVAILABILITY_NSA)

                != CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;

        int[] nrAvailabilities = config.getIntArray(

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

        mIsCarrierNrSupported = !ArrayUtils.isEmpty(nrAvailabilities);

    }



    private void updateCdmaRoamingSettingsAfterCarrierConfigChanged(PersistableBundle config) {