commit 3b9c21fad915066c537fde5a8bf83fdc65891085
author Jonathan Basseri <misterikkit@google.com> Fri Jun 19 15:51:10 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Fri Jun 19 15:51:10 2015 -0700
tree 115cba274eacdc3bcc78941943ff45a7a46937ad
parent 14c8c213438736b4955fc74f9f5646c4ad4c38a0

Migrate noise suppression check to use CarrierConfigManager.

The variable used for noise suppression was migrated from config
overlays to carrier config. This updates PhoneUtils to read the new
variable so we can delete the old one.

Bug: 21957544
Change-Id: I18ce92c6971e95170aa231a92a9463276f651b2c

src/com/android/phone/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index a619701..e1f8036 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -30,11 +30,13 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
+import android.os.PersistableBundle;
 import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.VideoProfile;
+import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
@@ -1828,7 +1830,8 @@
         if (DBG) log("turnOnNoiseSuppression: " + flag);
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
-        if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+        PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+        if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
             return;
         }
 
@@ -1850,7 +1853,8 @@
     static void restoreNoiseSuppression(Context context) {
         if (DBG) log("restoreNoiseSuppression, restoring to: " + sIsNoiseSuppressionEnabled);
 
-        if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+        PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+        if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
             return;
         }
 
@@ -1862,7 +1866,8 @@
 
     static boolean isNoiseSuppressionOn(Context context) {
 
-        if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+        PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+        if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
             return false;
         }