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

Commit a74f3e47 authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 5886d7db: am f5f90d6c: Merge "Flip the permissions checks for video capture." into lmp-dev 

* commit '5886d7dba5e8542a6fd87083830f65b09b95e82a':
  Flip the permissions checks for video capture.
parents 078a4045 3fe58d7f

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1367,7 +1367,7 @@ public final class DisplayManagerService extends SystemService { 
            }

            }

            if (mContext.checkCallingPermission(

            if (mContext.checkCallingPermission(

                    android.Manifest.permission.CAPTURE_VIDEO_OUTPUT)

                    android.Manifest.permission.CAPTURE_VIDEO_OUTPUT)

                    != PackageManager.PERMISSION_GRANTED) {

                    == PackageManager.PERMISSION_GRANTED) {

                return true;

                return true;

            }

            }

            return canProjectSecureVideo(projection);

            return canProjectSecureVideo(projection);
@@ -1385,7 +1385,7 @@ public final class DisplayManagerService extends SystemService { 
            }

            }

            return mContext.checkCallingPermission(

            return mContext.checkCallingPermission(

                    android.Manifest.permission.CAPTURE_SECURE_VIDEO_OUTPUT)

                    android.Manifest.permission.CAPTURE_SECURE_VIDEO_OUTPUT)

                    != PackageManager.PERMISSION_GRANTED;

                    == PackageManager.PERMISSION_GRANTED;

        }

        }

    }

    }