Properly handle onNullBinding() in appwidget service.

Bug: 340239088 Test: manually verified with the PoC app Flag: EXEMPT CVE (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9e1c31ba46178a8cfc68a2dd9984b8223f694c81) Merged-In: I12fccb572e159a73785aa33a4f5204e094ccd1b7 Change-Id: I12fccb572e159a73785aa33a4f5204e094ccd1b7
AICP · Dec 30, 2024 · e98c9da · e98c9da
1 parent 8e54079
commit e98c9da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
@@ -240,6 +240,11 @@ public void onServiceDisconnected(ComponentName name) {
             }
         }
 
+        @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
@@ -1863,6 +1863,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                 mContext.unbindService(this);
             }
 
+            @Override
+            public void onNullBinding(ComponentName name) {
+                mContext.unbindService(this);
+            }
+
             @Override
             public void onServiceDisconnected(ComponentName name) {
                 // Do nothing
@@ -2003,6 +2008,11 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                                 mContext.unbindService(this);
                             }
 
+                            @Override
+                            public void onNullBinding(ComponentName name) {
+                                mContext.unbindService(this);
+                            }
+
                             @Override
                             public void onServiceDisconnected(android.content.ComponentName name) {
                                 // Do nothing