OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be4ccdc
)
libgui: Fix bad merge in Surface.h
author
Dan Stoza
<stoza@google.com>
Thu, 19 Mar 2015 18:26:45 +0000
(11:26 -0700)
committer
Dan Stoza
<stoza@google.com>
Thu, 19 Mar 2015 18:26:45 +0000
(11:26 -0700)
Fixes a bad merge from AOSP.
Change-Id: Idb69b34787e8f4e76fb64130573168e5fde6a87c
include/gui/Surface.h
patch
|
blob
|
history
diff --git
a/include/gui/Surface.h
b/include/gui/Surface.h
index
6968202
..
e973483
100644
(file)
--- a/
include/gui/Surface.h
+++ b/
include/gui/Surface.h
@@
-158,7
+158,6
@@
protected:
virtual int lockBuffer_DEPRECATED(ANativeWindowBuffer* buffer);
- virtual int connect(int api, const sp<IProducerListener>& listener);
virtual int connect(int api);
virtual int disconnect(int api);
virtual int setBufferCount(int bufferCount);