Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-17 16:02:54 +00:00
committed by Android (Google) Code Review
parent 54ff7e7582 ec63b7d0e1
commit fac2141f4e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/autofill/java/com/android/server/autofill/RemoteFillService.java
View File

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