From 13e092573bce88580a2ddf4c289afa646f839cfa Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Thu, 29 Aug 2024 17:01:55 +0000 Subject: Properly handle onNullBinding() in appwidget service. Bug: 340239088 Merged-In: I12fccb572e159a73785aa33a4f5204e094ccd1b7 Change-Id: I12fccb572e159a73785aa33a4f5204e094ccd1b7 Test: manually verified with the PoC app Flag: EXEMPT CVE --- core/java/android/widget/RemoteViewsAdapter.java | 5 +++++ .../com/android/server/appwidget/AppWidgetServiceImpl.java | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index 6b33428d7fe4..275c57e29f00 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -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(); diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index f5063ac4a023..61a86560178a 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -1776,6 +1776,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 @@ -1916,6 +1921,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 -- cgit v1.2.3-59-g8ed1b