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

2014-04-30 18:03:03 +00:00
parent 9d9bb5af16 a97089d389
commit 37fe059e79
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1077,7 +1077,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);
                }