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

Commit 75301146 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger" 

* commit '5588d900':
  Enable clang for libui/libgui/surfaceflinger
parents 9f6b6732 5588d900

include/gui/Sensor.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ private: 
    String8 mStringType;

    String8 mRequiredPermission;

    int32_t mMaxDelay;

    int32_t mFlags;

    uint32_t mFlags;

    static void flattenString8(void*& buffer, size_t& size, const String8& string8);

    static bool unflattenString8(void const*& buffer, size_t& size, String8& outputString8);

};

include/ui/FramebufferNativeWindow.h

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
 * limitations under the License.

 */



#ifndef INCLUDED_FROM_FRAMEBUFFER_NATIVE_WINDOW_CPP

#warning "FramebufferNativeWindow is deprecated"

#endif



#ifndef ANDROID_FRAMEBUFFER_NATIVE_WINDOW_H

#define ANDROID_FRAMEBUFFER_NATIVE_WINDOW_H



#warning "FramebufferNativeWindow is deprecated"



#include <stdint.h>

#include <sys/types.h>

include/ui/GraphicBuffer.h

+8 −8
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ public: 
    GraphicBuffer();



    // creates w * h buffer

    GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage);

    GraphicBuffer(int w, int h, PixelFormat format, int usage);



    // create a buffer from an existing handle

    GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage,

            uint32_t stride, native_handle_t* handle, bool keepOwnership);

    GraphicBuffer(int w, int h, PixelFormat format, int usage,

            int stride, native_handle_t* handle, bool keepOwnership);



    // create a buffer from an existing ANativeWindowBuffer

    GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership);
@@ -84,15 +84,15 @@ public: 
    // return status

    status_t initCheck() const;



    uint32_t getWidth() const           { return width; }

    uint32_t getHeight() const          { return height; }

    uint32_t getStride() const          { return stride; }

    uint32_t getUsage() const           { return usage; }

    int getWidth() const                { return width; }

    int getHeight() const               { return height; }

    int getStride() const               { return stride; }

    int getUsage() const                { return usage; }

    PixelFormat getPixelFormat() const  { return format; }

    Rect getBounds() const              { return Rect(width, height); }

    uint64_t getId() const              { return mId; }



    status_t reallocate(uint32_t w, uint32_t h, PixelFormat f, uint32_t usage);

    status_t reallocate(int w, int h, PixelFormat f, int usage);



    status_t lock(uint32_t usage, void** vaddr);

    status_t lock(uint32_t usage, const Rect& rect, void** vaddr);

libs/gui/Android.mk

+6 −3
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_CLANG := true

LOCAL_CPPFLAGS := -std=c++11



LOCAL_SRC_FILES := \

	IGraphicBufferConsumer.cpp \

	IConsumerListener.cpp \

libs/gui/SensorEventQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void SensorEventQueue::sendAck(const ASensorEvent* events, int count) { 
        ssize_t size = ::send(mSensorChannel->getFd(), &mNumAcksToSend, sizeof(mNumAcksToSend),

                MSG_DONTWAIT | MSG_NOSIGNAL);

        if (size < 0) {

            ALOGE("sendAck failure %d %d", size, mNumAcksToSend);

            ALOGE("sendAck failure %zd %d", size, mNumAcksToSend);

        } else {

            mNumAcksToSend = 0;

        }