commit c0e07d738956be36d801f0686fe553fe5225b7a2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 29 18:24:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 29 18:24:33 2019 +0000
tree e569534c95a7aced15dcbf375efbd92b39644989
parent 478561d5f992e9ffbdea48d108ff8d5b6626e179
parent 3d570a490ddff4c2ee872364a9f3e9791e2a39c1

Merge "Fixed NPE on MainContentCaptureSession.handleFlushIfNeeded"

core/java/android/view/contentcapture/MainContentCaptureSession.java

diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java
index 83dbf2d..72aefb2 100644
--- a/core/java/android/view/contentcapture/MainContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java
@@ -402,7 +402,7 @@
     }
 
     private void handleFlushIfNeeded(@FlushReason int reason) {
-        if (mEvents.isEmpty()) {
+        if (mEvents == null || mEvents.isEmpty()) {
             if (VERBOSE) Log.v(TAG, "Nothing to flush");
             return;
         }