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

Commit a66a067a authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev

parents 50baf43e 0cf20cdf

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -33516,6 +33516,10 @@ package android.telephony { 
    field public static final int CALL_STATE_IDLE = 0; // 0x0

    field public static final int CALL_STATE_OFFHOOK = 2; // 0x2

    field public static final int CALL_STATE_RINGING = 1; // 0x1

    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe

    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff

    field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4

    field public static final int DATA_ACTIVITY_IN = 1; // 0x1

    field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -3501,13 +3501,13 @@ public class TelephonyManager { 
    /**

     * Values used to return status for hasCarrierPrivileges call.

     */

    /** @hide */

    /** @hide */ @SystemApi

    public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;

    /** @hide */

    /** @hide */ @SystemApi

    public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0;

    /** @hide */

    /** @hide */ @SystemApi

    public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1;

    /** @hide */

    /** @hide */ @SystemApi

    public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2;



    /**