commit cc83a3b1bd742b5e6d865bbb7a8c2a58c5da9c6f
author yuanjiahsu <yuanjiahsu@google.com> Thu May 23 15:29:30 2019 +0800
committer yuanjiahsu <yuanjiahsu@google.com> Thu May 23 15:29:30 2019 +0800
tree 57aa10ab9e274d358c4cb4db71bd1f11196561c3
parent 9042f0b9eec41aa92fe3fb28e2ebdb9dfa7a6671

Clean up emergency app overlay intent

Emergency app will be launched by default intent, this overlay intent is
not required.

Test: Manually
Bug: 129806015
Change-Id: I6ecd08485a57a973918770d92d6dab159d23cb43

src/com/android/phone/EmergencyAssistanceHelper.java

diff --git a/src/com/android/phone/EmergencyAssistanceHelper.java b/src/com/android/phone/EmergencyAssistanceHelper.java
index 1bf212e..33788d3 100644
--- a/src/com/android/phone/EmergencyAssistanceHelper.java
+++ b/src/com/android/phone/EmergencyAssistanceHelper.java
@@ -43,16 +43,9 @@
     /**
      * Get intent action of target emergency app.
      *
-     * @param context The context of the application.
-     * @return A string of intent action to launch target emergency app by feature flag, it will be
-     * used for team food.
+     * @return A string of intent action to launch target emergency app.
      */
-    public static String getIntentAction(Context context) {
-        String action = context.getResources().getString(R.string.config_emergency_app_intent);
-        if (!action.isEmpty()) {
-            return action;
-        }
-
+    public static String getIntentAction() {
         return TelephonyManager.ACTION_EMERGENCY_ASSISTANCE;
     }
 
@@ -68,7 +61,7 @@
         List<ResolveInfo> infos = queryAssistActivities(context, assistPackage);
         if (infos == null || infos.isEmpty()) {
             PackageManager packageManager = context.getPackageManager();
-            Intent queryIntent = new Intent(getIntentAction(context));
+            Intent queryIntent = new Intent(getIntentAction());
             infos = packageManager.queryIntentActivities(queryIntent, 0);
 
             PackageInfo bestMatch = null;
@@ -112,7 +105,7 @@
         List<ResolveInfo> infos = null;
 
         if (!TextUtils.isEmpty(assistPackage)) {
-            Intent queryIntent = new Intent(getIntentAction(context))
+            Intent queryIntent = new Intent(getIntentAction())
                     .setPackage(assistPackage);
             infos = context.getPackageManager().queryIntentActivities(queryIntent, 0);
         }