From 875cf6421adbe27b5bfaf687a2962f6d11873a93 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Wed, 8 Feb 2023 21:24:01 -0800
Subject: Remove stale connections to DataLoaders.

Bug: 263449831
Fixes: 263449831
Test: atest service.incremental_test
Change-Id: Ia3da6ca047c46807cbd72ef797bb4b300c38efb3
---
 services/incremental/IncrementalService.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'services/incremental/IncrementalService.cpp')

diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index 9c9b363b948e..7ed95991642f 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -2816,6 +2816,12 @@ bool IncrementalService::DataLoaderStub::fsmStep() {
 
 binder::Status IncrementalService::DataLoaderStub::onStatusChanged(MountId mountId, int newStatus) {
     if (!isValid()) {
+        if (newStatus == IDataLoaderStatusListener::DATA_LOADER_BOUND) {
+            // Async "bound" came to already destroyed stub.
+            // Unbind immediately to avoid invalid stub sitting around in DataLoaderManagerService.
+            mService.mDataLoaderManager->unbindFromDataLoader(mountId);
+            return binder::Status::ok();
+        }
         return binder::Status::
                 fromServiceSpecificError(-EINVAL, "onStatusChange came to invalid DataLoaderStub");
     }
-- 
cgit v1.2.3-59-g8ed1b