Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" (564f7029) · Commits · e / os / android_frameworks_opt_telephony

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,

+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) {