Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f456d32d authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am d7007cd4: Merge "Forward compatibility patch." 

* commit 'd7007cd4':
  Forward compatibility patch.
parents 9801575a d7007cd4

include/gui/ISurfaceComposer.h

+4 −0
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ public: 
        eElectronBeamAnimationOff = 0x10

    };



    enum {

        eDisplayIdMain = 0

    };



    /* create connection with surface flinger, requires

     * ACCESS_SURFACE_FLINGER permission

     */

include/gui/SurfaceComposerClient.h

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,14 @@ public: 
    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);