Merge "Guard against monkey crash" into nyc-dev

am: c8bac80390 * commit 'c8bac80390653f9ead129000f52e75f4be826f50': Guard against monkey crash
2016-02-11 17:07:38 +00:00
parent 33df0daace c8bac80390
commit e80919385a
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java
@@ -65,7 +65,7 @@ public class SettingsDrawerAdapter extends BaseAdapter {
    }

    public Tile getTile(int position) {
-        return mItems.get(position).tile;
+        return mItems.get(position) != null ? mItems.get(position).tile : null;
    }

    @Override