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

Commit fe764f9a authored by Matthew Sedam's avatar Matthew Sedam Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ContextHubTransactionManager timeout future" into main

parents ecb93b1a 7fe73bea

services/core/java/com/android/server/location/contexthub/ContextHubTransactionManager.java

+4 −1
Original line number Diff line number Diff line
@@ -522,7 +522,10 @@ import java.util.concurrent.atomic.AtomicInteger; 
     * the caller has obtained a lock on this ContextHubTransactionManager object.

     */

    private void removeTransactionAndStartNext() {

        mTimeoutFuture.cancel(false /* mayInterruptIfRunning */);

        if (mTimeoutFuture != null) {

            mTimeoutFuture.cancel(/* mayInterruptIfRunning= */ false);

            mTimeoutFuture = null;

        }



        ContextHubServiceTransaction transaction = mTransactionQueue.remove();

        transaction.setComplete();