Enable protected contents in GPU composition by default.
BUG: b/35315015, b/127862411
Test: Verify with Youtube protected videos.
Change-Id: If6af53dafbd1026db22f3f18ec7e277c53dbc56e
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();
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 176c65d..5cd0f21 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -995,7 +995,6 @@
int mDebugRegion = 0;
bool mDebugDisableHWC = false;
bool mDebugDisableTransformHint = false;
- bool mDebugEnableProtectedContent = false;
volatile nsecs_t mDebugInTransaction = 0;
bool mForceFullDamage = false;
bool mPropagateBackpressure = true;