commit 07d195ed2829317d0335049b0d9a84a3660877f9
author Amith Yamasani <yamasani@google.com> Fri Feb 15 10:17:17 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 15 10:17:17 2013 -0800
tree bdec0a991e6a80674cf7f16f205916fbd27a0c65
parent 595a8919228d51cdde11319b25d4c268638426eb
parent 1ef6a106d50f6fce2e2a810075a55bb264fa5c23

am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"

* commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
  Fix Settings app crash after enabled multi-user

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f3cceb8..24a7d59 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -450,14 +450,14 @@
                 }
             }
 
-            if (target.get(i) == header
+            if (i < target.size() && target.get(i) == header
                     && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
                     && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
                 target.remove(i);
             }
 
             // Increment if the current one wasn't removed by the Utils code.
-            if (target.get(i) == header) {
+            if (i < target.size() && target.get(i) == header) {
                 // Hold on to the first header, when we need to reset to the top-level
                 if (mFirstHeader == null &&
                         HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {