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

Commit 8a7a6753 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@126645

parent 27629324

cmds/runtime/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libcutils \

	libui \

	libsystem_server \

	libhardware

	libhardware_legacy



LOCAL_C_INCLUDES := \

	$(JNI_H_INCLUDE)

include/private/opengles/gl_context.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sys/types.h>

#include <pthread.h>

#ifdef HAVE_ANDROID_OS

#include <sys/tls.h>

#include <bionic_tls.h>

#endif



#include <private/pixelflinger/ggl_context.h>

include/ui/EventHub.h

+3 −2
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ public: 
    // bit fields for classes of devices.

    enum {

        CLASS_KEYBOARD      = 0x00000001,

        CLASS_TOUCHSCREEN   = 0x00000002,

        CLASS_TRACKBALL     = 0x00000004

        CLASS_ALPHAKEY      = 0x00000002,

        CLASS_TOUCHSCREEN   = 0x00000004,

        CLASS_TRACKBALL     = 0x00000008

    };

    uint32_t getDeviceClasses(int32_t deviceId) const;

include/ui/Overlay.h

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ private: 
    virtual ~OverlayRef();



    overlay_handle_t const *mOverlayHandle;

    sp<IOverlay> mOverlayChanel;

    sp<IOverlay> mOverlayChannel;

    uint32_t mWidth;

    uint32_t mHeight;

    int32_t  mFormat;
@@ -77,10 +77,10 @@ public: 
    overlay_handle_t const* getHandleRef() const;



    /* blocks until an overlay buffer is available and return that buffer. */

    overlay_buffer_t dequeueBuffer();

    status_t dequeueBuffer(overlay_buffer_t* buffer);



    /* release the overlay buffer and post it */

    int queueBuffer(overlay_buffer_t buffer);

    status_t queueBuffer(overlay_buffer_t buffer);



    /* returns the address of a given buffer if supported, NULL otherwise. */

    void* getBufferAddress(overlay_buffer_t buffer);

include/ui/Surface.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ private: 
    friend class MediaRecorder;

    // mediaplayer needs access to ISurface for display

    friend class MediaPlayer;

    friend class Test;

    const sp<ISurface>& getISurface() const { return mSurface; }



    // can't be copied