commit 82052cff2c4da7a2af650cdd6bb7d21293742178
author Mathias Agopian <mathias@google.com> Thu Feb 14 20:28:24 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 14 20:28:24 2013 +0000
tree a9c9b335814b2c0a0905dc8e8c6a58daf2275aea
parent 9a86704c221454b0c52717c904fb7143b5ab2b0b
parent 6d9b9dfd555ee2bc1dd8381dde95d45f9500b3ca

Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"

include/gui/Surface.h

diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index 27921df..ec75d4e 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -31,8 +31,6 @@
 #include <gui/ISurface.h>
 #include <gui/ISurfaceComposerClient.h>
 
-#define ANDROID_VIEW_SURFACE_JNI_ID    "mNativeSurface"
-
 namespace android {
 
 // ---------------------------------------------------------------------------

include/gui/SurfaceComposerClient.h

diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index dbdd3a9..e0761b9 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 
 #include <binder/IBinder.h>
+#include <binder/IMemory.h>
 
 #include <utils/RefBase.h>
 #include <utils/Singleton.h>