Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a66a067a9c9b706035f48f445561100f29c960bf':
  Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
This commit is contained in:
Jeff Davidson
2015-06-11 01:31:22 +00:00
committed by Android Git Automerger
parent ba5e03a017 a66a067a9c
commit ed7fd99f09
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -33516,6 +33516,10 @@ package android.telephony {
field public static final int CALL_STATE_IDLE = 0; // 0x0 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_OFFHOOK = 2; // 0x2
field public static final int CALL_STATE_RINGING = 1; // 0x1 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_DORMANT = 4; // 0x4
field public static final int DATA_ACTIVITY_IN = 1; // 0x1 field public static final int DATA_ACTIVITY_IN = 1; // 0x1
field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3 field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3

8
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3501,13 +3501,13 @@ public class TelephonyManager {
/** /**
* Values used to return status for hasCarrierPrivileges call. * Values used to return status for hasCarrierPrivileges call.
*/ */
/** @hide */ /** @hide */ @SystemApi
public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1;
/** @hide */ /** @hide */ @SystemApi
public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0;
/** @hide */ /** @hide */ @SystemApi
public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; 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; public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2;
/** /**