commit b1b36e3400f7099114ae823b550e9e0dd30f2493
author Brad Ebinger <breadley@google.com> Tue Sep 06 10:15:40 2016 -0700
committer Hall Liu <hallliu@google.com> Wed Dec 14 18:32:12 2016 -0800
tree f7d111acf4b9baf82fe27b2388f5227a797e8318
parent 2f755ac4c6880dcae80e2f3db5b65d114dd40bc5

Add CarrierConfig option to not display HD icon

Adds a CarrierConfig option to not display the HD audio icon in the UI
if the carrier does not want it.

Bug: 28654645
Bug: 33062999
Change-Id: I567981ec695c7b85baf97acd509a2320519e4656

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index c4f9c9a..4199d5d 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -960,6 +960,12 @@
                 b != null && b.getBoolean(CarrierConfigManager.KEY_WIFI_CALLS_CAN_BE_HD_AUDIO);
         boolean canVideoCallsBeHdAudio =
                 b != null && b.getBoolean(CarrierConfigManager.KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO);
+        boolean shouldDisplayHdAudio =
+                b != null && b.getBoolean(CarrierConfigManager.KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL);
+
+        if (!shouldDisplayHdAudio) {
+            return false;
+        }
 
         if (isVideoCall && !canVideoCallsBeHdAudio) {
             return false;