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"

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-04 00:41:27 +00:00
committed by Gerrit Code Review
parent fb519f3324 58d3f87f33
commit a5cb050abb
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

@@ -98,7 +98,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
private long mNextUnbind; private long mNextUnbind;
/** 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.
@@ -622,6 +622,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;
} }