commit 6884fed09253af2aa2f53e0098fbe6b118f8f248
author Adam He <adamhe@google.com> Mon Jan 07 13:18:32 2019 -0800
committer Adam He <adamhe@google.com> Tue Jan 08 13:24:47 2019 -0800
tree 260d7a2546790ddfaab67e28e86607c3a57d8f06
parent d59bfa45683c53d27402a48380c889d0d36dc483

Added null checks for NPE on mSystemServerInterface

Bug: 119254124
Change-Id: Iebec84b414b2e156b9cdada05d66bfeb7f6caf05
Test: atest CtsContentCaptureServiceTestCases

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 baf4a35..d076af5 100644
--- a/core/java/android/view/contentcapture/MainContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java
@@ -193,6 +193,8 @@
         final int flags = 0; // TODO(b/111276913): get proper flags
 
         try {
+            if (mSystemServerInterface == null) return;
+
             mSystemServerInterface.startSession(mContext.getUserId(), mApplicationToken,
                     componentName, mId, flags, new IResultReceiver.Stub() {
                         @Override
@@ -375,6 +377,8 @@
         }
 
         try {
+            if (mSystemServerInterface == null) return;
+
             mSystemServerInterface.finishSession(mContext.getUserId(), mId);
         } catch (RemoteException e) {
             Log.e(TAG, "Error destroying system-service session " + mId + " for "