diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-12-07 14:20:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-07 14:20:16 -0800 |
| commit | daa01321b388047cfafa3390286b2a5330896f98 (patch) | |
| tree | 787d4fcb68591e679cf435a968d7e758e4a318f7 | |
| parent | 902f806aa362ab8aefd0b3e8135ab7acac861b42 (diff) | |
| parent | b02b26e3cb4a8a3aa7b3dd718fbc2cc7c6ac8016 (diff) | |
| download | packages_apps_Settings-daa01321b388047cfafa3390286b2a5330896f98.zip packages_apps_Settings-daa01321b388047cfafa3390286b2a5330896f98.tar.gz packages_apps_Settings-daa01321b388047cfafa3390286b2a5330896f98.tar.bz2 | |
Merge "Don't do the developer options countdown for secondary users."
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index d2ff6db..ac74221 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -174,6 +174,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { } } } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) { + // Don't enable developer options for secondary users. + if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true; + if (mDevHitCountdown > 0) { mDevHitCountdown--; if (mDevHitCountdown == 0) { |