From 39b22fbcad2e859c0c5489e8e2c4626ea8bd2a8c Mon Sep 17 00:00:00 2001 From: Marvin Ramin Date: Fri, 13 Nov 2020 12:59:58 +0100 Subject: [PATCH] Implement ADB command for OTP adb shell cmd hdmi_control otp will launch HDMI-CEC feature "One Touch Play". This equals a call to HdmiPlaybackClient#oneTouchPlay(..). Bug: 173182293 Test: adb shell cmd hdmi_control otp; verify with cec-client Change-Id: Ie9b71083718521c9cac9d7b341a47ae223f373b2 --- .../server/hdmi/HdmiControlService.java | 12 ++ .../server/hdmi/HdmiControlShellCommand.java | 107 ++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 services/core/java/com/android/server/hdmi/HdmiControlShellCommand.java diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index e2145f077a903..8e50bb4885d85 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -66,6 +66,8 @@ import android.os.Looper; import android.os.PowerManager; import android.os.RemoteCallbackList; import android.os.RemoteException; +import android.os.ResultReceiver; +import android.os.ShellCallback; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; @@ -2290,6 +2292,16 @@ public class HdmiControlService extends SystemService { }); } + @Override + public void onShellCommand(@Nullable FileDescriptor in, @Nullable FileDescriptor out, + @Nullable FileDescriptor err, String[] args, + @Nullable ShellCallback callback, ResultReceiver resultReceiver) + throws RemoteException { + enforceAccessPermission(); + new HdmiControlShellCommand(this) + .exec(this, in, out, err, args, callback, resultReceiver); + } + @Override protected void dump(FileDescriptor fd, final PrintWriter writer, String[] args) { if (!DumpUtils.checkDumpPermission(getContext(), TAG, writer)) return; diff --git a/services/core/java/com/android/server/hdmi/HdmiControlShellCommand.java b/services/core/java/com/android/server/hdmi/HdmiControlShellCommand.java new file mode 100644 index 0000000000000..bccb158d8e95c --- /dev/null +++ b/services/core/java/com/android/server/hdmi/HdmiControlShellCommand.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.hdmi; + + +import android.hardware.hdmi.HdmiControlManager; +import android.hardware.hdmi.IHdmiControlCallback; +import android.hardware.hdmi.IHdmiControlService; +import android.os.RemoteException; +import android.os.ShellCommand; +import android.util.Slog; + +import java.io.PrintWriter; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +final class HdmiControlShellCommand extends ShellCommand { + + private static final String TAG = "HdmiShellCommand"; + + private final IHdmiControlService.Stub mBinderService; + + + HdmiControlShellCommand(IHdmiControlService.Stub binderService) { + mBinderService = binderService; + } + + @Override + public int onCommand(String cmd) { + if (cmd == null) { + return handleDefaultCommands(cmd); + } + + try { + return handleShellCommand(cmd); + } catch (Exception e) { + getErrPrintWriter().println( + "Caught error for command '" + cmd + "': " + e.getMessage()); + Slog.e(TAG, "Error handling hdmi_control shell command: " + cmd, e); + return 1; + } + } + + @Override + public void onHelp() { + PrintWriter pw = getOutPrintWriter(); + + pw.println("HdmiControlManager (hdmi_control) commands:"); + pw.println(" help"); + pw.println(" Print this help text."); + pw.println(" onetouchplay, otp"); + pw.println(" Send the \"One Touch Play\" feature from a source to the TV"); + } + + private int handleShellCommand(String cmd) throws RemoteException { + PrintWriter pw = getOutPrintWriter(); + + switch (cmd) { + case "otp": + case "onetouchplay": + return oneTouchPlay(pw); + } + + getErrPrintWriter().println("Unhandled command: " + cmd); + return 1; + } + + private int oneTouchPlay(PrintWriter pw) throws RemoteException { + final CountDownLatch latch = new CountDownLatch(1); + AtomicInteger cecResult = new AtomicInteger(); + pw.print("Sending One Touch Play..."); + mBinderService.oneTouchPlay(new IHdmiControlCallback.Stub() { + @Override + public void onComplete(int result) { + pw.println(" done (" + result + ")"); + latch.countDown(); + cecResult.set(result); + } + }); + + try { + if (!latch.await(HdmiConfig.TIMEOUT_MS, TimeUnit.MILLISECONDS)) { + getErrPrintWriter().println("One Touch Play timed out."); + return 1; + } + } catch (InterruptedException e) { + getErrPrintWriter().println("Caught InterruptedException"); + Thread.currentThread().interrupt(); + } + return cecResult.get() == HdmiControlManager.RESULT_SUCCESS ? 0 : 1; + } +}