diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-10 22:27:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 22:27:04 -0700 |
| commit | 4465bbb7e14020e10620cda70fc51896b57ced67 (patch) | |
| tree | a701bd3f5d3813c724c6af29fb53b70c137b80f3 | |
| parent | 73d49b3bd996f38115ea47a51d54241aee55e9de (diff) | |
| parent | b99f864d3ffb0785ec9581b0f8d6d9af00e060c6 (diff) | |
| download | packages_apps_settings-4465bbb7e14020e10620cda70fc51896b57ced67.zip packages_apps_settings-4465bbb7e14020e10620cda70fc51896b57ced67.tar.gz packages_apps_settings-4465bbb7e14020e10620cda70fc51896b57ced67.tar.bz2 | |
Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
| -rw-r--r-- | src/com/android/settings/Settings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 4314f2d..2d16262 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -458,7 +458,8 @@ public class Settings extends PreferenceActivity } } - if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0 + if (target.get(i) == header + && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0 && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) { target.remove(i); } |