From e42c1ce78cab1f072cd0d4393e116ca3519a9385 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Wed, 18 Dec 2024 13:21:09 -0800
Subject: Handle onNullBinding in AccountManagerService

Bug: 370474434
Test: manual
Flag: EXEMPT bugfix
Change-Id: I276564f1443a4d7fa6bb998cf7072fcd5c7ff1fc
---
 .../android/server/accounts/AccountManagerService.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 3ce645158fe4..2192e1129f31 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -5253,6 +5253,22 @@ public class AccountManagerService
             }
         }
 
+        @Override
+        public void onNullBinding(ComponentName name) {
+            IAccountManagerResponse response = getResponseAndClose();
+            if (response != null) {
+                try {
+                    response.onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,
+                            "disconnected");
+                } catch (RemoteException e) {
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.v(TAG, "Session.onNullBinding: "
+                                + "caught RemoteException while responding", e);
+                    }
+                }
+            }
+        }
+
         public abstract void run() throws RemoteException;
 
         public void onTimedOut() {
-- 
cgit v1.2.3-59-g8ed1b