Merge "Fix bug #12907897 Some Developer Options are not disabled when putting Developer Options to "OFF""
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f8b4fd3..15d5a5f 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -141,6 +141,8 @@
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 @@
private CheckBoxPreference mShowAllANRs;
+ private PreferenceScreen mProcessStats;
+
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
private final ArrayList<CheckBoxPreference> mResetCbPrefs
= new ArrayList<CheckBoxPreference>();
@@ -246,6 +250,7 @@
debugDebuggingCategory.removePreference(mClearAdbKeys);
}
}
+ mAllPrefs.add(mClearAdbKeys);
mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL);
if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
debugDebuggingCategory.removePreference(mEnableTerminal);
@@ -305,6 +310,7 @@
IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
mAllPrefs.add(mImmediatelyDestroyActivities);
mResetCbPrefs.add(mImmediatelyDestroyActivities);
+
mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY);
mShowAllANRs = (CheckBoxPreference) findPreference(
@@ -323,6 +329,9 @@
mAllPrefs.add(hdcpChecking);
removePreferenceForProduction(hdcpChecking);
}
+
+ mProcessStats = (PreferenceScreen) findPreference(PROCESS_STATS);
+ mAllPrefs.add(mProcessStats);
}
private ListPreference addListPreference(String prefKey) {