diff options
| author | 2016-10-10 18:11:30 +0000 | |
|---|---|---|
| committer | 2016-10-10 18:11:30 +0000 | |
| commit | c7d352eb17bc507d9e28ec878895bd888166e514 (patch) | |
| tree | 7a22b31d5f452c19367a82a130dfe91c8b9437ad /include/ui/Fence.h | |
| parent | c1b0c52f4fee28a9d109d28b037faac2798d8f6b (diff) | |
| parent | fd4c8c38051f9dad028e4e43e0eb39ba412b2c0a (diff) | |
Use snprintf for SurfaceFlinger fence name
am: fd4c8c3805
Change-Id: I16d3eb7cde318f2078be36acea22b9bc84975b63
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); |