commit c32e39f1dbae071efc61475bea8cbc47ba0db304
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 11 21:56:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 11 21:56:54 2020 +0000
tree cd4262d56d18b23b35ac75d2770dd892d3fe21b9
parent 437513d5ef7ae1b57bb874e7225587b0cfdc48e3
parent c25bc0335b29a0e36d5e8586cb61781e91aff36e

Merge "Fix OutOfBounds issue on getFocusedChild" into ub-launcher3-master

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 354f97c..f235199 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -132,7 +132,7 @@
      * Returns the child adapter item with IME launch focus.
      */
     public AdapterItem getFocusedChild() {
-        if (mAdapterItems.size() == 0) {
+        if (mAdapterItems.size() == 0 || getFocusedChildIndex() != -1) {
             return null;
         }
         return mAdapterItems.get(getFocusedChildIndex());