From a343699760ef5d997fbf3a02fe5468cad9687829 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 8 Sep 2021 12:07:35 -0700 Subject: [PATCH] Don't allow starting DeveloperOptionsFragment on non-debug builds Test: adb shell am start -n com.google.android.apps.nexuslauncher/com.android.launcher3.settings.SettingsActivity --es ":settings:fragment" "com.android.launcher3.settings.DeveloperOptionsFragment" Fixes: 199302659 Change-Id: I33dd4db3444c0ccabbe4dc3bb80db4167aec6a03 --- src/com/android/launcher3/settings/SettingsActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index 915e140aaf..f348a339fd 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -62,8 +62,9 @@ public class SettingsActivity extends FragmentActivity SharedPreferences.OnSharedPreferenceChangeListener{ /** List of fragments that can be hosted by this activity. */ - private static final List VALID_PREFERENCE_FRAGMENTS = Collections.singletonList( - DeveloperOptionsFragment.class.getName()); + private static final List VALID_PREFERENCE_FRAGMENTS = + !Utilities.IS_DEBUG_DEVICE ? Collections.emptyList() + : Collections.singletonList(DeveloperOptionsFragment.class.getName()); private static final String DEVELOPER_OPTIONS_KEY = "pref_developer_options"; private static final String FLAGS_PREFERENCE_KEY = "flag_toggler";