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

Commit 7d4d1c21 authored by Steven Moreland's avatar Steven Moreland
Browse files

resolve merge conflicts of d3b6ea09 to pi-dev-plus-aosp 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I669dfde4a23d8d995232dfbf6b57745532ff76f2
parents 610f3492 d3b6ea09

dumpstate/1.0/default/DumpstateDevice.cpp

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "DumpstateDevice.h"



#include <hidl/HidlBinderSupport.h>

#include <log/log.h>



#include "DumpstateUtil.h"
@@ -37,6 +38,11 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { 
    // this interface - since HIDL_FETCH_IDumpstateDevice() is not defined, this function will never

    // be called by dumpstate.



    // Exit when dump is completed since this is a lazy HAL.

    addPostCommandTask([]() {

        exit(0);

    });



    if (handle == nullptr || handle->numFds < 1) {

        ALOGE("no FDs\n");

        return Void();

dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-servi 
    user system

    group system

    interface android.hardware.dumpstate@1.0::IDumpstateDevice default

    oneshot

    disabled