summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-10-10 21:41:12 -0700
committerAmith Yamasani <yamasani@google.com>2012-10-10 21:44:15 -0700
commitb99f864d3ffb0785ec9581b0f8d6d9af00e060c6 (patch)
treec5a9cbdc49d31e55c5a03e1c476b8527996142d4 /src
parent84b90d533275be792954efc37e14f0c8fd409681 (diff)
downloadpackages_apps_settings-b99f864d3ffb0785ec9581b0f8d6d9af00e060c6.zip
packages_apps_settings-b99f864d3ffb0785ec9581b0f8d6d9af00e060c6.tar.gz
packages_apps_settings-b99f864d3ffb0785ec9581b0f8d6d9af00e060c6.tar.bz2
Fix crash in Settings for secondary users
Bug: 7328485 Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/Settings.java3
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);
}