commit 130dbe99821ae2ab77511f7e08ed79eb610de343
author Dake Gu <dake@google.com> Mon Sep 14 11:38:44 2015 -0700
committer Dake Gu <dake@google.com> Mon Sep 14 12:46:21 2015 -0700
tree 5714a621565901fd17e8ea28316d9e9b822d5d5f
parent 93594c4e0e0839dac5a1fd4cf18fe7ddca3c29ee

Fix ItemBridgeAdapter NPE

Bug 23974032

Change-Id: I37df73a76c2524b8d038e3517e3f58127c31bf21

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

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/ItemBridgeAdapter.java b/v17/leanback/src/android/support/v17/leanback/widget/ItemBridgeAdapter.java
index 8e3aea3..57e8bfe 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/ItemBridgeAdapter.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/ItemBridgeAdapter.java
@@ -177,11 +177,15 @@
      * Sets the {@link ObjectAdapter}.
      */
     public void setAdapter(ObjectAdapter adapter) {
+        if (adapter == mAdapter) {
+            return;
+        }
         if (mAdapter != null) {
             mAdapter.unregisterObserver(mDataObserver);
         }
         mAdapter = adapter;
         if (mAdapter == null) {
+            notifyDataSetChanged();
             return;
         }
 
@@ -189,6 +193,7 @@
         if (hasStableIds() != mAdapter.hasStableIds()) {
             setHasStableIds(mAdapter.hasStableIds());
         }
+        notifyDataSetChanged();
     }
 
     /**
@@ -233,7 +238,7 @@
 
     @Override
     public int getItemCount() {
-        return mAdapter.size();
+        return mAdapter != null ? mAdapter.size() : 0;
     }
 
     @Override