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

Commit 796fb04d authored by Iliyan Malchev's avatar Iliyan Malchev Committed by Android (Google) Code Review
Browse files

Merge changes I5c61ac40,I67c40a3c,I3e2ddd01 

* changes:
  frameworks/base: switch CameraService to a HAL module
  frameworks/base: make the ANativeWindow query() method const
  frameworks/base: include system/core header camera.h in Camera.h
parents 4191242b 41abd673

include/gui/SurfaceTextureClient.h

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ private: 
    static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int perform(ANativeWindow* window, int operation, ...);

    static int query(ANativeWindow* window, int what, int* value);

    static int query(const ANativeWindow* window, int what, int* value);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int setSwapInterval(ANativeWindow* window, int interval);
@@ -57,7 +57,7 @@ private: 
    int dequeueBuffer(android_native_buffer_t** buffer);

    int lockBuffer(android_native_buffer_t* buffer);

    int perform(int operation, va_list args);

    int query(int what, int* value);

    int query(int what, int* value) const;

    int queueBuffer(android_native_buffer_t* buffer);

    int setSwapInterval(int interval);

include/surfaceflinger/Surface.h

+2 −2
Original line number Diff line number Diff line
@@ -206,14 +206,14 @@ private: 
    static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int query(ANativeWindow* window, int what, int* value);

    static int query(const ANativeWindow* window, int what, int* value);

    static int perform(ANativeWindow* window, int operation, ...);



    int dequeueBuffer(android_native_buffer_t** buffer);

    int lockBuffer(android_native_buffer_t* buffer);

    int queueBuffer(android_native_buffer_t* buffer);

    int cancelBuffer(android_native_buffer_t* buffer);

    int query(int what, int* value);

    int query(int what, int* value) const;

    int perform(int operation, va_list args);



    void dispatch_setUsage(va_list args);

include/ui/FramebufferNativeWindow.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ private: 
    static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int query(ANativeWindow* window, int what, int* value);

    static int query(const ANativeWindow* window, int what, int* value);

    static int perform(ANativeWindow* window, int operation, ...);

    

    framebuffer_device_t* fbDev;

include/ui/egl/android_natives.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ struct ANativeWindow 
     * 

     * Returns 0 on success or -errno on error.

     */

    int     (*query)(struct ANativeWindow* window,

    int     (*query)(const struct ANativeWindow* window,

                int what, int* value);

    

    /*

libs/gui/Surface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -536,9 +536,9 @@ int Surface::queueBuffer(ANativeWindow* window, 
    return self->queueBuffer(buffer);

}



int Surface::query(ANativeWindow* window, 

int Surface::query(const ANativeWindow* window,

        int what, int* value) {

    Surface* self = getSelf(window);

    const Surface* self = getSelf(window);

    return self->query(what, value);

}
@@ -697,7 +697,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer) 
    return err;

}



int Surface::query(int what, int* value)

int Surface::query(int what, int* value) const

{

    switch (what) {

    case NATIVE_WINDOW_WIDTH: