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

Commit 8139a15e authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Avoid an NPE for KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY" into main

parents 7d063231 bde1f961

src/java/com/android/internal/telephony/imsphone/ImsNrSaModeHandler.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -263,8 +263,9 @@ public class ImsNrSaModeHandler extends Handler{ 
            PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

            PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

                    KEY_NR_SA_DISABLE_POLICY_INT, KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

                    KEY_NR_SA_DISABLE_POLICY_INT, KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

            mNrSaDisablePolicy = bundle.getInt(KEY_NR_SA_DISABLE_POLICY_INT);

            mNrSaDisablePolicy = bundle.getInt(KEY_NR_SA_DISABLE_POLICY_INT);

            mIsNrSaSupported = Arrays.stream(

            int[] nrAvailabilities = bundle.getIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

                    bundle.getIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY)).anyMatch(

            mIsNrSaSupported = nrAvailabilities != null

                    && Arrays.stream(nrAvailabilities).anyMatch(

                            value -> value == CARRIER_NR_AVAILABILITY_SA);

                            value -> value == CARRIER_NR_AVAILABILITY_SA);





            Log.d(TAG, "setNrSaDisablePolicy : NrSaDisablePolicy = "

            Log.d(TAG, "setNrSaDisablePolicy : NrSaDisablePolicy = "