diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-24 12:14:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-24 12:14:08 -0700 |
| commit | 1202c43685c475158a773d03d70effa01b6bb4ff (patch) | |
| tree | 5bbfcb940bd63f785146444e1241a2e4dd45abfe /services/java/com/android/server/display/LogicalDisplay.java | |
| parent | 8e080d7e10dd17662750605538a9799af66494e9 (diff) | |
| parent | f0681b34dffc1510cbd9c3da5c3a7e695553fa8d (diff) | |
| download | frameworks_base-1202c43685c475158a773d03d70effa01b6bb4ff.zip frameworks_base-1202c43685c475158a773d03d70effa01b6bb4ff.tar.gz frameworks_base-1202c43685c475158a773d03d70effa01b6bb4ff.tar.bz2 | |
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/display/LogicalDisplay.java')
| -rw-r--r-- | services/java/com/android/server/display/LogicalDisplay.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/display/LogicalDisplay.java b/services/java/com/android/server/display/LogicalDisplay.java index aa7ea82..aa62aee 100644 --- a/services/java/com/android/server/display/LogicalDisplay.java +++ b/services/java/com/android/server/display/LogicalDisplay.java @@ -186,6 +186,9 @@ final class LogicalDisplay { if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) { mBaseDisplayInfo.flags |= Display.FLAG_SUPPORTS_PROTECTED_BUFFERS; } + if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_SECURE) != 0) { + mBaseDisplayInfo.flags |= Display.FLAG_SECURE; + } mBaseDisplayInfo.name = deviceInfo.name; mBaseDisplayInfo.appWidth = deviceInfo.width; mBaseDisplayInfo.appHeight = deviceInfo.height; |