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

Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev

Browse Source
This commit is contained in:
Amy Zhang
2020-06-05 02:49:54 +00:00
committed by Android (Google) Code Review
parent f3a7bc8e31 e151e60843
commit a7dc4defd3
6 changed files with 632 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/hdmi/HdmiClient.java
View File

@@ -1,6 +1,7 @@
package android.hardware.hdmi;
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.hardware.hdmi.HdmiControlManager.VendorCommandListener;
import android.os.RemoteException;
@@ -84,7 +85,8 @@ public abstract class HdmiClient {
* @param hasVendorId {@code true} if the command type will be <Vendor Command With ID>.
* {@code false} if the command will be <Vendor Command>
*/
public void sendVendorCommand(int targetAddress, byte[] params, boolean hasVendorId) {
public void sendVendorCommand(int targetAddress,
@SuppressLint("MissingNullability") byte[] params, boolean hasVendorId) {
try {
mService.sendVendorCommand(getDeviceType(), targetAddress, params, hasVendorId);
} catch (RemoteException e) {

27
core/java/android/hardware/hdmi/HdmiControlManager.java
View File

@@ -29,6 +29,7 @@ import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Binder;
@@ -57,6 +58,7 @@ import java.util.concurrent.Executor;
* @hide
*/
@SystemApi
@TestApi
@SystemService(Context.HDMI_CONTROL_SERVICE)
@RequiresFeature(PackageManager.FEATURE_HDMI_CEC)
public final class HdmiControlManager {
@@ -139,6 +141,8 @@ public final class HdmiControlManager {
public static final int POWER_STATUS_TRANSIENT_TO_ON = 2;
public static final int POWER_STATUS_TRANSIENT_TO_STANDBY = 3;
/** @hide */
@SystemApi
@IntDef ({
RESULT_SUCCESS,
RESULT_TIMEOUT,
@@ -400,8 +404,11 @@ public final class HdmiControlManager {
* See {@link HdmiDeviceInfo#DEVICE_PLAYBACK}
* See {@link HdmiDeviceInfo#DEVICE_TV}
* See {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM}
*
* @hide
*/
@Nullable
@SystemApi
@SuppressLint("Doclava125")
public HdmiClient getClient(int type) {
if (mService == null) {
@@ -430,8 +437,11 @@ public final class HdmiControlManager {
* system if the system is configured to host more than one type of HDMI-CEC logical devices.
*
* @return {@link HdmiPlaybackClient} instance. {@code null} on failure.
*
* @hide
*/
@Nullable
@SystemApi
@SuppressLint("Doclava125")
public HdmiPlaybackClient getPlaybackClient() {
return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);
@@ -445,8 +455,11 @@ public final class HdmiControlManager {
* system if the system is configured to host more than one type of HDMI-CEC logical devices.
*
* @return {@link HdmiTvClient} instance. {@code null} on failure.
*
* @hide
*/
@Nullable
@SystemApi
@SuppressLint("Doclava125")
public HdmiTvClient getTvClient() {
return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);
@@ -478,10 +491,8 @@ public final class HdmiControlManager {
* system if the system is configured to host more than one type of HDMI-CEC logical device.
*
* @return {@link HdmiSwitchClient} instance. {@code null} on failure.
* @hide
*/
@Nullable
@SystemApi
@SuppressLint("Doclava125")
public HdmiSwitchClient getSwitchClient() {
return (HdmiSwitchClient) getClient(HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH);
@@ -790,7 +801,10 @@ public final class HdmiControlManager {
/**
* Listener used to get hotplug event from HDMI port.
*
* @hide
*/
@SystemApi
public interface HotplugEventListener {
void onReceived(HdmiHotplugEvent event);
}
@@ -840,7 +854,10 @@ public final class HdmiControlManager {
/**
* Listener used to get vendor-specific commands.
*
* @hide
*/
@SystemApi
public interface VendorCommandListener {
/**
* Called when a vendor command is received.
@@ -879,7 +896,10 @@ public final class HdmiControlManager {
*
* @param listener {@link HotplugEventListener} instance
* @see HdmiControlManager#removeHotplugEventListener(HotplugEventListener)
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.HDMI_CEC)
public void addHotplugEventListener(HotplugEventListener listener) {
if (mService == null) {
@@ -903,7 +923,10 @@ public final class HdmiControlManager {
* Removes a listener to stop getting informed of {@link HdmiHotplugEvent}.
*
* @param listener {@link HotplugEventListener} instance to be removed
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.HDMI_CEC)
public void removeHotplugEventListener(HotplugEventListener listener) {
if (mService == null) {

469
core/java/android/hardware/hdmi/HdmiControlServiceWrapper.java Normal file
View File

@@ -0,0 +1,469 @@
/*
* Copyright 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 android.hardware.hdmi;
import android.annotation.BinderThread;
import android.annotation.NonNull;
import android.annotation.TestApi;
import java.util.List;
/**
* A wrapper of the Binder interface that clients running in the application process
* will use to perform HDMI-CEC features by communicating with other devices
* on the bus.
*
* @hide
*/
@TestApi
public final class HdmiControlServiceWrapper {
/** Pure CEC switch device type. */
public static final int DEVICE_PURE_CEC_SWITCH = HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH;
private List<HdmiPortInfo> mInfoList = null;
private int[] mTypes = null;
/**
* Create a new HdmiControlManager with the current HdmiControlService wrapper
*
* @return the created HdmiControlManager
*/
@NonNull
public HdmiControlManager createHdmiControlManager() {
return new HdmiControlManager(mInterface);
}
private final IHdmiControlService mInterface = new IHdmiControlService.Stub() {
@Override
public int[] getSupportedTypes() {
return HdmiControlServiceWrapper.this.getSupportedTypes();
}
@Override
public HdmiDeviceInfo getActiveSource() {
return HdmiControlServiceWrapper.this.getActiveSource();
}
@Override
public void oneTouchPlay(IHdmiControlCallback callback) {
HdmiControlServiceWrapper.this.oneTouchPlay(callback);
}
@Override
public void queryDisplayStatus(IHdmiControlCallback callback) {
HdmiControlServiceWrapper.this.queryDisplayStatus(callback);
}
@Override
public void addHdmiControlStatusChangeListener(IHdmiControlStatusChangeListener listener) {
HdmiControlServiceWrapper.this.addHdmiControlStatusChangeListener(listener);
}
@Override
public void removeHdmiControlStatusChangeListener(
IHdmiControlStatusChangeListener listener) {
HdmiControlServiceWrapper.this.removeHdmiControlStatusChangeListener(listener);
}
@Override
public void addHotplugEventListener(IHdmiHotplugEventListener listener) {
HdmiControlServiceWrapper.this.addHotplugEventListener(listener);
}
@Override
public void removeHotplugEventListener(IHdmiHotplugEventListener listener) {
HdmiControlServiceWrapper.this.removeHotplugEventListener(listener);
}
@Override
public void addDeviceEventListener(IHdmiDeviceEventListener listener) {
HdmiControlServiceWrapper.this.addDeviceEventListener(listener);
}
@Override
public void deviceSelect(int deviceId, IHdmiControlCallback callback) {
HdmiControlServiceWrapper.this.deviceSelect(deviceId, callback);
}
@Override
public void portSelect(int portId, IHdmiControlCallback callback) {
HdmiControlServiceWrapper.this.portSelect(portId, callback);
}
@Override
public void sendKeyEvent(int deviceType, int keyCode, boolean isPressed) {
HdmiControlServiceWrapper.this.sendKeyEvent(deviceType, keyCode, isPressed);
}
@Override
public void sendVolumeKeyEvent(int deviceType, int keyCode, boolean isPressed) {
HdmiControlServiceWrapper.this.sendVolumeKeyEvent(deviceType, keyCode, isPressed);
}
@Override
public List<HdmiPortInfo> getPortInfo() {
return HdmiControlServiceWrapper.this.getPortInfo();
}
@Override
public boolean canChangeSystemAudioMode() {
return HdmiControlServiceWrapper.this.canChangeSystemAudioMode();
}
@Override
public boolean getSystemAudioMode() {
return HdmiControlServiceWrapper.this.getSystemAudioMode();
}
@Override
public int getPhysicalAddress() {
return HdmiControlServiceWrapper.this.getPhysicalAddress();
}
@Override
public void setSystemAudioMode(boolean enabled, IHdmiControlCallback callback) {
HdmiControlServiceWrapper.this.setSystemAudioMode(enabled, callback);
}
@Override
public void addSystemAudioModeChangeListener(IHdmiSystemAudioModeChangeListener listener) {
HdmiControlServiceWrapper.this.addSystemAudioModeChangeListener(listener);
}
@Override
public void removeSystemAudioModeChangeListener(
IHdmiSystemAudioModeChangeListener listener) {
HdmiControlServiceWrapper.this.removeSystemAudioModeChangeListener(listener);
}
@Override
public void setArcMode(boolean enabled) {
HdmiControlServiceWrapper.this.setArcMode(enabled);
}
@Override
public void setProhibitMode(boolean enabled) {
HdmiControlServiceWrapper.this.setProhibitMode(enabled);
}
@Override
public void setSystemAudioVolume(int oldIndex, int newIndex, int maxIndex) {
HdmiControlServiceWrapper.this.setSystemAudioVolume(oldIndex, newIndex, maxIndex);
}
@Override
public void setSystemAudioMute(boolean mute) {
HdmiControlServiceWrapper.this.setSystemAudioMute(mute);
}
@Override
public void setInputChangeListener(IHdmiInputChangeListener listener) {
HdmiControlServiceWrapper.this.setInputChangeListener(listener);
}
@Override
public List<HdmiDeviceInfo> getInputDevices() {
return HdmiControlServiceWrapper.this.getInputDevices();
}
@Override
public List<HdmiDeviceInfo> getDeviceList() {
return HdmiControlServiceWrapper.this.getDeviceList();
}
@Override
public void powerOffRemoteDevice(int logicalAddress, int powerStatus) {
HdmiControlServiceWrapper.this.powerOffRemoteDevice(logicalAddress, powerStatus);
}
@Override
public void powerOnRemoteDevice(int logicalAddress, int powerStatus) {
HdmiControlServiceWrapper.this.powerOnRemoteDevice(logicalAddress, powerStatus);
}
@Override
public void askRemoteDeviceToBecomeActiveSource(int physicalAddress) {
HdmiControlServiceWrapper.this.askRemoteDeviceToBecomeActiveSource(physicalAddress);
}
@Override
public void sendVendorCommand(int deviceType, int targetAddress, byte[] params,
boolean hasVendorId) {
HdmiControlServiceWrapper.this.sendVendorCommand(
deviceType, targetAddress, params, hasVendorId);
}
@Override
public void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType) {
HdmiControlServiceWrapper.this.addVendorCommandListener(listener, deviceType);
}
@Override
public void sendStandby(int deviceType, int deviceId) {
HdmiControlServiceWrapper.this.sendStandby(deviceType, deviceId);
}
@Override
public void setHdmiRecordListener(IHdmiRecordListener callback) {
HdmiControlServiceWrapper.this.setHdmiRecordListener(callback);
}
@Override
public void startOneTouchRecord(int recorderAddress, byte[] recordSource) {
HdmiControlServiceWrapper.this.startOneTouchRecord(recorderAddress, recordSource);
}
@Override
public void stopOneTouchRecord(int recorderAddress) {
HdmiControlServiceWrapper.this.stopOneTouchRecord(recorderAddress);
}
@Override
public void startTimerRecording(int recorderAddress, int sourceType, byte[] recordSource) {
HdmiControlServiceWrapper.this.startTimerRecording(
recorderAddress, sourceType, recordSource);
}
@Override
public void clearTimerRecording(int recorderAddress, int sourceType, byte[] recordSource) {
HdmiControlServiceWrapper.this.clearTimerRecording(
recorderAddress, sourceType, recordSource);
}
@Override
public void sendMhlVendorCommand(int portId, int offset, int length, byte[] data) {
HdmiControlServiceWrapper.this.sendMhlVendorCommand(portId, offset, length, data);
}
@Override
public void addHdmiMhlVendorCommandListener(IHdmiMhlVendorCommandListener listener) {
HdmiControlServiceWrapper.this.addHdmiMhlVendorCommandListener(listener);
}
@Override
public void setStandbyMode(boolean isStandbyModeOn) {
HdmiControlServiceWrapper.this.setStandbyMode(isStandbyModeOn);
}
@Override
public void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {
HdmiControlServiceWrapper.this.setHdmiCecVolumeControlEnabled(
isHdmiCecVolumeControlEnabled);
}
@Override
public boolean isHdmiCecVolumeControlEnabled() {
return HdmiControlServiceWrapper.this.isHdmiCecVolumeControlEnabled();
}
@Override
public void reportAudioStatus(int deviceType, int volume, int maxVolume, boolean isMute) {
HdmiControlServiceWrapper.this.reportAudioStatus(deviceType, volume, maxVolume, isMute);
}
@Override
public void setSystemAudioModeOnForAudioOnlySource() {
HdmiControlServiceWrapper.this.setSystemAudioModeOnForAudioOnlySource();
}
@Override
public void addHdmiCecVolumeControlFeatureListener(
IHdmiCecVolumeControlFeatureListener listener) {
HdmiControlServiceWrapper.this.addHdmiCecVolumeControlFeatureListener(listener);
}
@Override
public void removeHdmiCecVolumeControlFeatureListener(
IHdmiCecVolumeControlFeatureListener listener) {
HdmiControlServiceWrapper.this.removeHdmiCecVolumeControlFeatureListener(listener);
}
};
@BinderThread
public void setPortInfo(@NonNull List<HdmiPortInfo> infoList) {
mInfoList = infoList;
}
@BinderThread
public void setDeviceTypes(@NonNull int[] types) {
mTypes = types;
}
/** @hide */
public List<HdmiPortInfo> getPortInfo() {
return mInfoList;
}
/** @hide */
public int[] getSupportedTypes() {
return mTypes;
}
/** @hide */
public HdmiDeviceInfo getActiveSource() {
return null;
}
/** @hide */
public void oneTouchPlay(IHdmiControlCallback callback) {}
/** @hide */
public void queryDisplayStatus(IHdmiControlCallback callback) {}
/** @hide */
public void addHdmiControlStatusChangeListener(IHdmiControlStatusChangeListener listener) {}
/** @hide */
public void removeHdmiControlStatusChangeListener(IHdmiControlStatusChangeListener listener) {}
/** @hide */
public void addHotplugEventListener(IHdmiHotplugEventListener listener) {}
/** @hide */
public void removeHotplugEventListener(IHdmiHotplugEventListener listener) {}
/** @hide */
public void addDeviceEventListener(IHdmiDeviceEventListener listener) {}
/** @hide */
public void deviceSelect(int deviceId, IHdmiControlCallback callback) {}
/** @hide */
public void portSelect(int portId, IHdmiControlCallback callback) {}
/** @hide */
public void sendKeyEvent(int deviceType, int keyCode, boolean isPressed) {}
/** @hide */
public void sendVolumeKeyEvent(int deviceType, int keyCode, boolean isPressed) {}
/** @hide */
public boolean canChangeSystemAudioMode() {
return true;
}
/** @hide */
public boolean getSystemAudioMode() {
return true;
}
/** @hide */
public int getPhysicalAddress() {
return 0xffff;
}
/** @hide */
public void setSystemAudioMode(boolean enabled, IHdmiControlCallback callback) {}
/** @hide */
public void addSystemAudioModeChangeListener(IHdmiSystemAudioModeChangeListener listener) {}
/** @hide */
public void removeSystemAudioModeChangeListener(IHdmiSystemAudioModeChangeListener listener) {}
/** @hide */
public void setArcMode(boolean enabled) {}
/** @hide */
public void setProhibitMode(boolean enabled) {}
/** @hide */
public void setSystemAudioVolume(int oldIndex, int newIndex, int maxIndex) {}
/** @hide */
public void setSystemAudioMute(boolean mute) {}
/** @hide */
public void setInputChangeListener(IHdmiInputChangeListener listener) {}
/** @hide */
public List<HdmiDeviceInfo> getInputDevices() {
return null;
}
/** @hide */
public List<HdmiDeviceInfo> getDeviceList() {
return null;
}
/** @hide */
public void powerOffRemoteDevice(int logicalAddress, int powerStatus) {}
/** @hide */
public void powerOnRemoteDevice(int logicalAddress, int powerStatus) {}
/** @hide */
public void askRemoteDeviceToBecomeActiveSource(int physicalAddress) {}
/** @hide */
public void sendVendorCommand(int deviceType, int targetAddress, byte[] params,
boolean hasVendorId) {}
/** @hide */
public void addVendorCommandListener(IHdmiVendorCommandListener listener, int deviceType) {}
/** @hide */
public void sendStandby(int deviceType, int deviceId) {}
/** @hide */
public void setHdmiRecordListener(IHdmiRecordListener callback) {}
/** @hide */
public void startOneTouchRecord(int recorderAddress, byte[] recordSource) {}
/** @hide */
public void stopOneTouchRecord(int recorderAddress) {}
/** @hide */
public void startTimerRecording(int recorderAddress, int sourceType, byte[] recordSource) {}
/** @hide */
public void clearTimerRecording(int recorderAddress, int sourceType, byte[] recordSource) {}
/** @hide */
public void sendMhlVendorCommand(int portId, int offset, int length, byte[] data) {}
/** @hide */
public void addHdmiMhlVendorCommandListener(IHdmiMhlVendorCommandListener listener) {}
/** @hide */
public void setStandbyMode(boolean isStandbyModeOn) {}
/** @hide */
public void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {}
/** @hide */
public boolean isHdmiCecVolumeControlEnabled() {
return true;
}
/** @hide */
public void reportAudioStatus(int deviceType, int volume, int maxVolume, boolean isMute) {}
/** @hide */
public void setSystemAudioModeOnForAudioOnlySource() {}
/** @hide */
public void addHdmiCecVolumeControlFeatureListener(
IHdmiCecVolumeControlFeatureListener listener) {}
/** @hide */
public void removeHdmiCecVolumeControlFeatureListener(
IHdmiCecVolumeControlFeatureListener listener) {}
}

9
core/java/android/hardware/hdmi/HdmiPortInfo.java
View File

@@ -18,6 +18,7 @@ package android.hardware.hdmi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -28,6 +29,7 @@ import android.os.Parcelable;
* @hide
*/
@SystemApi
@TestApi
public final class HdmiPortInfo implements Parcelable {
/** HDMI port type: Input */
public static final int PORT_INPUT = 0;
@@ -153,7 +155,9 @@ public final class HdmiPortInfo implements Parcelable {
* @param dest The Parcel in which the object should be written.
* @param flags Additional flags about how the object should be written.
* May be 0 or {@link Parcelable#PARCELABLE_WRITE_RETURN_VALUE}.
* @hide
*/
@SystemApi
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mId);
@@ -187,4 +191,9 @@ public final class HdmiPortInfo implements Parcelable {
&& mCecSupported == other.mCecSupported && mArcSupported == other.mArcSupported
&& mMhlSupported == other.mMhlSupported;
}
@Override
public int hashCode() {
return mId;
}
}

5
core/java/android/hardware/hdmi/HdmiSwitchClient.java
View File

@@ -18,6 +18,7 @@ package android.hardware.hdmi;
import android.annotation.CallbackExecutor;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.hardware.hdmi.HdmiControlManager.ControlCallbackResult;
import android.os.Binder;
import android.os.RemoteException;
@@ -38,6 +39,7 @@ import java.util.concurrent.Executor;
* @hide
*/
@SystemApi
@TestApi
public class HdmiSwitchClient extends HdmiClient {
private static final String TAG = "HdmiSwitchClient";
@@ -187,11 +189,8 @@ public class HdmiSwitchClient extends HdmiClient {
* <p>This returns an empty list when the current device does not have HDMI input.
*
* @return a list of {@link HdmiPortInfo}
*
* @hide
*/
@NonNull
@SystemApi
public List<HdmiPortInfo> getPortInfo() {
try {
return mService.getPortInfo();