diff options
| author | Mathias Agopian <mathias@google.com> | 2013-05-17 10:18:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-17 10:18:45 -0700 |
| commit | 2381033ad001960c606d13e3a4198e5da3672ec7 (patch) | |
| tree | 7c6e6419798e96aa804d1aff3affd62b3a6e2d28 /services/surfaceflinger/DisplayHardware/HWComposer.cpp | |
| parent | a6fee1904fe729688fdb3977473932fb61447975 (diff) | |
| parent | e6eef6c136b007f3a7e1e19884875b855c0c5f95 (diff) | |
| download | frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.zip frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.tar.gz frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.tar.bz2 | |
am e6eef6c1: am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit 'e6eef6c136b007f3a7e1e19884875b855c0c5f95':
make the warning timout of Fence::waitForever() implicit and longer
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/HWComposer.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 4e6dde5..5082192 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -747,7 +747,7 @@ int HWComposer::fbPost(int32_t id, if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) { return setFramebufferTarget(id, acquireFence, buffer); } else { - acquireFence->waitForever(1000, "HWComposer::fbPost"); + acquireFence->waitForever("HWComposer::fbPost"); return mFbDev->post(mFbDev, buffer->handle); } } |