am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev

* commit '4465bbb7e14020e10620cda70fc51896b57ced67': Fix crash in Settings for secondary users
2012-10-10 22:28:19 -07:00
parent 55dba5ea08 4465bbb7e1
commit 01f7688555
1 changed files with 2 additions and 1 deletions
--- 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);
            }