commit b324afee2f16778b43efa8001d2bc7c0666eaaea
author Junda Liu <junda@google.com> Mon Jun 08 22:50:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 08 22:50:07 2015 +0000
tree a6b1aba642fc7e6f7ccb4ce493ecce8e403c3845
parent 72a7ba36913b475af0a894f64e0f2f60f95b3679
parent fc69c7221261f2da4e0789644abfcd160378d7a0

am fc69c722: am 6088576a: Use carrier config BOOL_HIDE_CARRIER_NETWORK_SETTINGS.

* commit 'fc69c7221261f2da4e0789644abfcd160378d7a0':
  Use carrier config BOOL_HIDE_CARRIER_NETWORK_SETTINGS.

src/com/android/dialer/settings/SoundSettingsFragment.java

diff --git a/src/com/android/dialer/settings/SoundSettingsFragment.java b/src/com/android/dialer/settings/SoundSettingsFragment.java
index 43297b5..c7bb2d3 100644
--- a/src/com/android/dialer/settings/SoundSettingsFragment.java
+++ b/src/com/android/dialer/settings/SoundSettingsFragment.java
@@ -28,6 +28,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
 
 import com.android.dialer.R;
@@ -208,8 +209,9 @@
     }
 
     private boolean shouldHideCarrierSettings() {
-        int hideCarrierNetworkSetting = Settings.Global.getInt(getActivity().getContentResolver(),
-                Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, SHOW_CARRIER_SETTINGS);
-        return hideCarrierNetworkSetting == HIDE_CARRIER_SETTINGS;
+        CarrierConfigManager configManager = (CarrierConfigManager) getActivity().getSystemService(
+                Context.CARRIER_CONFIG_SERVICE);
+        return configManager.getConfig().getBoolean(
+                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL);
     }
 }