commit 739a28300971509d87f03a7d0924985ae8783841
author Dake Gu <dake@google.com> Wed Jun 22 19:52:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 22 19:52:31 2016 +0000
tree d3d0fdd433e109f2db4a37a144b00721c2395122
parent 0ae4e0a355b8fb8b8c1f46f829e6f81d6a6f0b6b
parent 05984a273dc5f596a3e8abbffe90c68d050630b9

leanback: should wait pending data change in select
am: 05984a273d

Change-Id: I71dffae1870f17dca26d189996639d6690fabe38

v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
index e8b55dc..804a188 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
@@ -577,7 +577,7 @@
     public void setSelectedPositionSmooth(final int position, final ViewHolderTask task) {
         if (task != null) {
             RecyclerView.ViewHolder vh = findViewHolderForPosition(position);
-            if (vh == null) {
+            if (vh == null || hasPendingAdapterUpdates()) {
                 addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
                     public void onChildViewHolderSelected(RecyclerView parent,
                             RecyclerView.ViewHolder child, int selectedPosition, int subposition) {
@@ -602,7 +602,7 @@
     public void setSelectedPosition(final int position, final ViewHolderTask task) {
         if (task != null) {
             RecyclerView.ViewHolder vh = findViewHolderForPosition(position);
-            if (vh == null) {
+            if (vh == null || hasPendingAdapterUpdates()) {
                 addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
                     public void onChildViewHolderSelected(RecyclerView parent,
                             RecyclerView.ViewHolder child, int selectedPosition, int subposition) {