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

Commit c7f44afc authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

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

parents f956fd09 e871b1f6

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) {