Merge "Guard against monkey crash"

2015-11-30 20:11:00 +00:00
parent be107f46cf 3175a6e395
commit dfcd4c141b
1 changed files with 3 additions and 0 deletions
--- 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);