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
This commit is contained in:
Adrian Roos
2015-06-02 21:25:43 +00:00
committed by Android Git Automerger

View File

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