From a97089d389338ca8e3d970b00dd13ffad732b5c1 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 30 Apr 2014 10:58:09 -0700
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1bc0501ab3d..d374360107f 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1075,7 +1075,8 @@ public class SettingsActivity extends Activity
                 }
 
                 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);
                 }