From a04da3ede8800d3355de510f69b3fd36b7243002 Mon Sep 17 00:00:00 2001 From: Michele Berionne Date: Tue, 11 Dec 2018 10:58:05 -0800 Subject: [PATCH] Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING, so that it can be used by applications. Bug: 116527591 Test: Verified compilation. Change-Id: I6ca2c89ed68ac190dc14a39ae4d9102632ad000a --- api/current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index e4f95fd1719f..7b48a5b60dc3 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42087,6 +42087,7 @@ package android.telephony { field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array"; field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool"; field public static final java.lang.String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app"; + field public static final java.lang.String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string"; field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings"; field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e72d67b20160..40ca0f3a7f08 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -81,7 +81,6 @@ public class CarrierConfigManager { * Specifies a value that identifies the version of the carrier configuration that is * currently in use. This string is displayed on the UI. * The format of the string is not specified. - * @hide */ public static final String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string"; -- 2.11.0