commit 9946f8bcce70db20c2d51328a56aeca330ae1439
author Adrian Roos <roosa@google.com> Wed May 27 14:37:58 2015 -0700
committer Adrian Roos <roosa@google.com> Wed May 27 15:44:13 2015 -0700
tree b3baa5be1777dddc24d77eb23ee33265829f4216
parent cdb219c1f7d6582a69076de36ede1ffe8a7641d4

Only show emergency actions if enabled

Bug: 21471480
Change-Id: Ifab21d8711c3054afdce9af2824baa6a714ee737

src/com/android/phone/EmergencyActionGroup.java

diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index b8d17c9..2d70d01 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -76,7 +76,6 @@
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
         setupAssistActions();
 
         mSelectedContainer = (ViewGroup) findViewById(R.id.selected_container);
@@ -119,7 +118,13 @@
     private void setupAssistActions() {
         int[] buttonIds = new int[] {R.id.action1, R.id.action2, R.id.action3};
 
-        List<ResolveInfo> infos = resolveAssistPackageAndQueryActivites();
+        List<ResolveInfo> infos;
+
+        if (TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED) {
+            infos = resolveAssistPackageAndQueryActivites();
+        } else {
+            infos = null;
+        }
 
         for (int i = 0; i < 3; i++) {
             Button button = (Button) findViewById(buttonIds[i]);