diff options
| author | 2023-08-02 16:09:07 +0000 | |
|---|---|---|
| committer | 2023-08-02 16:09:07 +0000 | |
| commit | abd4658c5099d34cb04944ff076c7ed094ff7b01 (patch) | |
| tree | 12f6b55812f159cb3222d15aacffd9f63bc2f795 | |
| parent | c8e2257e272f7cc5aecef605ef381b1b542aa089 (diff) | |
| parent | c7f44afca93d4db35c2a426f15ada3b926b4b299 (diff) | |
Merge "[MediaProjection] Fix NPE introduced from deadlock fix" into udc-qpr-dev am: c7f44afca9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24224363
Change-Id: Id9595e11a596ed3a34acfacfaf9088f52d99ca8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 61d0afeb7717..fb3f0b3b3496 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(); + } } } |