commit df5de5b99128c20abd2739089dc72eb9fe6b7684
author Adrian Roos <roosa@google.com> Tue Jun 02 21:25:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 02 21:25:43 2015 +0000
tree f84fc3b660e69fd05be24999a828dde90cd1b987
parent 78da3e6d676133f35f152771d24a68c277a74380
parent 62b92ab53dd9f7f31d3df5703357477a579e4ef8

am 62b92ab5: am 63a885d3: am 96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev

* commit '62b92ab53dd9f7f31d3df5703357477a579e4ef8':
  Only show emergency app preference if enabled

src/com/android/settings/applications/DefaultEmergencyPreference.java

diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 2bda0ed..0062625 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -139,7 +139,8 @@
     }
 
     public static boolean isCapable(Context context) {
-        return context.getResources().getBoolean(
+        return TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED
+                && context.getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
     }