Fixing widget notifyDataSetChanged() not getting called, issue 5092676

Change-Id: I61a034a77c0c9d07aba71bfabe7a0864ce92c2e9

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index d8adc6cc1cc0..960d7fbba7e1 100644
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@@ -38,6 +38,7 @@ import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
+import android.widget.RemoteViewsAdapter.RemoteAdapterConnectionCallback;
 
 /**
  * Provides the glue to show AppWidget views. This class offers automatic animation
@@ -276,6 +277,11 @@ public class AppWidgetHostView extends FrameLayout {
             if (adapter instanceof BaseAdapter) {
                 BaseAdapter baseAdapter = (BaseAdapter) adapter;
                 baseAdapter.notifyDataSetChanged();
+            }  else if (adapter == null && adapterView instanceof RemoteAdapterConnectionCallback) {
+                // If the adapter is null, it may mean that the RemoteViewsAapter has not yet
+                // connected to its associated service, and hence the adapter hasn't been set.
+                // In this case, we need to defer the notify call until it has been set.
+                ((RemoteAdapterConnectionCallback) adapterView).deferNotifyDataSetChanged();
             }
         }
     }