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

* commit '3021168d06bb891f38b212d3338e8397b898b25d':
  Fix crash in Settings for secondary users
This commit is contained in:
Amith Yamasani
2012-10-10 22:32:02 -07:00
committed by Android Git Automerger

View File

@@ -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);
}