Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b8ad4d1 authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "[MediaProjection] Fix NPE introduced from deadlock fix" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24224363



Change-Id: I66d47c555f03ff698253e6670cf65c19b04d36be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8192d9e abd4658c

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

+3 −1
Original line number Diff line number Diff line
@@ -260,9 +260,11 @@ public final class MediaProjectionManagerService extends SystemService 
        }



        synchronized (mLock) {

            if (mProjectionGrant != null) {

                mProjectionGrant.stop();

            }

        }

    }



    private void startProjectionLocked(final MediaProjection projection) {

        if (mProjectionGrant != null) {