PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-11-30 16:42:05 -08:00
committed by Android (Google) Code Review
parent 77ec6de156 48d000ee2e
commit 1cadd481bc
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/DevelopmentSettings.java
View File

@@ -46,6 +46,7 @@ import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.MultiCheckPreference;
@@ -213,6 +214,11 @@ public class DevelopmentSettings extends PreferenceFragment
mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
mAllPrefs.add(mPassword);
if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
disableForUser(mEnableAdb);
disableForUser(mPassword);
}
mDebugAppPref = findPreference(DEBUG_APP_KEY);
mAllPrefs.add(mDebugAppPref);
mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
@@ -284,6 +290,13 @@ public class DevelopmentSettings extends PreferenceFragment
removeHdcpOptionsForProduction();
}
private void disableForUser(Preference pref) {
if (pref != null) {
pref.setEnabled(false);
mDisabledPrefs.add(pref);
}
}
private CheckBoxPreference findAndInitCheckboxPref(String key) {
CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
if (pref == null) {