Merge "Fix crash in Settings for secondary users" into jb-mr1-dev

2012-10-10 22:27:03 -07:00
parent 73d49b3bd9 b99f864d3f
commit 4465bbb7e1
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);
            }