diff options
author | Jesse Hall <jessehall@google.com> | 2013-04-06 03:31:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-06 03:31:49 +0000 |
commit | d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37 (patch) | |
tree | c70249fd3cdc3e6b7537d90ddc45d7fe8a73bd48 /services | |
parent | 39c24a20bbc697630d2b92c251b70c04d6f9d00c (diff) | |
parent | 2ba647e9f5249d9ed97739d29d879064e31ba34a (diff) | |
download | frameworks_native-d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37.zip frameworks_native-d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37.tar.gz frameworks_native-d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37.tar.bz2 |
Merge "Actually set the virtual display output buffer." into jb-mr2-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index d2b3edb..7e14d95 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -76,7 +76,11 @@ status_t VirtualDisplaySurface::advanceFrame() { if (result != NO_ERROR) return result; - return mHwc.fbPost(mDisplayId, fence, mAcquiredBuffer); + result = mHwc.fbPost(mDisplayId, fence, mAcquiredBuffer); + if (result == NO_ERROR) { + result = mHwc.setOutputBuffer(mDisplayId, fence, mAcquiredBuffer); + } + return result; } void VirtualDisplaySurface::onFrameCommitted() { |