diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-23 17:35:57 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-10-23 20:37:40 -0700 |
| commit | f0681b34dffc1510cbd9c3da5c3a7e695553fa8d (patch) | |
| tree | 750cc9603cd0571c9a229117129b6c21ab61be24 /services/java/com/android/server/display/LocalDisplayAdapter.java | |
| parent | 56e75631bd737e5362309330d4839cc1dddb501c (diff) | |
Secure windows, secure surface views and secure displays.
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.
Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
Diffstat (limited to 'services/java/com/android/server/display/LocalDisplayAdapter.java')
| -rw-r--r-- | services/java/com/android/server/display/LocalDisplayAdapter.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/java/com/android/server/display/LocalDisplayAdapter.java b/services/java/com/android/server/display/LocalDisplayAdapter.java index d6c524896db4..fa56b83103f3 100644 --- a/services/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/java/com/android/server/display/LocalDisplayAdapter.java @@ -127,10 +127,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { mInfo.height = mPhys.height; mInfo.refreshRate = mPhys.refreshRate; - // Assume that all built-in displays have secure output (eg. HDCP) and + // Assume that all built-in displays that have secure output (eg. HDCP) also // support compositing from gralloc protected buffers. - mInfo.flags = DisplayDeviceInfo.FLAG_SECURE - | DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; + if (mPhys.secure) { + mInfo.flags = DisplayDeviceInfo.FLAG_SECURE + | DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; + } if (mBuiltInDisplayId == Surface.BUILT_IN_DISPLAY_ID_MAIN) { mInfo.name = getContext().getResources().getString( |