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

Commit dcd1b29e authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge changes from topic 'sensors_framework_hal' into oc-dev 

am: 2d3349c9

Change-Id: I06a5e6a43d8841b464e794c7e9414de61b54e185
parents 6f6d98bb 2d3349c9

services/sensorservice/hidl/DirectReportChannel.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ using ::android::hardware::Return; 
using ::android::hardware::Void;

using ::android::sp;



struct DirectReportChannel : public IDirectReportChannel {

struct DirectReportChannel final : public IDirectReportChannel {



    DirectReportChannel(::android::SensorManager& manager, int channelId);

    ~DirectReportChannel();

services/sensorservice/hidl/include/sensorservicehidl/SensorManager.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ using ::android::hardware::hidl_handle; 
using ::android::hardware::hidl_memory;

using ::android::hardware::Return;



struct SensorManager : public ISensorManager {

struct SensorManager final : public ISensorManager {



    SensorManager();

    ~SensorManager();