From 9b3524d8397ff2bebf64331063a14a40b61924f4 Mon Sep 17 00:00:00 2001 From: Ben Kwa Date: Wed, 24 Feb 2016 10:11:10 -0800 Subject: [PATCH] Fix a crash when browsing empty roots. BUG=27292682 Change-Id: I383fd359a959e86fca3f6716575027aa3b4723cf --- .../src/com/android/documentsui/dirlist/FocusManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java index 7f867d521c43f..f8ee956ea5c82 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FocusManager.java @@ -113,6 +113,11 @@ class FocusManager implements View.OnFocusChangeListener { * Requests focus on the item that last had focus. Scrolls to that item if necessary. */ public void restoreLastFocus() { + if (mAdapter.getItemCount() == 0) { + // Nothing to focus. + return; + } + if (mLastFocusPosition != RecyclerView.NO_POSITION) { // The system takes care of situations when a view is no longer on screen, etc, focusItem(mLastFocusPosition);