commit f0d41e446b358e43a5c0c17f6c443ad24061b971
author Robert Greenwalt <rgreenwalt@google.com> Tue Jan 03 17:26:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 03 17:26:59 2017 +0000
tree 79a70cf30cfbb8a0cf7fe0c4fa51e28ac90ca198
parent 8b41f61b0ebc1149c41bca8477cef8430f1463c9
parent 0ded16620513aff3e7e1c6f75c2b534514658fe0

Merge "Handle IMEI_NOT_ACCEPTED disconnect cause"

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 77f4077..061a41e 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;