diff options
Diffstat (limited to 'include/ui/Fence.h')
| -rw-r--r-- | include/ui/Fence.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ui/Fence.h b/include/ui/Fence.h index a4c1df72bc..d45ad762da 100644 --- a/include/ui/Fence.h +++ b/include/ui/Fence.h @@ -79,6 +79,9 @@ public: // becomes signaled when both f1 and f2 are signaled (even if f1 or f2 is // destroyed before it becomes signaled). The name argument specifies the // human-readable name to associated with the new Fence object. + static sp<Fence> merge(const char* name, const sp<Fence>& f1, + const sp<Fence>& f2); + static sp<Fence> merge(const String8& name, const sp<Fence>& f1, const sp<Fence>& f2); |