diff options
| author | Jeff Davidson <jpd@google.com> | 2015-06-10 22:40:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 22:40:29 +0000 |
| commit | a66a067a9c9b706035f48f445561100f29c960bf (patch) | |
| tree | 5f6505ce4b0370a9a99fffbccf23165727b21413 /api | |
| parent | 50baf43eeb6bbdedca21000a439194ba21ce69f0 (diff) | |
| parent | 0cf20cdf81c1d8b553f7b3f8179048fe1d5b4d59 (diff) | |
| download | frameworks_base-a66a067a9c9b706035f48f445561100f29c960bf.zip frameworks_base-a66a067a9c9b706035f48f445561100f29c960bf.tar.gz frameworks_base-a66a067a9c9b706035f48f445561100f29c960bf.tar.bz2 | |
Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index ea2de6b..674d013 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 |