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

Commit ec63b7d0 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed NPE when cancellation signal is null. 

Test: none for this particular issue, but CtsAutoFillServiceTestCases pass
Fixes: 64759228

Change-Id: I34170440ac388ec6ba7ed5632dc38543a84d0327
parent 9c43a779

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);

        }