Merge "Properly handle onNullBinding() in appwidget service." into main (3f1a00a6) · Commits · e / os / android_frameworks_base

core/java/android/widget/RemoteViews.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1446,6 +1446,11 @@ public class RemoteViews implements Parcelable, Filter {
		result.complete(items);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		context.unbindService(this);
		}

		@Override
		public void onServiceDisconnected(ComponentName componentName) { }
		});

+5 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,11 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
		}
		}

		@Override
		public void onNullBinding(ComponentName name) {
		enqueueDeferredUnbindServiceMessage();
		}

		@Override
		public void handleMessage(Message msg) {
		RemoteViewsAdapter adapter = mAdapter.get();

+10 −0

Original line number	Diff line number	Diff line
		@@ -2403,6 +2403,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		mContext.unbindService(this);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		mContext.unbindService(this);
		}

		@Override
		public void onServiceDisconnected(ComponentName name) {
		// Do nothing
		@@ -2550,6 +2555,11 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
		mContext.unbindService(this);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		mContext.unbindService(this);
		}

		@Override
		public void onServiceDisconnected(android.content.ComponentName name) {
		// Do nothing