From d5e1af54e3d73668ec5a8f465e4099eecaf96213 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Fri, 23 Mar 2018 16:25:03 -0700 Subject: [PATCH] Revert "Unhide enable_apps carrier config key." This reverts commit 4793b28d3f2a65492aa7049c5e6e77c1cdbbb1a3. Reason for revert: This is not intended as a public API. Bug: 62907095 Test: make Change-Id: Id79f91c72eac3929fa5ee7ac1cdd9df8671a1eb1 (cherry picked from commit f47a426206cd89d49df8369eaa98a685365a62ed) --- api/current.txt | 1 - telephony/java/android/telephony/CarrierConfigManager.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 64b2d58f16d6b..edaba8e92a165 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41566,7 +41566,6 @@ package android.telephony { field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool"; field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool"; - field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array"; field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool"; field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c79eec0813491..8b8310fa76229 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -951,6 +951,8 @@ public class CarrierConfigManager { * If user has explicitly disabled some packages in the list, won't re-enable. * Other carrier specific apps which are not in this list may be disabled for current carrier, * and only be re-enabled when this config for another carrier includes it. + * + * @hide */ public static final String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";