commit 548d4fae2d22fc293fe74fe3abefc0d040f9256b
author Peiyong Lin <lpy@google.com> Tue Apr 02 18:14:44 2019 -0700
committer Peiyong Lin <lpy@google.com> Tue Apr 02 18:14:44 2019 -0700
tree 41c5c6d0c0e2f96b5ffafdfebd1a5e2e7f20928d
parent e3b63d460c97d99c6544d9cf6ab0e77bf8e628e5

Enable protected contents in GPU composition by default.

BUG: b/35315015, b/127862411
Test: Verify with Youtube protected videos.
Change-Id: If6af53dafbd1026db22f3f18ec7e277c53dbc56e

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2ba55b5..0698e2c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3248,8 +3248,7 @@
     const auto& displayState = display->getState();
     const auto displayId = display->getId();
     auto& renderEngine = getRenderEngine();
-    const bool supportProtectedContent =
-            mDebugEnableProtectedContent && renderEngine.supportsProtectedContent();
+    const bool supportProtectedContent = renderEngine.supportsProtectedContent();
 
     const Region bounds(displayState.bounds);
     const DisplayRenderArea renderArea(displayDevice);
@@ -5326,11 +5325,6 @@
                 }
                 return NO_ERROR;
             }
-            case 1032: {
-                n = data.readInt32();
-                mDebugEnableProtectedContent = n;
-                return NO_ERROR;
-            }
             // Set trace flags
             case 1033: {
                 n = data.readUint32();