From 3175a6e395e870c9ab5f291ed7d5edb8f802e218 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 30 Nov 2015 15:05:35 -0500 Subject: [PATCH] Guard against monkey crash Bug: 25795998 Change-Id: I351faae1e29d09b7577435207ec466a1ff5ed237 --- .../com/android/settingslib/drawer/SettingsDrawerActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java index 6102befdda994..00dadb8d217ea 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java @@ -143,6 +143,9 @@ public class SettingsDrawerActivity extends Activity { public boolean openTile(DashboardTile tile) { closeDrawer(); + if (tile == null) { + return false; + } int numUserHandles = tile.userHandle.size(); if (numUserHandles > 1) { ProfileSelectDialog.show(getFragmentManager(), tile);