Merge "Show Settings bugreport handler only when developer option is enabled"

This commit is contained in:
Paul Chang
2020-01-09 05:35:51 +00:00
committed by Android (Google) Code Review

View File

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