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

Commit 531e1229 authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Updated the CarrierRestrictionRules#isAllCarriersAllowed() to support... 

Merge "Updated the CarrierRestrictionRules#isAllCarriersAllowed() to support the new carrier lock changes" into main
parents 18b32c39 c5c3d155

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

+4 −1
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ public class SimResponse extends IRadioSimResponse.Stub { 
            android.hardware.radio.sim.CarrierRestrictions carrierRestrictions,

            int multiSimPolicy) {

        RILRequest rr = mRil.processResponse(HAL_SERVICE_SIM, responseInfo);

        boolean carrierLockInfoSupported = mRil.getHalVersion(HAL_SERVICE_SIM).greater(

                RIL.RADIO_HAL_VERSION_2_2);

        if (rr == null) {

            return;

        }
@@ -132,7 +134,8 @@ public class SimResponse extends IRadioSimResponse.Stub { 
                RILUtils.convertAidlCarrierInfoList(

                        carrierRestrictions.allowedCarrierInfoList)).setExcludedCarrierInfo(

                RILUtils.convertAidlCarrierInfoList(

                        carrierRestrictions.excludedCarrierInfoList)).build();

                        carrierRestrictions.excludedCarrierInfoList)).setCarrierLockInfoFeature(

                carrierLockInfoSupported).build();

        if (responseInfo.error == RadioError.NONE) {

            RadioResponse.sendMessageResponse(rr.mResult, ret);

        }