From 1b5edd535f2bd3d8209598e13c6e8f0424b30e26 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Wed, 5 Feb 2014 14:57:23 -0800 Subject: [PATCH] Fix bug #12907897 Some Developer Options are not disabled when putting Developer Options to "OFF" Was related to "Process Stats" and "Revoke USB debugging informations" - add the corresponding prefs to the list that enable/disable them Change-Id: I706c3f5463a23fdfcfd3aae4b48b3cc07f1d823d --- src/com/android/settings/DevelopmentSettings.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f8b4fd3c168..15d5a5fc356 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -141,6 +141,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs"; + private static final String PROCESS_STATS = "proc_stats"; + private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce"; private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive"; @@ -201,6 +203,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private CheckBoxPreference mShowAllANRs; + private PreferenceScreen mProcessStats; + private final ArrayList mAllPrefs = new ArrayList(); private final ArrayList mResetCbPrefs = new ArrayList(); @@ -246,6 +250,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment debugDebuggingCategory.removePreference(mClearAdbKeys); } } + mAllPrefs.add(mClearAdbKeys); mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL); if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) { debugDebuggingCategory.removePreference(mEnableTerminal); @@ -305,6 +310,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment IMMEDIATELY_DESTROY_ACTIVITIES_KEY); mAllPrefs.add(mImmediatelyDestroyActivities); mResetCbPrefs.add(mImmediatelyDestroyActivities); + mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY); mShowAllANRs = (CheckBoxPreference) findPreference( @@ -323,6 +329,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment mAllPrefs.add(hdcpChecking); removePreferenceForProduction(hdcpChecking); } + + mProcessStats = (PreferenceScreen) findPreference(PROCESS_STATS); + mAllPrefs.add(mProcessStats); } private ListPreference addListPreference(String prefKey) {