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

2023-08-02 15:27:46 +00:00
parent f956fd0980 e871b1f611
commit c7f44afca9
1 changed files with 3 additions and 1 deletions
--- 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();
+            }
        }
    }