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

Commit da551843 authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Add missed check for setAllowedCarriers api." 

am: 43dd2bb7

Change-Id: I0372c9d7cca3c4d3699e6076b72b896a7336a450
parents 1a25e132 43dd2bb7

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

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import java.util.concurrent.atomic.AtomicInteger; 
import java.util.concurrent.atomic.AtomicLong;



import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



/**

 * {@hide}
@@ -3824,6 +3825,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    @Override

    public void setAllowedCarriers(List<CarrierIdentifier> carriers, Message result) {

        checkNotNull(carriers, "Allowed carriers list cannot be null.");

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_SET_ALLOWED_CARRIERS, result,