Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9
* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
Remove option to configure emergency app
Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 1d23263..f0a97b1 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -44,6 +44,7 @@
public class DefaultEmergencyPreference extends AppListPreference
implements SelfAvailablePreference {
+ private static final boolean DEFAULT_EMERGENCY_APP_IS_CONFIGURABLE = false;
private final ContentResolver mContentResolver;
public static final Intent QUERY_INTENT = new Intent(
@@ -143,7 +144,8 @@
}
public boolean isAvailable(Context context) {
- return isCapable(context)
+ return DEFAULT_EMERGENCY_APP_IS_CONFIGURABLE
+ && isCapable(context)
&& context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;
}