commit 1ef6a106d50f6fce2e2a810075a55bb264fa5c23
author Amith Yamasani <yamasani@google.com> Fri Feb 15 17:15:41 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 15 17:15:41 2013 +0000
tree a83b499ed6dcdfc9b58b40c0348dd8cb42caa7d5
parent bbe409d3ce08d5d463721bd23b76a65dc83d38d6
parent bb0e621f18dea996acc8f74d859f632deb955b34

Merge "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 a5e2005..dc49ba8 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -464,14 +464,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) {