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

Commit 039d8bd6 authored by Mike Ma's avatar Mike Ma Committed by Android (Google) Code Review
Browse files

Merge "Add proto dumpstate mode"

parents 30425b85 8908d6fd

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ f18695dd36ee205640b8326a17453858a7b4596653aaa6ef0016b0aef1bd4dac android.hardwar 
4d85e814f94949dae4dc6cb82bbd7d6bb24ffafda6ddb2eac928d2a4fc2e21ce android.hardware.cas@1.2::types

66931c2506fbb5af61f20138cb05e0a09e7bf67d6964c231d27c648933bb33ec android.hardware.drm@1.3::ICryptoFactory

994d08ab27d613022c258a9ec48cece7adf2a305e92df5d76ef923e2c6665f64 android.hardware.drm@1.3::IDrmFactory

446287268831f4ddfac4a51bb1c32ae1e48e47bccd535fccc2c4546d0e7c4013 android.hardware.dumpstate@1.1::types

d9df99be0f59d8f33a9699fe316c67bfd11818aa69440bb1123ba43e717cea85 android.hardware.dumpstate@1.1::types

186bc152ae189ab48f3a761a44ddf5edd0d483073c5b6ca1f802f8b50488b754 android.hardware.dumpstate@1.1::IDumpstateDevice

769d346927a94fd40ee80a5a976d8d15cf022ef99c5900738f4a82f26c0ed229 android.hardware.gnss@2.1::types

626db710bf917ecf551a0b0b1f25be10bf52758f43e0fc808b148b6aae2ef73e android.hardware.gnss@2.1::IGnss

dumpstate/1.1/types.hal

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ enum DumpstateMode : uint32_t { 
     * This mode MUST be supported if the dumpstate HAL is implemented.

     */

    DEFAULT = 6,

    /**

     * Takes a report in protobuf.

     *

     * The content, if implemented, must be a binary protobuf message written to the first file

     * descriptor of the native handle. The protobuf schema shall be defined by the vendor.

     */

    PROTO = 7,

};



/**

dumpstate/1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ class DumpstateHidl1_1Test : public ::testing::TestWithParam<std::string> { 
    TEST_FOR_DUMPSTATE_MODE(name, body, WEAR);         \

    TEST_FOR_DUMPSTATE_MODE(name, body, CONNECTIVITY); \

    TEST_FOR_DUMPSTATE_MODE(name, body, WIFI);         \

    TEST_FOR_DUMPSTATE_MODE(name, body, DEFAULT);

    TEST_FOR_DUMPSTATE_MODE(name, body, DEFAULT);      \

    TEST_FOR_DUMPSTATE_MODE(name, body, PROTO);



constexpr uint64_t kDefaultTimeoutMillis = 30 * 1000;  // 30 seconds