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

Commit 94a069e8 authored by Colin Cross's avatar Colin Cross
Browse files

Use newly introduced hidl_handle in DumpstateDefault 

The dumpstate hal passes a hild_handle, but DumpstateDefault was
expecting a native_handle_t*.  This was exposed when
Id7dbc646b50f132e240bfbba719a2d36585ccc35 caused the Android.mk
file to be picked up.

Bug: 31982882
Bug: 32089785
Test: builds
Change-Id: I48c84b6d19a93ceb0641be517f378fd6aba45962
parent 59fa619e

dumpstate/1.0/default/DumpstateDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ namespace V1_0 { 
namespace implementation {



// Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.

Return<void> DumpstateDevice::dumpstateBoard(const native_handle_t* handle) {

Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) {

    if (handle->numFds < 1) {

        ALOGE("no FDs\n");

        return Void();

dumpstate/1.0/default/DumpstateDevice.h

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ namespace implementation { 


using ::android::hardware::dumpstate::V1_0::IDumpstateDevice;

using ::android::hardware::hidl_array;

using ::android::hardware::hidl_handle;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::Return;
@@ -21,7 +22,7 @@ using ::android::sp; 


struct DumpstateDevice : public IDumpstateDevice {

    // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow.

    Return<void> dumpstateBoard(const native_handle_t* fd) override;

    Return<void> dumpstateBoard(const hidl_handle& h) override;



};