Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb

core/java/android/widget/RemoteViewsAdapter.java

@@ -917,9 +917,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
     }
 
     private void enqueueDeferredUnbindServiceMessage() {
+        /* Temporarily disable delayed service unbinding
         // Remove any existing deferred-unbind messages
         mMainQueue.removeMessages(sUnbindServiceMessageType);
         mMainQueue.sendEmptyMessageDelayed(sUnbindServiceMessageType, sUnbindServiceDelay);
+        */
     }
 
     private boolean requestBindService() {

services/java/com/android/server/AppWidgetService.java

@@ -484,9 +484,9 @@ class AppWidgetService extends IAppWidgetService.Stub
                     new FilterComparison(intent));
             if (mBoundRemoteViewsServices.containsKey(key)) {
                 final ServiceConnection conn = mBoundRemoteViewsServices.get(key);
+                mBoundRemoteViewsServices.remove(key);
                 conn.onServiceDisconnected(null);
                 mContext.unbindService(conn);
-                mBoundRemoteViewsServices.remove(key);
             }
         }
     }