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

Commit 14f8cf12 authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit '75c5de42' into HEAD

parents 28df99d0 75c5de42

cmds/dumpstate/dumpstate.c

+1 −2
Original line number Diff line number Diff line
@@ -360,8 +360,7 @@ static void dumpstate() { 


    run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);



    // raft disabled as per http://b/24159112

    // run_command("RAFT LOGS", 300, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);

    run_command("RAFT LOGS", 300, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);



    /* show the traces we collected in main(), if that was done */

    if (dump_traces_path != NULL) {

include/binder/Parcel.h

+3 −1
Original line number Diff line number Diff line
@@ -377,10 +377,12 @@ public: 
    };



private:

    size_t mBlobAshmemSize;

    size_t mOpenAshmemSize;



public:

    // TODO: Remove once ABI can be changed.

    size_t getBlobAshmemSize() const;

    size_t getOpenAshmemSize() const;

};



// ---------------------------------------------------------------------------

include/input/Input.h

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <utils/String8.h>

#include <utils/Timers.h>

#include <utils/Vector.h>

#include <stdint.h>



/*

 * Additional private constants not defined in ndk/ui/input.h.
@@ -110,6 +111,11 @@ enum { 
 */

#define MAX_POINTERS 16



/*

 * Maximum number of samples supported per motion event.

 */

#define MAX_SAMPLES UINT16_MAX



/*

 * Maximum pointer id value supported in a motion event.

 * Smallest pointer id is 0.

include/input/KeyCharacterMap.h

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ public: 
     * the mapping in some way. */

    status_t mapKey(int32_t scanCode, int32_t usageCode, int32_t* outKeyCode) const;



    /* Tries to find a replacement key code for a given key code and meta state

     * in character map. */

    void tryRemapKey(int32_t scanCode, int32_t metaState,

            int32_t* outKeyCode, int32_t* outMetaState) const;



#ifdef __ANDROID__

    /* Reads a key map from a parcel. */

    static sp<KeyCharacterMap> readFromParcel(Parcel* parcel);
@@ -151,6 +156,9 @@ private: 


        /* The fallback keycode if the key is not handled. */

        int32_t fallbackKeyCode;



        /* The replacement keycode if the key has to be replaced outright. */

        int32_t replacementKeyCode;

    };



    struct Key {

include/input/Keyboard.h

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ extern bool isEligibleBuiltInKeyboard(const InputDeviceIdentifier& deviceIdentif 
 */

extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);



/**

 * Normalizes the meta state such that if either the left or right modifier

 * meta state bits are set then the result will also include the universal

 * bit for that modifier.

 */

extern int32_t normalizeMetaState(int32_t oldMetaState);



/**

 * Returns true if a key is a meta key like ALT or CAPS_LOCK.

 */