From 1da7fbb09dbfc9546d59cb7e38b0429fb868d9a2 Mon Sep 17 00:00:00 2001
From: yuanjiahsu <yuanjiahsu@google.com>
Date: Tue, 30 Apr 2019 18:44:15 +0800
Subject: [PATCH] Clean Safetyhub feature flag from Settings.

Clean all related code, need submit together.

Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
---
 .../EmergencyInfoPreferenceController.java    | 21 ++++---------------
 .../deviceinfo/EmergencyInfoSlice.java        |  5 ++---
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 7dc80d025c2..5be829b8370 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -23,7 +23,6 @@ import android.content.res.Resources;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
 
 import androidx.preference.Preference;
 
@@ -35,9 +34,9 @@ import java.util.List;
 
 public class EmergencyInfoPreferenceController extends BasePreferenceController {
 
-    public static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
-
-    private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency";
+    public static String getIntentAction(Context context) {
+        return context.getResources().getString(R.string.config_emergency_intent_action);
+    }
 
     public EmergencyInfoPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -85,19 +84,7 @@ public class EmergencyInfoPreferenceController extends BasePreferenceController
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
-    private static String getIntentAction(Context context) {
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
-            return context.getResources().getString(R.string.config_emergency_intent_action);
-        }
-
-        return ACTION_EDIT_EMERGENCY_INFO;
-    }
-
     private static String getPackageName(Context context) {
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
-            return context.getResources().getString(R.string.config_emergency_package_name);
-        }
-
-        return PACKAGE_NAME_EMERGENCY;
+        return context.getResources().getString(R.string.config_emergency_package_name);
     }
 }
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
index f8be2d656aa..10e87ff8366 100644
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.homepage.contextualcards.deviceinfo;
 
-import static com.android.settings.accounts.EmergencyInfoPreferenceController.ACTION_EDIT_EMERGENCY_INFO;
-
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +27,7 @@ import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.SliceAction;
 
 import com.android.settings.R;
+import com.android.settings.accounts.EmergencyInfoPreferenceController;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
 
@@ -62,7 +61,7 @@ public class EmergencyInfoSlice implements CustomSliceable {
 
     @Override
     public Intent getIntent() {
-        return new Intent(ACTION_EDIT_EMERGENCY_INFO);
+        return new Intent(EmergencyInfoPreferenceController.getIntentAction(mContext));
     }
 
     @Override