Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb am: 8ecef70ef9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095

Change-Id: Id7a880e757b78f22dd4987d38aef00a6ad6051c7
This commit is contained in:
Marvin Ramin
2021-03-31 12:45:35 +00:00
committed by Automerger Merge Worker
parent 5f763baa38 8ecef70ef9
commit 10331099c0
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/hdmi/HdmiControlShellCommand.java
View File

@@ -84,6 +84,8 @@ final class HdmiControlShellCommand extends ShellCommand {
pw.println(" --args <vendor specific arguments>"); pw.println(" --args <vendor specific arguments>");
pw.println(" [--id <true if vendor command should be sent with vendor id>]"); pw.println(" [--id <true if vendor command should be sent with vendor id>]");
pw.println(" Send a Vendor Command to the given target device"); pw.println(" Send a Vendor Command to the given target device");
pw.println(" setsystemaudiomode, setsam [on|off]");
pw.println(" Sets the System Audio Mode feature on or off on TV devices");
} }
private int handleShellCommand(String cmd) throws RemoteException { private int handleShellCommand(String cmd) throws RemoteException {
@@ -95,6 +97,9 @@ final class HdmiControlShellCommand extends ShellCommand {
return oneTouchPlay(pw); return oneTouchPlay(pw);
case "vendorcommand": case "vendorcommand":
return vendorCommand(pw); return vendorCommand(pw);
case "setsystemaudiomode":
case "setsam":
return setSystemAudioMode(pw);
} }
getErrPrintWriter().println("Unhandled command: " + cmd); getErrPrintWriter().println("Unhandled command: " + cmd);
@@ -158,6 +163,31 @@ final class HdmiControlShellCommand extends ShellCommand {
return 0; return 0;
} }
private int setSystemAudioMode(PrintWriter pw) throws RemoteException {
if (1 > getRemainingArgsCount()) {
throw new IllegalArgumentException(
"Please indicate if System Audio Mode should be turned \"on\" or \"off\".");
}
String arg = getNextArg();
if (arg.equals("on")) {
pw.println("Setting System Audio Mode on");
mBinderService.setSystemAudioMode(true, mHdmiControlCallback);
} else if (arg.equals("off")) {
pw.println("Setting System Audio Mode off");
mBinderService.setSystemAudioMode(false, mHdmiControlCallback);
} else {
throw new IllegalArgumentException(
"Please indicate if System Audio Mode should be turned \"on\" or \"off\".");
}
if (!receiveCallback("Set System Audio Mode")) {
return 1;
}
return mCecResult.get() == HdmiControlManager.RESULT_SUCCESS ? 0 : 1;
}
private boolean receiveCallback(String command) { private boolean receiveCallback(String command) {
try { try {
if (!mLatch.await(HdmiConfig.TIMEOUT_MS, TimeUnit.MILLISECONDS)) { if (!mLatch.await(HdmiConfig.TIMEOUT_MS, TimeUnit.MILLISECONDS)) {