commit 7581c30774712eaaced700e9b7186493bf384611
author Adrian Roos <roosa@google.com> Wed May 27 14:39:24 2015 -0700
committer Adrian Roos <roosa@google.com> Wed May 27 14:39:24 2015 -0700
tree d890ea474f261bd363ed6b233ff4593229897599
parent a4e0492c11fb7b02c9a536ea4935e649e97c8c2d

Only show emergency app preference if enabled

Bug: 21471480
Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760

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);
     }