summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/RemoteViewsAdapter.java2
-rw-r--r--services/java/com/android/server/AppWidgetService.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index d31c0e74ff90..f329a3e9eb30 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/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() {
diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index 0b56f2af5854..59a540b8f175 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/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);
}
}
}