PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean Safetyhub feature flag from Settings.

Browse Source 
Clean all related code, need submit together.

Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
This commit is contained in:
yuanjiahsu
2019-04-30 18:44:15 +08:00
parent 87631db975
commit 1da7fbb09d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
View File

@@ -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);
}
}