From e871b1f611034973b7c0d3f7782370f14edef3b0 Mon Sep 17 00:00:00 2001
From: Naomi Musgrave <nmusgrave@google.com>
Date: Thu, 27 Jul 2023 12:08:15 +0100
Subject: [PATCH] [MediaProjection] Fix NPE introduced from deadlock fix

Bug: 293133367
Test: Manual
Change-Id: I9c21acf069c66f1ade22c49b095ad5339fe13eca
---
 .../media/projection/MediaProjectionManagerService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
index 61d0afeb77177..fb3f0b3b34968 100644
--- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
+++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
@@ -260,7 +260,9 @@ public final class MediaProjectionManagerService extends SystemService
         }
 
         synchronized (mLock) {
-            mProjectionGrant.stop();
+            if (mProjectionGrant != null) {
+                mProjectionGrant.stop();
+            }
         }
     }