From 0cf20cdf81c1d8b553f7b3f8179048fe1d5b4d59 Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Tue, 9 Jun 2015 14:34:56 -0700 Subject: [PATCH] Mark CARRIER_PRIVILEGE_* constants as @SystemApi. These constants are returned by checkCarrierPrivilegesForPackage which is marked as @SystemApi, so this seems like an oversight. Bug: 21613234 Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4 --- api/system-current.txt | 4 ++++ telephony/java/android/telephony/TelephonyManager.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index b61cbb13ce42b..c296143e207a1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33511,6 +33511,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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2445bf6e8e095..791d5fba8bd8a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3495,13 +3495,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; /**