From ec63b7d0e11ed396e28cbd8352277c2d7f682cba Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 16 Aug 2017 12:29:53 -0700 Subject: [PATCH] Fixed NPE when cancellation signal is null. Test: none for this particular issue, but CtsAutoFillServiceTestCases pass Fixes: 64759228 Change-Id: I34170440ac388ec6ba7ed5632dc38543a84d0327 --- .../java/com/android/server/autofill/RemoteFillService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java index 2a2797c160d88..f8c0e27643b3f 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java @@ -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); }