commit f456d32d3c3aea966b5fba43e6d34f72df06c60d
author Jeff Brown <jeffbrown@android.com> Mon Aug 27 17:57:26 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 17:57:26 2012 -0700
tree 6385dbda61fdeedad63dc34172265cd0d1ed15eb
parent 9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe
parent d7007cd4bb2016a09ae8e8f746118f81fdd27f02

am d7007cd4: Merge "Forward compatibility patch."

* commit 'd7007cd4bb2016a09ae8e8f746118f81fdd27f02':
  Forward compatibility patch.

include/gui/ISurfaceComposer.h

diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h
index 7320e4d..09e7771 100644
--- a/include/gui/ISurfaceComposer.h
+++ b/include/gui/ISurfaceComposer.h
@@ -96,6 +96,10 @@
         eElectronBeamAnimationOff = 0x10
     };
 
+    enum {
+        eDisplayIdMain = 0
+    };
+
     /* create connection with surface flinger, requires
      * ACCESS_SURFACE_FLINGER permission
      */

include/gui/SurfaceComposerClient.h

diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index 3bd10de..295bc02 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -112,6 +112,14 @@
     static ssize_t getDisplayHeight(DisplayID dpy);
     static ssize_t getDisplayOrientation(DisplayID dpy);
 
+    static inline sp<IBinder> getBuiltInDisplay(int32_t dpy) {
+        return NULL;
+    }
+
+    static inline status_t getDisplayInfo(const sp<IBinder>& dpy, DisplayInfo* info) {
+        return getDisplayInfo(0, info);
+    }
+
     status_t linkToComposerDeath(const sp<IBinder::DeathRecipient>& recipient,
             void* cookie = NULL, uint32_t flags = 0);