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

Commit 801593d8 authored by arunvoddu's avatar arunvoddu
Browse files

Changing the visibility of getCarrierRestrictionStatus API to public with flagged annotation 

Bug: 313553044
Test: Built Successfully and verified CTS
Change-Id: I4ac2312cccb6b213c32c595b68ecae89f944779b
parent 9029b6b0

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13610,6 +13610,7 @@ package android.telephony { 
    method @NonNull public java.util.List<java.lang.Boolean> areCarrierIdentifiersAllowed(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>);

    method public int describeContents();

    method @NonNull public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers();

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_restriction_status") public int getCarrierRestrictionStatus();

    method public int getDefaultCarrierRestriction();

    method @NonNull public java.util.List<android.service.carrier.CarrierIdentifier> getExcludedCarriers();

    method public int getMultiSimPolicy();

telephony/java/android/telephony/CarrierRestrictionRules.java

+21 −3
Original line number Diff line number Diff line
@@ -16,12 +16,16 @@ 


package android.telephony;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.service.carrier.CarrierIdentifier;

import android.telephony.TelephonyManager.CarrierRestrictionStatus;



import com.android.internal.telephony.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -104,7 +108,7 @@ public final class CarrierRestrictionRules implements Parcelable { 
    private int mCarrierRestrictionDefault;

    @MultiSimPolicy

    private int mMultiSimPolicy;

    @TelephonyManager.CarrierRestrictionStatus

    @CarrierRestrictionStatus

    private int mCarrierRestrictionStatus;



    private CarrierRestrictionRules() {
@@ -293,8 +297,22 @@ public final class CarrierRestrictionRules implements Parcelable { 
        return true;

    }



    /** @hide */

    public int getCarrierRestrictionStatus() {

    /**

     * Get the carrier restriction status of the device.

     * The return value of the API is as follows.

     * <ul>

     *      <li>return {@link TelephonyManager#CARRIER_RESTRICTION_STATUS_RESTRICTED_TO_CALLER}

     *      if the caller and the device locked by the network are same</li>

     *      <li>return {@link TelephonyManager#CARRIER_RESTRICTION_STATUS_RESTRICTED} if the

     *      caller and the device locked by the network are different</li>

     *      <li>return {@link TelephonyManager#CARRIER_RESTRICTION_STATUS_NOT_RESTRICTED} if the

     *      device is not locked</li>

     *      <li>return {@link TelephonyManager#CARRIER_RESTRICTION_STATUS_UNKNOWN} if the device

     *      locking state is unavailable or radio does not supports the feature</li>

     * </ul>

     */

    @FlaggedApi(Flags.FLAG_CARRIER_RESTRICTION_STATUS)

    public @CarrierRestrictionStatus int getCarrierRestrictionStatus() {

        return mCarrierRestrictionStatus;

    }