commit a54bc99ba95357936e2492c0fdf0e06ca03391dc
author Oscar Azucena <oscarazu@google.com> Thu Apr 15 20:39:48 2021 -0700
committer Oscar Azucena <oscarazu@google.com> Fri Apr 16 15:15:18 2021 -0700
tree cae10647cda59acddf1122a578a7156dd38445d6
parent 77e8b406141d504baf4dcee9c20f1dd7ee21e9c8

Added car shell command to control group volume

Command takes in a zoneId, groupId, and volume as input. The volume
input must be between 0 and 100. This represents the percent value of
the volume.

Bug: 173141906
Bug: 185422841
Test: adb shell cmd car_service set-group-volume 0 1 50
  and verify volume changes to 50% for group 1 in zone 0.
Change-Id: Ied039bfe7dbf9b3b2691441008b5bf7a17a41b9e

service/src/com/android/car/CarShellCommand.java

diff --git a/service/src/com/android/car/CarShellCommand.java b/service/src/com/android/car/CarShellCommand.java
index d2d765d..ffa071e 100644
--- a/service/src/com/android/car/CarShellCommand.java
+++ b/service/src/com/android/car/CarShellCommand.java
@@ -98,6 +98,7 @@
 import com.android.car.power.CarPowerManagementService;
 import com.android.car.systeminterface.SystemInterface;
 import com.android.car.user.CarUserService;
+import com.android.internal.util.Preconditions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -132,6 +133,7 @@
     private static final String COMMAND_SET_UID_TO_ZONE = "set-audio-zone-for-uid";
     private static final String COMMAND_RESET_VOLUME_CONTEXT = "reset-selected-volume-context";
     private static final String COMMAND_SET_MUTE_CAR_VOLUME_GROUP = "set-mute-car-volume-group";
+    private static final String COMMAND_SET_GROUP_VOLUME = "set-group-volume";
     private static final String COMMAND_START_FIXED_ACTIVITY_MODE = "start-fixed-activity-mode";
     private static final String COMMAND_STOP_FIXED_ACTIVITY_MODE = "stop-fixed-activity-mode";
     private static final String COMMAND_ENABLE_FEATURE = "enable-feature";
@@ -232,6 +234,8 @@
                 PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
         USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_SET_MUTE_CAR_VOLUME_GROUP,
                 PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
+        USER_BUILD_COMMAND_TO_PERMISSION_MAP.put(COMMAND_SET_GROUP_VOLUME,
+                PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
     }
 
     private static final String PARAM_DAY_MODE = "day";
@@ -434,6 +438,9 @@
         pw.printf("\t%s [zoneId] [groupId] [%s\\%s]\n", COMMAND_SET_MUTE_CAR_VOLUME_GROUP,
                 PARAM_MUTE, PARAM_UNMUTE);
         pw.printf("\t  %s\\%s groupId in zoneId\n", PARAM_MUTE, PARAM_UNMUTE);
+        pw.printf("\t%s [zoneId] [groupId] [volume]\n", COMMAND_SET_GROUP_VOLUME);
+        pw.println("\t  sets the group volume for [groupId] in [zoneId] to %volume,");
+        pw.println("\t  [volume] must be an integer between 0 to 100");
         pw.println("\tstart-fixed-activity displayId packageName activityName");
         pw.println("\t  Start an Activity the specified display as fixed mode");
         pw.println("\tstop-fixed-mode displayId");
@@ -574,6 +581,20 @@
         mCarAudioService.setVolumeGroupMute(zoneId, groupId, muteState, FLAG_SHOW_UI);
     }
 
+
+    private void runSetGroupVolume(String zoneIdString, String groupIdString, String volumeString) {
+        int groupId = Integer.parseInt(groupIdString);
+        int zoneId = Integer.parseInt(zoneIdString);
+        int percentVolume = Integer.parseInt(volumeString);
+        Preconditions.checkArgumentInRange(percentVolume, 0, 100,
+                "%volume for group " + groupIdString + " in zone " + zoneIdString);
+        int minIndex = mCarAudioService.getGroupMinVolume(zoneId, groupId);
+        int maxIndex = mCarAudioService.getGroupMaxVolume(zoneId, groupId);
+        int index = minIndex
+                + (int) ((float) (maxIndex - minIndex) * ((float) percentVolume / 100.0f));
+        mCarAudioService.setGroupVolume(zoneId, groupId, index, FLAG_SHOW_UI);
+    }
+
     private void runResetSelectedVolumeContext() {
         mCarAudioService.resetSelectedVolumeContext();
     }
@@ -750,6 +771,12 @@
                 }
                 runSetMuteCarVolumeGroup(args[1], args[2], args[3]);
                 break;
+            case COMMAND_SET_GROUP_VOLUME:
+                if (args.length != 4) {
+                    return showInvalidArguments(writer);
+                }
+                runSetGroupVolume(args[1], args[2], args[3]);
+                break;
             case COMMAND_SET_USER_ID_TO_OCCUPANT_ZONE:
                 if (args.length != 3) {
                     return showInvalidArguments(writer);