commit c7f44afca93d4db35c2a426f15ada3b926b4b299
author Naomi Musgrave <nmusgrave@google.com> Wed Aug 02 15:27:46 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 02 15:27:46 2023 +0000
tree d42c4dfa65890f106f68b2cc2614cc96b9641b9b
parent f956fd09804eee275d3756a73a925f3a95e289c5
parent e871b1f611034973b7c0d3f7782370f14edef3b0

Merge "[MediaProjection] Fix NPE introduced from deadlock fix" into udc-qpr-dev

services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java

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 61d0afe..fb3f0b3 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 @@
         }
 
         synchronized (mLock) {
-            mProjectionGrant.stop();
+            if (mProjectionGrant != null) {
+                mProjectionGrant.stop();
+            }
         }
     }