commit 0ccc2b0a4466f12fb1d753b58314854674b01b3c
author Michael Wright <michaelwr@google.com> Thu Jul 24 18:20:41 2014 -0700
committer Michael Wright <michaelwr@google.com> Fri Jul 25 01:25:03 2014 +0000
tree fa5032961324d2f902f92fc11f4373d238135e75
parent cfec0fbacb4038f39170cef816e7c597a6fc5eb2

Flip the permissions checks for video capture.

Currently they're backwards in DisplayManagerService. Oops.

Bug: 16315225
Change-Id: I9bbfc0f4aef1bd21e43594cc36c6e8fd112f0b81

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

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 2737646..b9acea5 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1367,7 +1367,7 @@
             }
             if (mContext.checkCallingPermission(
                     android.Manifest.permission.CAPTURE_VIDEO_OUTPUT)
-                    != PackageManager.PERMISSION_GRANTED) {
+                    == PackageManager.PERMISSION_GRANTED) {
                 return true;
             }
             return canProjectSecureVideo(projection);
@@ -1385,7 +1385,7 @@
             }
             return mContext.checkCallingPermission(
                     android.Manifest.permission.CAPTURE_SECURE_VIDEO_OUTPUT)
-                    != PackageManager.PERMISSION_GRANTED;
+                    == PackageManager.PERMISSION_GRANTED;
         }
     }