diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-11-30 16:42:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-30 16:42:05 -0800 |
| commit | 1cadd481bc34b466809b944a0f8490767cf92787 (patch) | |
| tree | 9cfd2a7e9fe874a1e47826280194207af6f87b20 /src | |
| parent | 77ec6de156c52edbda95894a609cc43dcd29e454 (diff) | |
| parent | 48d000ee2e54773b50079497f9d1e2e2ab570676 (diff) | |
| download | packages_apps_Settings-1cadd481bc34b466809b944a0f8490767cf92787.zip packages_apps_Settings-1cadd481bc34b466809b944a0f8490767cf92787.tar.gz packages_apps_Settings-1cadd481bc34b466809b944a0f8490767cf92787.tar.bz2 | |
Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index aeedb0c..5e7573f 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -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) { |