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

* commit '96e25b8d938082715f93bd071eb386a2174b910d': Only show emergency app preference if enabled
2015-06-02 20:55:01 +00:00
parent 8c48a9b119 96e25b8d93
commit 63a885d39f
1 changed files with 2 additions and 1 deletions
--- 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);
    }