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

Commit 83d46db6 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release

parents 86739a4b 5ec99b57

include/ui/GraphicBuffer.h

+4 −1
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ public: 
    void setIndex(int index);

    int getIndex() const;



    // for debugging

    static void dumpAllocationsToSystemLog();



private:

    virtual ~GraphicBuffer();

include/ui/GraphicBufferAllocator.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public: 
    status_t free(buffer_handle_t handle);



    void dump(String8& res) const;

    static void dumpToSystemLog();



private:

    struct alloc_rec_t {

include/ui/InputDispatcher.h

+9 −3
Original line number Diff line number Diff line
@@ -306,9 +306,10 @@ public: 
    virtual bool interceptKeyBeforeDispatching(const sp<InputChannel>& inputChannel,

            const KeyEvent* keyEvent, uint32_t policyFlags) = 0;



    /* Allows the policy a chance to perform default processing for an unhandled key. */

    /* Allows the policy a chance to perform default processing for an unhandled key.

     * Returns an alternate keycode to redispatch as a fallback, or 0 to give up. */

    virtual bool dispatchUnhandledKey(const sp<InputChannel>& inputChannel,

            const KeyEvent* keyEvent, uint32_t policyFlags) = 0;

            const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) = 0;



    /* Notifies the policy about switch events.

     */
@@ -735,6 +736,7 @@ private: 
            CANCEL_ALL_EVENTS = 0,

            CANCEL_POINTER_EVENTS = 1,

            CANCEL_NON_POINTER_EVENTS = 2,

            CANCEL_FALLBACK_EVENTS = 3,

        };



        InputState();
@@ -771,6 +773,7 @@ private: 
            int32_t source;

            int32_t keyCode;

            int32_t scanCode;

            int32_t flags;

            nsecs_t downTime;

        };
@@ -790,7 +793,10 @@ private: 
        Vector<KeyMemento> mKeyMementos;

        Vector<MotionMemento> mMotionMementos;



        static bool shouldCancelEvent(int32_t eventSource, CancelationOptions options);

        static bool shouldCancelKey(const KeyMemento& memento,

                CancelationOptions options);

        static bool shouldCancelMotion(const MotionMemento& memento,

                CancelationOptions options);

    };



    /* Manages the dispatch state associated with a single input channel. */

include/ui/InputReader.h

+2 −1
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ private: 
    } mLocked;



    void initializeLocked();

    void initializeLedStateLocked(LockedState::LedState& ledState, int32_t led);



    void configureParameters();

    void dumpParameters(String8& dump);
@@ -414,6 +413,8 @@ private: 


    ssize_t findKeyDownLocked(int32_t scanCode);



    void resetLedStateLocked();

    void initializeLedStateLocked(LockedState::LedState& ledState, int32_t led);

    void updateLedStateLocked(bool reset);

    void updateLedStateForModifierLocked(LockedState::LedState& ledState, int32_t led,

            int32_t modifier, bool reset);

include/ui/InputTransport.h

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public: 
     * Returns WOULD_BLOCK if there is no signal present.

     * Other errors probably indicate that the channel is broken.

     */

    status_t receiveFinishedSignal(bool& outHandled);

    status_t receiveFinishedSignal(bool* outHandled);



private:

    sp<InputChannel> mChannel;