Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose pending request to subclasses and ensure clean up" am: a5cb050abb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2222361

Change-Id: I1f84bc5b548ad28c772329100413ea7750ed2fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-04 06:55:37 +00:00
committed by Automerger Merge Worker
parent 7230f4cbbc a5cb050abb
commit 729033b51c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/infra/AbstractMultiplePendingRequestsRemoteService.java
View File

@@ -61,7 +61,7 @@ public abstract class AbstractMultiplePendingRequestsRemoteService<S
final int size = mPendingRequests.size(); final int size = mPendingRequests.size();
if (mVerbose) Slog.v(mTag, "Sending " + size + " pending requests"); if (mVerbose) Slog.v(mTag, "Sending " + size + " pending requests");
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
mPendingRequests.get(i).run(); handlePendingRequest(mPendingRequests.get(i));
} }
mPendingRequests.clear(); mPendingRequests.clear();
} }

7
core/java/com/android/internal/infra/AbstractRemoteService.java
View File

@@ -106,7 +106,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
private int mServiceExitSubReason; private int mServiceExitSubReason;
/** Requests that have been scheduled, but that are not finished yet */ /** Requests that have been scheduled, but that are not finished yet */
private final ArrayList<BasePendingRequest<S, I>> mUnfinishedRequests = new ArrayList<>(); protected final ArrayList<BasePendingRequest<S, I>> mUnfinishedRequests = new ArrayList<>();
/** /**
* Callback called when the service dies. * Callback called when the service dies.
@@ -676,6 +676,11 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
mCancelled = true; mCancelled = true;
} }
S service = mWeakService.get();
if (service != null) {
service.finishRequest(this);
}
onCancel(); onCancel();
return true; return true;
} }