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

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

Merge changes from topic "update_sensors_hal" 

* changes:
  Add VTS tests for Sensors HAL 2.1
  Add Hinge Angle Sensor to default impl for HAL 2.1
  Add default impl of Sensors HAL 2.1
  Create wrapper for 2.0/2.1 sensor HALs
  Add Sensors HAL 2.1
parents 69202c35 a9a5eb41

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ 
    <hal format="hidl" optional="true">

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <version>2.0</version>

        <version>2.0-1</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

current.txt

+3 −0
Original line number Diff line number Diff line
@@ -695,6 +695,9 @@ dcc8872337f0135e81970e1d8d5fd7139160dc80e9be76f0ae05290fa7e472b8 android.hardwar 
a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig

742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication

0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse

3ca6616381080bdd6c08141ad12775a94ae868c58b02b1274ae3326f7de724ab android.hardware.sensors@2.1::ISensors

3d4141c6373cd9ca02fe221a7d12343840de2255d032c38248fe8e35816b58b2 android.hardware.sensors@2.1::ISensorsCallback

8051cc50fc90ed447f058a8b15d81f35a65f1bd9004b1de4f127edeb89b47978 android.hardware.sensors@2.1::types

4a6517ea4ad807855428b0101d8e1a486497bd88ab4300ba3b2be43d46d32580 android.hardware.soundtrigger@2.3::types

b37f78e3fdc79af8b32a545b2b426f1fd1355b359d9e7835f3bf1ed0aa4518d8 android.hardware.soundtrigger@2.3::ISoundTriggerHw

7746fda1fbf9c7c132bae701cc5a161309e4f5e7f3e8065811045975ee86196d android.hardware.usb.gadget@1.1::IUsbGadget

sensors/1.0/vts/functional/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_test { 
    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "SensorsHidlEnvironmentV1_0.cpp",

        "VtsHalSensorsV1_0TargetTest.cpp"

        "VtsHalSensorsV1_0TargetTest.cpp",

    ],

    static_libs: [

        "android.hardware.graphics.allocator@2.0",
@@ -31,6 +31,8 @@ cc_test { 
        "android.hardware.sensors@1.0",

        "VtsHalSensorsTargetTestUtils",

    ],

    test_suites: ["general-tests", "vts-core"],

    test_suites: [

        "general-tests",

        "vts-core",

    ],

}

sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
using ::android::sp;



class SensorsHidlTest;

class SensorsHidlEnvironmentV1_0 : public SensorsHidlEnvironmentBase {

class SensorsHidlEnvironmentV1_0

    : public SensorsHidlEnvironmentBase<::android::hardware::sensors::V1_0::Event> {

  public:

    using Event = ::android::hardware::sensors::V1_0::Event;

    SensorsHidlEnvironmentV1_0(const std::string& service_name)

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+29 −30
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ using ::android::sp; 
using namespace ::android::hardware::sensors::V1_0;



// The main test class for SENSORS HIDL HAL.



class SensorsHidlTest : public SensorsHidlTestBase {

class SensorsHidlTest : public SensorsHidlTestBase<SensorType, Event, SensorInfo> {

  public:

    virtual void SetUp() override {

        mEnvironment = new SensorsHidlEnvironmentV1_0(GetParam());
@@ -80,7 +79,7 @@ class SensorsHidlTest : public SensorsHidlTestBase { 


    inline sp<ISensors>& S() { return mEnvironment->sensors; }



    SensorsHidlEnvironmentBase* getEnvironment() override { return mEnvironment; }

    SensorsHidlEnvironmentBase<Event>* getEnvironment() override { return mEnvironment; }



  private:

    // Test environment for sensors HAL.
@@ -257,55 +256,55 @@ TEST_P(SensorsHidlTest, InjectSensorEventData) { 
// Test if sensor hal can do UI speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationSlow) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do normal speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationNormal) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do game speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationFast) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do UI speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationSlow) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do normal speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationNormal) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do game speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationFast) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do UI speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationSlow) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do normal speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationNormal) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do game speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationFast) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do accelerometer sampling rate switch properly when sensor is active
@@ -344,109 +343,109 @@ TEST_P(SensorsHidlTest, MagnetometerBatchingOperation) { 
// Test sensor event direct report with ashmem for accel sensor at normal rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with ashmem for accel sensor at fast rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM, RateLevel::FAST,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with ashmem for accel sensor at very fast rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM,

                              RateLevel::VERY_FAST, sAccelNormChecker);

                              RateLevel::VERY_FAST, mAccelNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at normal rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at fast rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at very fast rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::VERY_FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for mag sensor at normal rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with ashmem for mag sensor at fast rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM, RateLevel::FAST,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with ashmem for mag sensor at very fast rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM,

                              RateLevel::VERY_FAST, NullChecker());

                              RateLevel::VERY_FAST, NullChecker<Event>());

}



// Test sensor event direct report with gralloc for accel sensor at normal rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with gralloc for accel sensor at fast rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC, RateLevel::FAST,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with gralloc for accel sensor at very fast rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC,

                              RateLevel::VERY_FAST, sAccelNormChecker);

                              RateLevel::VERY_FAST, mAccelNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at normal rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at fast rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at very fast rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::VERY_FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for mag sensor at normal rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with gralloc for mag sensor at fast rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC, RateLevel::FAST,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with gralloc for mag sensor at very fast rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC,

                              RateLevel::VERY_FAST, NullChecker());

                              RateLevel::VERY_FAST, NullChecker<Event>());

}



INSTANTIATE_TEST_SUITE_P(