commit c4199eabf83bacc608c188a30d009b7ff7396360
author Hayden Gomes <haydengomes@google.com> Thu Apr 02 14:29:00 2020 -0700
committer Hayden Gomes <haydengomes@google.com> Thu Apr 09 16:13:11 2020 -0700
tree 13052dc372a56137861c109aa74efff5178a09ee
parent fa81977e1a072a42fcdfd1515eee0a13cdd59f43

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

automotive/audiocontrol/2.0/default/AudioControl.cpp

diff --git a/automotive/audiocontrol/2.0/default/AudioControl.cpp b/automotive/audiocontrol/2.0/default/AudioControl.cpp
index 7a121f5..5bde839 100644
--- a/automotive/audiocontrol/2.0/default/AudioControl.cpp
+++ b/automotive/audiocontrol/2.0/default/AudioControl.cpp
@@ -110,6 +110,8 @@
         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 @@
     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 @@
             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

diff --git a/automotive/audiocontrol/2.0/default/AudioControl.h b/automotive/audiocontrol/2.0/default/AudioControl.h
index 1cd7cbc..d66458e 100644
--- a/automotive/audiocontrol/2.0/default/AudioControl.h
+++ b/automotive/audiocontrol/2.0/default/AudioControl.h
@@ -51,6 +51,7 @@
     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);
 };