Merge "Clean Safety feature flag for CarDeveloperOptions." into qt-dev
am: c4e7bc197b
Change-Id: I2387f315ccb10cb17e0bcb621270fb0f2afeda12
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accounts/EmergencyInfoPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accounts/EmergencyInfoPreferenceController.java
index ba57408..f4d1c71 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accounts/EmergencyInfoPreferenceController.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/accounts/EmergencyInfoPreferenceController.java
@@ -23,7 +23,6 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
@@ -34,10 +33,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 +83,7 @@
? 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/tests/CarDeveloperOptions/src/com/android/car/developeroptions/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
index 9cd24bb..d7ef7cd 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
@@ -16,8 +16,6 @@
package com.android.car.developeroptions.homepage.contextualcards.deviceinfo;
-import static com.android.car.developeroptions.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.SliceAction;
import com.android.car.developeroptions.R;
+import com.android.car.developeroptions.accounts.EmergencyInfoPreferenceController;
import com.android.car.developeroptions.slices.CustomSliceRegistry;
import com.android.car.developeroptions.slices.CustomSliceable;
@@ -62,7 +61,7 @@
@Override
public Intent getIntent() {
- return new Intent(ACTION_EDIT_EMERGENCY_INFO);
+ return new Intent(EmergencyInfoPreferenceController.getIntentAction(mContext));
}
@Override