Merge "Remove option to configure emergency app" into nyc-dev

am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
This commit is contained in:
Adrian Roos
2016-05-25 00:23:28 +00:00
committed by android-build-merger

View File

@@ -44,6 +44,7 @@ import java.util.Set;
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 class DefaultEmergencyPreference extends AppListPreference
}
public boolean isAvailable(Context context) {
return isCapable(context)
return DEFAULT_EMERGENCY_APP_IS_CONFIGURABLE
&& isCapable(context)
&& context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;
}