commit 6c38db1c392b3cac6cf15c698a6487baa8ea9f49
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 08 12:11:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 08 12:11:58 2019 +0000
tree 36bd0234f841c4ae7697ba0b625bf69ab3e8fcda
parent da7adf1f11f2ad17c68a15bfaf46e85b89d9cfa1
parent fb695782c58afdcd8e1df4e6507cebaef873aed1

Merge "Use FooterPreference in xml explicitly"

src/com/android/settings/BugreportPreference.java

diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index f5b739a..ee551c1 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -114,8 +114,8 @@
             // untouched. To switch to the new workflow using Bugreport API run the following
             // commands on the terminal:
             // * adb root
-            // * adb shell setprop settings_call_bugreport_api true
-            if (FeatureFlagUtils.isEnabled(context, FeatureFlags.USE_BUGREPORT_API)) {
+            // * adb shell setprop settings_use_bugreport_api true
+            if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.USE_BUGREPORT_API)) {
                 Intent triggerShellBugreport = new Intent();
                 triggerShellBugreport.setAction(INTENT_BUGREPORT_REQUESTED);
                 triggerShellBugreport.setPackage(SHELL_APP_PACKAGE);

src/com/android/settings/core/FeatureFlags.java

diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index b13d712..fee9c42 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -21,7 +21,6 @@
  */
 public class FeatureFlags {
     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 HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
     public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";