From cc92b9c37058964761378addaac2c390753c42fd Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Mon, 11 May 2020 14:42:57 -0400
Subject: [PATCH] Fix NPE in ScreenshotHelper

Check for null before unbinding the screenshot process.

Test: manual
Bug: 155726862
Change-Id: Ica1cc521b6a510b5e15e42e1e2a87ebf613a53aa
---
 core/java/com/android/internal/util/ScreenshotHelper.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/util/ScreenshotHelper.java b/core/java/com/android/internal/util/ScreenshotHelper.java
index 49c9302eeb110..ad6c7e8f7f60d 100644
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -132,6 +132,7 @@ public class ScreenshotHelper {
                     }
                 };
     }
+
     private static final String TAG = "ScreenshotHelper";
 
     // Time until we give up on the screenshot & show an error instead.
@@ -146,8 +147,6 @@ public class ScreenshotHelper {
         mContext = context;
     }
 
-
-
     /**
      * Request a screenshot be taken.
      *
@@ -284,8 +283,8 @@ public class ScreenshotHelper {
                             break;
                         case SCREENSHOT_MSG_PROCESS_COMPLETE:
                             synchronized (mScreenshotLock) {
-                                if (mScreenshotConnection == myConn) {
-                                    mContext.unbindService(mScreenshotConnection);
+                                if (myConn != null && mScreenshotConnection == myConn) {
+                                    mContext.unbindService(myConn);
                                     mScreenshotConnection = null;
                                     mScreenshotService = null;
                                 }