Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d1900ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Expose pending request to subclasses and ensure clean up" am: a5cb050a am: 729033b5 am: 490add2e am: b7d1ff47 am: 38a6086f

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



Change-Id: Id75b8bc435a1e06f03a9b791334469befc60d2e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5dd2b5cb 38a6086f

core/java/com/android/internal/infra/AbstractMultiplePendingRequestsRemoteService.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public abstract class AbstractMultiplePendingRequestsRemoteService<S 
            final int size = mPendingRequests.size();

            if (mVerbose) Slog.v(mTag, "Sending " + size + " pending requests");

            for (int i = 0; i < size; i++) {

                mPendingRequests.get(i).run();

                handlePendingRequest(mPendingRequests.get(i));

            }

            mPendingRequests.clear();

        }

core/java/com/android/internal/infra/AbstractRemoteService.java

+6 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
    private int mServiceExitSubReason;



    /** 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.
@@ -673,6 +673,11 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
                mCancelled = true;

            }



            S service = mWeakService.get();

            if (service != null) {

                service.finishRequest(this);

            }



            onCancel();

            return true;

        }