commit 75ec67b11f4624f940255e2ad40f323c41508b62
author Brad Ebinger <breadley@google.com> Thu Dec 15 23:06:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 15 23:06:57 2016 +0000
tree f667b97a870f84bf5f66ebdf9b31fee5325440bb
parent cf7aabfdcf6f19ab63bfc9297577c7d315e5e967
parent b1b36e3400f7099114ae823b550e9e0dd30f2493

Add CarrierConfig option to not display HD icon
am: b1b36e3400

Change-Id: Ib020451e89381132e6efabc7afb25985a263b2e2

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 4506da4..30aca49 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -961,6 +961,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;