commit 8f3b115b724ff9714ca4650952103e68739af119
author yuanjiahsu <yuanjiahsu@google.com> Wed Mar 13 15:33:23 2019 +0800
committer yuanjiahsu <yuanjiahsu@google.com> Wed Mar 13 15:46:27 2019 +0800
tree e25c391fb1fa33c290c77f2c5c3fb5cbddc86237
parent 50a266705d7452bf3ba5215feadf56020b3cd8fc

Change feature flag enabled behavior

Because new Emergency Info app need pre-grant fixed system permission,
it need re-ues the TelephonyManager.ACTION_EMERGENCY_ASSISTANCE intent,
so that change the feature flag enabled behavior here.

Bug: 124348906
Test: Manually
Change-Id: Ic78ac892b78063eedcaa3c9c353ef333bfcf3941

src/com/android/phone/EmergencyAssistanceHelper.java

diff --git a/src/com/android/phone/EmergencyAssistanceHelper.java b/src/com/android/phone/EmergencyAssistanceHelper.java
index a98d81d..4b291c5 100644
--- a/src/com/android/phone/EmergencyAssistanceHelper.java
+++ b/src/com/android/phone/EmergencyAssistanceHelper.java
@@ -50,11 +50,13 @@
      * used for team food.
      */
     public static String getIntentAction(Context context) {
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
-            String action = context.getResources().getString(R.string.config_emergency_app_intent);
-            if (!action.isEmpty()) {
-                return action;
+        String action = context.getResources().getString(R.string.config_emergency_app_intent);
+        if (!action.isEmpty()) {
+            // TODO: remove feature flag and this temporary intent once Emergency app was replaced.
+            if (!FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
+                return "com.android.emergency.action.EMERGENCY_ASSISTANCE";
             }
+            return action;
         }
 
         return TelephonyManager.ACTION_EMERGENCY_ASSISTANCE;