From 7581c30774712eaaced700e9b7186493bf384611 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Wed, 27 May 2015 14:39:24 -0700 Subject: [PATCH] Only show emergency app preference if enabled Bug: 21471480 Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760 --- .../settings/applications/DefaultEmergencyPreference.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java index 2bda0ed4ef8..00626253d24 100644 --- a/src/com/android/settings/applications/DefaultEmergencyPreference.java +++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java @@ -139,7 +139,8 @@ public class DefaultEmergencyPreference extends AppListPreference { } 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); }