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

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

Merge "Change the visibility of setCarrierRestrictionStatus API in... 

Merge "Change the visibility of setCarrierRestrictionStatus API in carrierRestrictionRules" into main
parents 62068a5b 4e8e2394

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14435,6 +14435,7 @@ package android.telephony { 
    method @NonNull public android.telephony.CarrierRestrictionRules build();

    method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllCarriersAllowed();

    method @NonNull public android.telephony.CarrierRestrictionRules.Builder setAllowedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);

    method @FlaggedApi("com.android.internal.telephony.flags.set_carrier_restriction_status") @NonNull public android.telephony.CarrierRestrictionRules.Builder setCarrierRestrictionStatus(int);

    method @NonNull public android.telephony.CarrierRestrictionRules.Builder setDefaultCarrierRestriction(int);

    method @NonNull public android.telephony.CarrierRestrictionRules.Builder setExcludedCarriers(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);

    method @NonNull public android.telephony.CarrierRestrictionRules.Builder setMultiSimPolicy(int);

telephony/java/android/telephony/CarrierRestrictionRules.java

+3 −2
Original line number Diff line number Diff line
@@ -555,10 +555,11 @@ public final class CarrierRestrictionRules implements Parcelable { 
         * Set the device's carrier restriction status

         *

         * @param carrierRestrictionStatus device restriction status

         * @hide

         */

        public @NonNull

        Builder setCarrierRestrictionStatus(int carrierRestrictionStatus) {

        @FlaggedApi(Flags.FLAG_SET_CARRIER_RESTRICTION_STATUS)

        Builder setCarrierRestrictionStatus(

                @CarrierRestrictionStatus int carrierRestrictionStatus) {

            mRules.mCarrierRestrictionStatus = carrierRestrictionStatus;

            return this;

        }