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

Commit 0f2e483c authored by Vince Leung's avatar Vince Leung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b/178826612" into sc-dev 

* changes:
  Add getResonantFrequency and getQFactor methods
  idlcli: vibrator: Add get f0 and get Q APIs
parents af9b2ae5 dea802de

cmds/idlcli/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ cc_library { 
        "vibrator/CommandGetCompositionDelayMax.cpp",

        "vibrator/CommandGetCompositionSizeMax.cpp",

        "vibrator/CommandGetPrimitiveDuration.cpp",

        "vibrator/CommandGetQFactor.cpp",

        "vibrator/CommandGetResonantFrequency.cpp",

        "vibrator/CommandGetSupportedAlwaysOnEffects.cpp",

        "vibrator/CommandGetSupportedEffects.cpp",

        "vibrator/CommandGetSupportedPrimitives.cpp",

cmds/idlcli/vibrator/CommandGetQFactor.cpp

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "utils.h"

#include "vibrator.h"



namespace android {

namespace idlcli {



class CommandVibrator;



namespace vibrator {



class CommandGetQFactor : public Command {

    std::string getDescription() const override { return "Retrieves vibrator Q factor."; }



    std::string getUsageSummary() const override { return ""; }



    UsageDetails getUsageDetails() const override {

        UsageDetails details{};

        return details;

    }



    Status doArgs(Args &args) override {

        if (!args.empty()) {

            std::cerr << "Unexpected Arguments!" << std::endl;

            return USAGE;

        }

        return OK;

    }



    Status doMain(Args && /*args*/) override {

        std::string statusStr;

        float qFactor;

        Status ret;



        if (auto hal = getHal<aidl::IVibrator>()) {

            auto status = hal->call(&aidl::IVibrator::getQFactor, &qFactor);

            statusStr = status.getDescription();

            ret = status.isOk() ? OK : ERROR;

        } else {

            return UNAVAILABLE;

        }



        std::cout << "Status: " << statusStr << std::endl;

        std::cout << "Q Factor: " << qFactor << std::endl;



        return ret;

    }

};



static const auto Command =

    CommandRegistry<CommandVibrator>::Register<CommandGetQFactor>("getQFactor");



}  // namespace vibrator

}  // namespace idlcli

}  // namespace android

cmds/idlcli/vibrator/CommandGetResonantFrequency.cpp

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "utils.h"

#include "vibrator.h"



namespace android {

namespace idlcli {



class CommandVibrator;



namespace vibrator {



class CommandGetResonantFrequency : public Command {

    std::string getDescription() const override {

        return "Retrieves vibrator resonant frequency in Hz.";

    }



    std::string getUsageSummary() const override { return ""; }



    UsageDetails getUsageDetails() const override {

        UsageDetails details{};

        return details;

    }



    Status doArgs(Args &args) override {

        if (!args.empty()) {

            std::cerr << "Unexpected Arguments!" << std::endl;

            return USAGE;

        }

        return OK;

    }



    Status doMain(Args && /*args*/) override {

        std::string statusStr;

        float resonantFrequencyHz;

        Status ret;



        if (auto hal = getHal<aidl::IVibrator>()) {

            auto status = hal->call(&aidl::IVibrator::getResonantFrequency, &resonantFrequencyHz);

            statusStr = status.getDescription();

            ret = status.isOk() ? OK : ERROR;

        } else {

            return UNAVAILABLE;

        }



        std::cout << "Status: " << statusStr << std::endl;

        std::cout << "Resonant Frequency: " << resonantFrequencyHz << " Hz" << std::endl;



        return ret;

    }

};



static const auto Command = CommandRegistry<CommandVibrator>::Register<CommandGetResonantFrequency>(

    "getResonantFrequency");



}  // namespace vibrator

}  // namespace idlcli

}  // namespace android

services/vibratorservice/test/VibratorHalWrapperAidlTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ public: 
    MOCK_METHOD(Status, getSupportedAlwaysOnEffects, (std::vector<Effect> * ret), (override));

    MOCK_METHOD(Status, alwaysOnEnable, (int32_t id, Effect e, EffectStrength s), (override));

    MOCK_METHOD(Status, alwaysOnDisable, (int32_t id), (override));

    MOCK_METHOD(Status, getQFactor, (float * ret), (override));

    MOCK_METHOD(Status, getResonantFrequency, (float * ret), (override));

    MOCK_METHOD(int32_t, getInterfaceVersion, (), (override));

    MOCK_METHOD(std::string, getInterfaceHash, (), (override));

    MOCK_METHOD(IBinder*, onAsBinder, (), (override));

services/vibratorservice/test/VibratorManagerHalWrapperAidlTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public: 
    MOCK_METHOD(Status, getSupportedAlwaysOnEffects, (std::vector<Effect> * ret), (override));

    MOCK_METHOD(Status, alwaysOnEnable, (int32_t id, Effect e, EffectStrength s), (override));

    MOCK_METHOD(Status, alwaysOnDisable, (int32_t id), (override));

    MOCK_METHOD(Status, getQFactor, (float * ret), (override));

    MOCK_METHOD(Status, getResonantFrequency, (float * ret), (override));

    MOCK_METHOD(int32_t, getInterfaceVersion, (), (override));

    MOCK_METHOD(std::string, getInterfaceHash, (), (override));

    MOCK_METHOD(IBinder*, onAsBinder, (), (override));