commit 37fe059e793ae96436f3a6d6fc2036324b2e5a5d
author Amith Yamasani <yamasani@google.com> Wed Apr 30 18:03:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 30 18:03:03 2014 +0000
tree 9b87682a1a8d2466c2ed981c464bb459a8b67772
parent 9d9bb5af1628492ccd897d4637f9a76c13c3cd27
parent a97089d389338ca8e3d970b00dd13ffad732b5c1

Merge "Fix crash on settings launch in secondary user."

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 2465a47..56ee3ac 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1077,7 +1077,8 @@
                 }
 
                 if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
-                        && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
+                        && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)
+                        && n < category.getTilesCount()) {
                     category.removeTile(n);
                 }