Merge "Use USE_BUGREPORT_API flag from FeatureFlagUtils"

This commit is contained in:
Abhijeet Kaur
2019-08-08 10:53:31 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -114,8 +114,8 @@ public class BugreportPreference extends CustomDialogPreferenceCompat {
// untouched. To switch to the new workflow using Bugreport API run the following // untouched. To switch to the new workflow using Bugreport API run the following
// commands on the terminal: // commands on the terminal:
// * adb root // * adb root
// * adb shell setprop settings_call_bugreport_api true // * adb shell setprop settings_use_bugreport_api true
if (FeatureFlagUtils.isEnabled(context, FeatureFlags.USE_BUGREPORT_API)) { if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.USE_BUGREPORT_API)) {
Intent triggerShellBugreport = new Intent(); Intent triggerShellBugreport = new Intent();
triggerShellBugreport.setAction(INTENT_BUGREPORT_REQUESTED); triggerShellBugreport.setAction(INTENT_BUGREPORT_REQUESTED);
triggerShellBugreport.setPackage(SHELL_APP_PACKAGE); triggerShellBugreport.setPackage(SHELL_APP_PACKAGE);

View File

@@ -21,7 +21,6 @@ package com.android.settings.core;
*/ */
public class FeatureFlags { public class FeatureFlags {
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
public static final String USE_BUGREPORT_API = "settings_call_bugreport_api";
public static final String DYNAMIC_SYSTEM = "settings_dynamic_system"; public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2"; public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";