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

Commit baceef99 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev 

am: fac2141f

Change-Id: Ib89a4888b3776dd6eb2ff3754c027b2ec54e4c56
parents d82e4add fac2141f

services/autofill/java/com/android/server/autofill/RemoteFillService.java

+4 −1
Original line number Diff line number Diff line
@@ -562,7 +562,10 @@ final class RemoteFillService implements DeathRecipient { 
        void onTimeout(RemoteFillService remoteService) {

            // NOTE: Must make these 2 calls asynchronously, because the cancellation signal is

            // handled by the service, which could block.

            remoteService.dispatchOnFillTimeout(mCancellation);

            final ICancellationSignal cancellation = mCancellation;

            if (cancellation != null) {

                remoteService.dispatchOnFillTimeout(cancellation);

            }

            remoteService.dispatchOnFillRequestFailure(PendingFillRequest.this, null);

        }