From 005f7cf13ee4c21bdb8505ba0aa9b24bc2ac9b28 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 24 Apr 2015 15:39:45 -0700
Subject: Remove problematic early return from notifyDataSetChanged

-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.

issue 19890339

Change-Id: I376101ae146359109df53add3a3202ba2e1e842d
---
 core/java/android/widget/RemoteViewsAdapter.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index a50941b76ee1..10e4db36ef1f 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/core/java/android/widget/RemoteViewsAdapter.java
@@ -1335,10 +1335,6 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
         // If we are not connected, queue up the notifyDataSetChanged to be handled when we do
         // connect
         if (!mServiceConnection.isConnected()) {
-            if (mNotifyDataSetChangedAfterOnServiceConnected) {
-                return;
-            }
-
             mNotifyDataSetChangedAfterOnServiceConnected = true;
             requestBindService();
             return;
-- 
cgit v1.2.3-59-g8ed1b