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 /telephony | |
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 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 393888d..1cc275d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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; /** |