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

Commit 48ea7213 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "vibrator vts: use CompositePrimitives enum_range" am: d895913f am: 8679c62c 

Change-Id: I0ebc9c9add8bb89406fe0e9890ed688c7e8eb3f5
parents bb395c0e 8679c62c

vibrator/aidl/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "VtsHalVibratorTargetTest"

    }

  ]

}

vibrator/aidl/vts/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ cc_test { 
        "android.hardware.vibrator-cpp",

    ],

    test_suites: [

        "general-tests",

        "vts-core",

    ],

}

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+3 −8
Original line number Diff line number Diff line
@@ -49,14 +49,9 @@ const std::vector<EffectStrength> kInvalidEffectStrengths = { 
        static_cast<EffectStrength>(static_cast<int8_t>(kEffectStrengths.back()) + 1),

};



// TODO(b/143992652): autogenerate

const std::vector<CompositePrimitive> kCompositePrimitives = {

        CompositePrimitive::NOOP,       CompositePrimitive::CLICK,

        CompositePrimitive::THUD,       CompositePrimitive::SPIN,

        CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE,

        CompositePrimitive::QUICK_FALL,

};

// TODO(b/143992652): autogenerate

const std::vector<CompositePrimitive> kCompositePrimitives{

        android::enum_range<CompositePrimitive>().begin(),

        android::enum_range<CompositePrimitive>().end()};



const std::vector<CompositePrimitive> kInvalidPrimitives = {

        static_cast<CompositePrimitive>(static_cast<int32_t>(kCompositePrimitives.front()) - 1),