From 0ac6e0e22cb3973ef1baa667885cf59ffc797993 Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Wed, 16 Aug 2017 10:40:00 -0700 Subject: [PATCH] Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public. There is a reasonable use case for carrier apps to turn off this key (b/64544341) so it should be visible to apps in the SDK. Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3 Test: TreeHugger Fixes: 64721199 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + telephony/java/android/telephony/CarrierConfigManager.java | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 90d4cb7e70421..ebed20f72b35d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39600,6 +39600,7 @@ package android.telephony { field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array"; field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; + field public static final java.lang.String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool"; field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool"; field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool"; field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; diff --git a/api/system-current.txt b/api/system-current.txt index 615a55fef6e07..5326437aa4d66 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43039,6 +43039,7 @@ package android.telephony { field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array"; field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; + field public static final java.lang.String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool"; field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool"; field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool"; field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; diff --git a/api/test-current.txt b/api/test-current.txt index 31da904cdf4e0..43f156accf96f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -39859,6 +39859,7 @@ package android.telephony { field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array"; field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; + field public static final java.lang.String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool"; field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool"; field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool"; field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 3a34d8ffe7e15..7f9de0d965ae5 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -768,7 +768,6 @@ public class CarrierConfigManager { * Determines whether High Definition audio property is displayed in the dialer UI. * If {@code false}, remove the HD audio property from the connection so that HD audio related * UI is not displayed. If {@code true}, keep HD audio property as it is configured. - * @hide */ public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool";