Merge "Fix crash in Settings for secondary users" into jb-mr1-dev (4465bbb7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}