commit a97089d389338ca8e3d970b00dd13ffad732b5c1
author Amith Yamasani <yamasani@google.com> Wed Apr 30 10:58:09 2014 -0700
committer Amith Yamasani <yamasani@google.com> Wed Apr 30 10:58:09 2014 -0700
tree 5aab1c18c225b7ea4fa755c9ab270aebb91544f8
parent 46900881d61aa3614e96bc314ea0143ad42e2f4c

Fix crash on settings launch in secondary user.

Bug: 14403545

Make sure the tile wasn't already removed for other reasons.

Change-Id: Ia2b5528c01dbfba4919afaf8352e45db9ef345c3

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1bc0501..d374360 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1075,7 +1075,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);
                 }