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

Commit 8bcb4923 authored by Changyeon Jo's avatar Changyeon Jo
Browse files

Use regex names for EVS HAL implementations 



This change deprecates EvsEnumeratorHw, which has been a name for
EVS HAL Enumerator implementations, and uses regex names for them.

New method, isHardware(), is added to IEvsEnumerator and the clients
should use this method to tell whether current service is EVS manager
or driver.

Bug: 147010694
Test: m -j
Test: atest VtsHalEvsV1_1TargetTest
Change-Id: I89441936734fde0f0cc2f0151ee9b6622f61814d
Signed-off-by: default avatarChangyeon Jo <changyeon@google.com>
parent e4167444

automotive/evs/1.1/IEvsEnumerator.hal

+7 −0
Original line number Diff line number Diff line
@@ -47,4 +47,11 @@ interface IEvsEnumerator extends @1.0::IEvsEnumerator { 
     *                   configured differently by another client.

     */

    openCamera_1_1(string cameraId, Stream streamCfg) generates (IEvsCamera evsCamera);



    /**

     * Tells whether this is EVS manager or HAL implementation.

     *

     * @return result False for EVS manager implementations and true for all others.

     */

    isHardware() generates (bool result);

};

automotive/evs/1.1/default/EvsEnumerator.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public: 
    Return<void> getCameraList_1_1(getCameraList_1_1_cb _hidl_cb)  override;

    Return<sp<IEvsCamera_1_1>>  openCamera_1_1(const hidl_string& cameraId,

                                               const Stream& streamCfg) override;

    Return<bool> isHardware() override { return true; }



    // Implementation details

    EvsEnumerator();

automotive/evs/1.1/default/ServiceNames.h

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
 * limitations under the License.

 */



const static char kEnumeratorServiceName[] = "EvsEnumeratorHw";
 
const static char kEnumeratorServiceName[] = "hw/0";

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public: 
        pEnumerator = getService<IEvsEnumerator>(service_name);

        ASSERT_NE(pEnumerator.get(), nullptr);



        mIsHwModule = !service_name.compare(kEnumeratorName);

        mIsHwModule = pEnumerator->isHardware();

    }



    virtual void TearDown() override {

compatibility_matrices/compatibility_matrix.current.xml

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
        <interface>

            <name>IEvsEnumerator</name>

            <instance>default</instance>

            <regex-instance>[a-z]+/[0-9]+</regex-instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">