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

Commit 51ae67e9 authored by Anthony Stange's avatar Anthony Stange Committed by Automerger Merge Worker
Browse files

Merge "sensors: trivial fixes in comments" am: c75b9641 am: 056a7cd6 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/572085

Change-Id: Ica9be81af9cc5b395ea2590b074d6a695d26b534
parents fd39bf2f 056a7cd6

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -780,6 +780,8 @@ f729ee6a5f136b25d79ea6895d24700fce413df555baaecf2c39e4440d15d043 android.hardwar 
550619f876cadbea1f718edce120f0e1dd4a6f4bd4c28b59d479677dc86b0aec android.hardware.neuralnetworks@1.3::types

c3fec5bd470984402997f78a74b6511efc4063b270f2bd9ee7b78f48b683a1bb android.hardware.neuralnetworks@1.3::IDevice

0fdfad62c2ec33b52e6687004e5a1971c02d10b93ee4d26df5ccff7ce032494a android.hardware.neuralnetworks@1.3::IPreparedModel

b40c13f9a9affc806c778c1f8c78e90d4acb50f1d6a6be185d933d7a04b91c5b android.hardware.sensors@1.0::ISensors

432086950205f5876da85dbd42004b0d0d05b429b9494b4f76a4d888758c5bd8 android.hardware.sensors@1.0::types

e8c86c69c438da8d1549856c1bb3e2d1b8da52722f8235ff49a30f2cce91742c android.hardware.soundtrigger@2.1::ISoundTriggerHwCallback

b9fbb6e2e061ed0960939d48b785e9700210add1f13ed32ecd688d0f1ca20ef7 android.hardware.renderscript@1.0::types

0f53d70e1eadf8d987766db4bf6ae2048004682168f4cab118da576787def3fa android.hardware.radio@1.0::types

sensors/1.0/ISensors.hal

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ interface ISensors { 
     * Flush adds a FLUSH_COMPLETE metadata event to the end of the "batch mode"

     * FIFO for the specified sensor and flushes the FIFO.  If the FIFO is empty

     * or if the sensor doesn't support batching (FIFO size zero), return

     * SUCCESS and add a trivial FLUSH_COMPLETE event added to the event stream.

     * OK and add a trivial FLUSH_COMPLETE event added to the event stream.

     * This applies to all sensors other than one-shot sensors. If the sensor

     * is a one-shot sensor, flush must return BAD_VALUE and not generate any

     * flush complete metadata.  If the sensor is not active at the time flush()

sensors/1.0/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ enum AdditionalInfoType : uint32_t { 


    /**

     * High performance mode hint. Device is able to use up more power and take

     * more reources to improve throughput and latency in high performance mode.

     * more resources to improve throughput and latency in high performance mode.

     * One possible use case is virtual reality, when sensor latency need to be

     * carefully controlled.

     * int32_t: 1 or 0, denote if device is in/out of high performance mode,

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ TEST_P(SensorsHidlTest, SensorListValid) { 
    });

}



// Test if sensor list returned is valid

// Test if sensor hal can switch to different operation modes

TEST_P(SensorsHidlTest, SetOperationMode) {

    std::vector<SensorInfo> sensorList = getSensorsList();
@@ -208,7 +208,7 @@ TEST_P(SensorsHidlTest, SetOperationMode) { 
    ASSERT_EQ(Result::OK, S()->setOperationMode(OperationMode::NORMAL));

}



// Test if sensor list returned is valid

// Test if sensor hal can receive injected events in loopback mode

TEST_P(SensorsHidlTest, InjectSensorEventData) {

    std::vector<SensorInfo> sensorList = getSensorsList();

    std::vector<SensorInfo> sensorSupportInjection;