drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7f447de2f511ec8ee35af8abf0ca3c46ffa68289':
  Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
This commit is contained in:
Winson Chung
2011-01-19 01:00:36 -08:00
committed by Android Git Automerger
parent caedec768b 7f447de2f5
commit adce48ccba
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/RemoteViewsAdapter.java
View File

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

2
services/java/com/android/server/AppWidgetService.java
View File

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