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

Commit a244321f authored by Harpreet "Eli" Sangha's avatar Harpreet "Eli" Sangha
Browse files

vibrator: example: Fix out-of-scope memory access. 



Bug: 129091875
Test: VTS
Change-Id: I64685e6e8982db1a33c8322e1df7d266fa367eaf
Signed-off-by: default avatarHarpreet "Eli" Sangha <eliptus@google.com>
parent 7b277acb

vibrator/1.3/example/Vibrator.cpp

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Return<void> Vibrator::perform_1_3(Effect effect, EffectStrength strength, perfo 
    uint32_t ms;

    Status status;



    ALOGI("Perform: Effect %s\n", effectToName(effect));

    ALOGI("Perform: Effect %s\n", effectToName(effect).c_str());



    amplitude = strengthToAmplitude(strength);

    setAmplitude(amplitude);
@@ -178,8 +178,8 @@ void Vibrator::timerCallback(union sigval sigval) { 
    static_cast<Vibrator*>(sigval.sival_ptr)->timeout();

}



const char* Vibrator::effectToName(Effect effect) {

    return toString(effect).c_str();

const std::string Vibrator::effectToName(Effect effect) {

    return toString(effect);

}



uint32_t Vibrator::effectToMs(Effect effect) {

vibrator/1.3/example/Vibrator.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class Vibrator : public IVibrator { 
    void timeout();



    static void timerCallback(union sigval sigval);

    static const char* effectToName(Effect effect);

    static const std::string effectToName(Effect effect);

    static uint32_t effectToMs(Effect effect);

    static uint8_t strengthToAmplitude(EffectStrength strength);