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

Commit c4199eab authored by Hayden Gomes's avatar Hayden Gomes
Browse files

Adding a lshal command for abandoning focus 

Bug: 148098383
Test: adb shell lshal debug
    android.hardware.automotive.audiocontrol@2.0::IAudioControl/default
    --abandon 1 0
Change-Id: I4bec12ec3ae0fc6b73de8b823501f0f478d75d94
parent fa81977e

automotive/audiocontrol/2.0/default/AudioControl.cpp

+28 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ void AudioControl::cmdDump(int fd, const hidl_vec<hidl_string>& options) { 
        cmdHelp(fd);

    } else if (EqualsIgnoreCase(option, "--request")) {

        cmdRequestFocus(fd, options);

    } else if (EqualsIgnoreCase(option, "--abandon")) {

        cmdAbandonFocus(fd, options);

    } else {

        dprintf(fd, "Invalid option: %s\n", option.c_str());

    }
@@ -130,6 +132,9 @@ void AudioControl::cmdHelp(int fd) const { 
    dprintf(fd,

            "--request <USAGE> <ZONE_ID> <FOCUS_GAIN>: requests audio focus for specified "

            "usage (int), audio zone ID (int), and focus gain type (int)\n");

    dprintf(fd,

            "--abandon <USAGE> <ZONE_ID>: abandons audio focus for specified usage (int) and "

            "audio zone ID (int)\n");

}



void AudioControl::cmdRequestFocus(int fd, const hidl_vec<hidl_string>& options) {
@@ -161,6 +166,29 @@ void AudioControl::cmdRequestFocus(int fd, const hidl_vec<hidl_string>& options) 
            focusGain);

}



void AudioControl::cmdAbandonFocus(int fd, const hidl_vec<hidl_string>& options) {

    if (!checkCallerHasWritePermissions(fd) || !checkArgumentsSize(fd, options, 2)) return;



    hidl_bitfield<AudioUsage> usage;

    if (!safelyParseInt(options[1], &usage)) {

        dprintf(fd, "Non-integer usage provided with abandon: %s\n", options[1].c_str());

        return;

    }

    int zoneId;

    if (!safelyParseInt(options[2], &zoneId)) {

        dprintf(fd, "Non-integer zoneId provided with abandon: %s\n", options[2].c_str());

        return;

    }



    if (mFocusListener == nullptr) {

        dprintf(fd, "Unable to abandon focus - no focus listener registered\n");

        return;

    }



    mFocusListener->abandonAudioFocus(usage, zoneId);

    dprintf(fd, "Abandoned focus for usage %d and zoneId %d\n", usage, zoneId);

}



bool AudioControl::checkCallerHasWritePermissions(int fd) {

    // Double check that's only called by root - it should be be blocked at the HIDL debug() level,

    // but it doesn't hurt to make sure...

automotive/audiocontrol/2.0/default/AudioControl.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ class AudioControl : public IAudioControl { 
    void cmdDump(int fd, const hidl_vec<hidl_string>& options);

    void cmdHelp(int fd) const;

    void cmdRequestFocus(int fd, const hidl_vec<hidl_string>& options);

    void cmdAbandonFocus(int fd, const hidl_vec<hidl_string>& options);

    void dump(int fd);

};