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

Commit 07f5bf32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-84a230a232954fbd95417a65170e2a87" into tm-mainline-prod 

* changes:
  [automerge] Implements AIDL multi-HAL debug dump 2p: 5fc07601
  Implements AIDL multi-HAL debug dump
parents 18e7e58d 1a29ce78

sensors/aidl/default/multihal/HalProxyAidl.cpp

+12 −0
Original line number Diff line number Diff line
@@ -206,6 +206,18 @@ static ::android::hardware::sensors::V1_0::SharedMemInfo convertSharedMemInfo( 
            resultToBinderStatus(HalProxy::unregisterDirectChannel(in_channelHandle)));

}



binder_status_t HalProxyAidl::dump(int fd, const char ** /* args */,

                                   uint32_t /* numArgs */) {

  native_handle_t *nativeHandle =

      native_handle_create(1 /* numFds */, 0 /* numInts */);

  nativeHandle->data[0] = fd;



  HalProxy::debug(nativeHandle, {} /* args */);



  native_handle_delete(nativeHandle);

  return STATUS_OK;

}



}  // namespace implementation

}  // namespace sensors

}  // namespace hardware

sensors/aidl/default/multihal/include/HalProxyAidl.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ class HalProxyAidl : public ::android::hardware::sensors::V2_1::implementation:: 
    ::ndk::ScopedAStatus setOperationMode(

            ::aidl::android::hardware::sensors::ISensors::OperationMode in_mode) override;

    ::ndk::ScopedAStatus unregisterDirectChannel(int32_t in_channelHandle) override;



    binder_status_t dump(int fd, const char **args, uint32_t numArgs) override;

};



}  // namespace implementation