From fa53c7447a8f74e6142ec785f751a5291f2d43c2 Mon Sep 17 00:00:00 2001 From: Paul Chang Date: Wed, 8 Jan 2020 22:19:49 +0800 Subject: [PATCH] Show Settings bugreport handler only when developer option is enabled Bug: 147264243 Test: Flash device and check that the bugreport handler is not shown by sending intent when developer option is disabled Change-Id: I11ed82394e164032c2201d19460ea94f3e4441c2 --- .../bugreporthandler/BugReportHandlerPicker.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java index e7adf7f2a49..5839e3c0844 100644 --- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java +++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java @@ -37,6 +37,7 @@ import com.android.settings.Utils; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.applications.DefaultAppInfo; +import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.FooterPreference; @@ -75,6 +76,14 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment { return handlerApp + "#" + handlerUser; } + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) { + getActivity().finish(); + } + } + @Override protected int getPreferenceScreenResId() { return R.xml.bug_report_handler_settings;