Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.
BUG: 16215362
Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
diff --git a/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java b/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java
index 8617952..cb92112 100644
--- a/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java
+++ b/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java
@@ -18,7 +18,7 @@
import android.annotation.Nullable;
import android.hardware.hdmi.IHdmiControlCallback;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.os.RemoteException;
import android.util.Slog;
@@ -66,7 +66,7 @@
invokeCallback(HdmiControlManager.RESULT_SUCCESS);
return;
}
- HdmiCecDeviceInfo device = mService.getDeviceInfo(newActive.logicalAddress);
+ HdmiDeviceInfo device = mService.getDeviceInfo(newActive.logicalAddress);
if (device == null) {
tv.startNewDeviceAction(newActive);
}
diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java
index 7b917e8..0b57474 100644
--- a/services/core/java/com/android/server/hdmi/Constants.java
+++ b/services/core/java/com/android/server/hdmi/Constants.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
/**
* Defines constants related to HDMI-CEC protocol internal implementation.
@@ -80,7 +80,7 @@
public static final int ADDR_INVALID = -1;
/** Logical address used to indicate the source comes from internal device. */
- public static final int ADDR_INTERNAL = HdmiCecDeviceInfo.ADDR_INTERNAL;
+ public static final int ADDR_INTERNAL = HdmiDeviceInfo.ADDR_INTERNAL;
static final int MESSAGE_FEATURE_ABORT = 0x00;
static final int MESSAGE_IMAGE_VIEW_ON = 0x04;
@@ -178,8 +178,8 @@
static final int ROUTING_PATH_TOP_MASK = 0xF000;
static final int ROUTING_PATH_TOP_SHIFT = 12;
- static final int INVALID_PORT_ID = HdmiCecDeviceInfo.PORT_INVALID;
- static final int INVALID_PHYSICAL_ADDRESS = HdmiCecDeviceInfo.PATH_INVALID;
+ static final int INVALID_PORT_ID = HdmiDeviceInfo.PORT_INVALID;
+ static final int INVALID_PHYSICAL_ADDRESS = HdmiDeviceInfo.PATH_INVALID;
// Send result codes. It should be consistent with hdmi_cec.h's send_message error code.
static final int SEND_RESULT_SUCCESS = 0;
diff --git a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java
index 86e14e1..924d7aa 100644
--- a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java
+++ b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import com.android.internal.util.Preconditions;
@@ -60,7 +60,7 @@
*
* @param deviceInfos a list of all non-local devices. It can be empty list.
*/
- void onDeviceDiscoveryDone(List<HdmiCecDeviceInfo> deviceInfos);
+ void onDeviceDiscoveryDone(List<HdmiDeviceInfo> deviceInfos);
}
// An internal container used to keep track of device information during
@@ -72,14 +72,14 @@
private int mPortId = Constants.INVALID_PORT_ID;
private int mVendorId = Constants.UNKNOWN_VENDOR_ID;
private String mDisplayName = "";
- private int mDeviceType = HdmiCecDeviceInfo.DEVICE_INACTIVE;
+ private int mDeviceType = HdmiDeviceInfo.DEVICE_INACTIVE;
private DeviceInfo(int logicalAddress) {
mLogicalAddress = logicalAddress;
}
- private HdmiCecDeviceInfo toHdmiCecDeviceInfo() {
- return new HdmiCecDeviceInfo(mLogicalAddress, mPhysicalAddress, mPortId, mDeviceType,
+ private HdmiDeviceInfo toHdmiDeviceInfo() {
+ return new HdmiDeviceInfo(mLogicalAddress, mPhysicalAddress, mPortId, mDeviceType,
mVendorId, mDisplayName);
}
}
@@ -314,9 +314,9 @@
private void wrapUpAndFinish() {
Slog.v(TAG, "---------Wrap up Device Discovery:[" + mDevices.size() + "]---------");
- ArrayList<HdmiCecDeviceInfo> result = new ArrayList<>();
+ ArrayList<HdmiDeviceInfo> result = new ArrayList<>();
for (DeviceInfo info : mDevices) {
- HdmiCecDeviceInfo cecDeviceInfo = info.toHdmiCecDeviceInfo();
+ HdmiDeviceInfo cecDeviceInfo = info.toHdmiDeviceInfo();
Slog.v(TAG, " DeviceInfo: " + cecDeviceInfo);
result.add(cecDeviceInfo);
}
diff --git a/services/core/java/com/android/server/hdmi/DeviceSelectAction.java b/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
index 018b34d..e006e1c 100644
--- a/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
+++ b/services/core/java/com/android/server/hdmi/DeviceSelectAction.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiTvClient;
import android.hardware.hdmi.IHdmiControlCallback;
@@ -67,7 +67,7 @@
// before we give up and mark the action as failure.
private static final int STATE_WAIT_FOR_ACTIVE_SOURCE = 4;
- private final HdmiCecDeviceInfo mTarget;
+ private final HdmiDeviceInfo mTarget;
private final IHdmiControlCallback mCallback;
private final HdmiCecMessage mGivePowerStatus;
@@ -81,7 +81,7 @@
* @param callback callback object
*/
public DeviceSelectAction(HdmiCecLocalDeviceTv source,
- HdmiCecDeviceInfo target, IHdmiControlCallback callback) {
+ HdmiDeviceInfo target, IHdmiControlCallback callback) {
super(source);
mCallback = callback;
mTarget = target;
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index cf16fa3..18bfe32 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -47,7 +47,7 @@
protected final int mDeviceType;
protected int mAddress;
protected int mPreferredAddress;
- protected HdmiCecDeviceInfo mDeviceInfo;
+ protected HdmiDeviceInfo mDeviceInfo;
static class ActiveSource {
int logicalAddress;
@@ -135,9 +135,9 @@
// Factory method that returns HdmiCecLocalDevice of corresponding type.
static HdmiCecLocalDevice create(HdmiControlService service, int deviceType) {
switch (deviceType) {
- case HdmiCecDeviceInfo.DEVICE_TV:
+ case HdmiDeviceInfo.DEVICE_TV:
return new HdmiCecLocalDeviceTv(service);
- case HdmiCecDeviceInfo.DEVICE_PLAYBACK:
+ case HdmiDeviceInfo.DEVICE_PLAYBACK:
return new HdmiCecLocalDevicePlayback(service);
default:
return null;
@@ -460,13 +460,13 @@
}
@ServiceThreadOnly
- HdmiCecDeviceInfo getDeviceInfo() {
+ HdmiDeviceInfo getDeviceInfo() {
assertRunOnServiceThread();
return mDeviceInfo;
}
@ServiceThreadOnly
- void setDeviceInfo(HdmiCecDeviceInfo info) {
+ void setDeviceInfo(HdmiDeviceInfo info) {
assertRunOnServiceThread();
mDeviceInfo = info;
}
@@ -604,7 +604,7 @@
setActiveSource(newActive.logicalAddress, newActive.physicalAddress);
}
- void setActiveSource(HdmiCecDeviceInfo info) {
+ void setActiveSource(HdmiDeviceInfo info) {
setActiveSource(info.getLogicalAddress(), info.getPhysicalAddress());
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index b05f1af..7dc51a8 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiControlCallback;
import android.os.RemoteException;
@@ -34,7 +34,7 @@
private boolean mIsActiveSource = false;
HdmiCecLocalDevicePlayback(HdmiControlService service) {
- super(service, HdmiCecDeviceInfo.DEVICE_PLAYBACK);
+ super(service, HdmiDeviceInfo.DEVICE_PLAYBACK);
}
@Override
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 9b668e2..fb4fa7f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -30,7 +30,7 @@
import static android.hardware.hdmi.HdmiControlManager.TIMER_RECORDING_TYPE_EXTERNAL;
import android.content.Intent;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiRecordSources;
import android.hardware.hdmi.HdmiTimerRecordSources;
@@ -94,15 +94,15 @@
// Copy of mDeviceInfos to guarantee thread-safety.
@GuardedBy("mLock")
- private List<HdmiCecDeviceInfo> mSafeAllDeviceInfos = Collections.emptyList();
+ private List<HdmiDeviceInfo> mSafeAllDeviceInfos = Collections.emptyList();
// All external cec input(source) devices. Does not include system audio device.
@GuardedBy("mLock")
- private List<HdmiCecDeviceInfo> mSafeExternalInputs = Collections.emptyList();
+ private List<HdmiDeviceInfo> mSafeExternalInputs = Collections.emptyList();
// Map-like container of all cec devices including local ones.
// A logical address of device is used as key of container.
// This is not thread-safe. For external purpose use mSafeDeviceInfos.
- private final SparseArray<HdmiCecDeviceInfo> mDeviceInfos = new SparseArray<>();
+ private final SparseArray<HdmiDeviceInfo> mDeviceInfos = new SparseArray<>();
// If true, TV going to standby mode puts other devices also to standby.
private boolean mAutoDeviceOff;
@@ -117,7 +117,7 @@
private final ArraySet<Integer> mCecSwitches = new ArraySet<Integer>();
HdmiCecLocalDeviceTv(HdmiControlService service) {
- super(service, HdmiCecDeviceInfo.DEVICE_TV);
+ super(service, HdmiDeviceInfo.DEVICE_TV);
mPrevPortId = Constants.INVALID_PORT_ID;
mAutoDeviceOff = mService.readBooleanSetting(Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,
true);
@@ -187,14 +187,14 @@
return;
}
if (!mService.isControlEnabled()) {
- HdmiCecDeviceInfo info = getDeviceInfo(targetAddress);
+ HdmiDeviceInfo info = getDeviceInfo(targetAddress);
if (info != null) {
setActiveSource(info);
}
invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);
return;
}
- HdmiCecDeviceInfo targetDevice = getDeviceInfo(targetAddress);
+ HdmiDeviceInfo targetDevice = getDeviceInfo(targetAddress);
if (targetDevice == null) {
invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
return;
@@ -279,10 +279,10 @@
// Show OSD port change banner
if (notifyInputChange) {
ActiveSource activeSource = getActiveSource();
- HdmiCecDeviceInfo info = getDeviceInfo(activeSource.logicalAddress);
+ HdmiDeviceInfo info = getDeviceInfo(activeSource.logicalAddress);
if (info == null) {
- info = new HdmiCecDeviceInfo(Constants.ADDR_INVALID, path, portId,
- HdmiCecDeviceInfo.DEVICE_RESERVED, 0, null);
+ info = new HdmiDeviceInfo(Constants.ADDR_INVALID, path, portId,
+ HdmiDeviceInfo.DEVICE_RESERVED, 0, null);
}
mService.invokeInputChangeListener(info);
}
@@ -388,7 +388,7 @@
if (portId != Constants.INVALID_PORT_ID) {
// TODO: Do this only if TV is not showing multiview like PIP/PAP.
- HdmiCecDeviceInfo inactiveSource = getDeviceInfo(message.getSource());
+ HdmiDeviceInfo inactiveSource = getDeviceInfo(message.getSource());
if (inactiveSource == null) {
return true;
}
@@ -440,11 +440,11 @@
// Build cec switch list with pure CEC switch, AVR.
if (address == Constants.ADDR_UNREGISTERED) {
int type = message.getParams()[2];
- if (type == HdmiCecDeviceInfo.DEVICE_PURE_CEC_SWITCH) {
+ if (type == HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH) {
mCecSwitches.add(path);
updateSafeDeviceInfoList();
return true; // Pure switch does not need further processing. Return here.
- } else if (type == HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {
+ } else if (type == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
mCecSwitches.add(path);
}
}
@@ -572,7 +572,7 @@
@ServiceThreadOnly
protected boolean handleSetOsdName(HdmiCecMessage message) {
int source = message.getSource();
- HdmiCecDeviceInfo deviceInfo = getDeviceInfo(source);
+ HdmiDeviceInfo deviceInfo = getDeviceInfo(source);
// If the device is not in device list, ignore it.
if (deviceInfo == null) {
Slog.e(TAG, "No source device info for <Set Osd Name>." + message);
@@ -591,7 +591,7 @@
return true;
}
- addCecDevice(new HdmiCecDeviceInfo(deviceInfo.getLogicalAddress(),
+ addCecDevice(new HdmiDeviceInfo(deviceInfo.getLogicalAddress(),
deviceInfo.getPhysicalAddress(), deviceInfo.getPortId(),
deviceInfo.getDeviceType(), deviceInfo.getVendorId(), osdName));
return true;
@@ -604,8 +604,8 @@
DeviceDiscoveryAction action = new DeviceDiscoveryAction(this,
new DeviceDiscoveryCallback() {
@Override
- public void onDeviceDiscoveryDone(List<HdmiCecDeviceInfo> deviceInfos) {
- for (HdmiCecDeviceInfo info : deviceInfos) {
+ public void onDeviceDiscoveryDone(List<HdmiDeviceInfo> deviceInfos) {
+ for (HdmiDeviceInfo info : deviceInfos) {
addCecDevice(info);
}
@@ -638,7 +638,7 @@
@ServiceThreadOnly
private void clearDeviceInfoList() {
assertRunOnServiceThread();
- for (HdmiCecDeviceInfo info : mSafeExternalInputs) {
+ for (HdmiDeviceInfo info : mSafeExternalInputs) {
invokeDeviceEventListener(info, false);
}
mDeviceInfos.clear();
@@ -654,7 +654,7 @@
invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);
return;
}
- HdmiCecDeviceInfo avr = getAvrDeviceInfo();
+ HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr == null) {
setSystemAudioMode(false, true);
invokeCallback(callback, HdmiControlManager.RESULT_TARGET_NOT_AVAILABLE);
@@ -758,7 +758,7 @@
@ServiceThreadOnly
private void startArcAction(boolean enabled) {
assertRunOnServiceThread();
- HdmiCecDeviceInfo info = getAvrDeviceInfo();
+ HdmiDeviceInfo info = getAvrDeviceInfo();
if (info == null) {
return;
}
@@ -814,7 +814,7 @@
// Remove existing volume action.
removeAction(VolumeControlAction.class);
- HdmiCecDeviceInfo avr = getAvrDeviceInfo();
+ HdmiDeviceInfo avr = getAvrDeviceInfo();
addAndStartAction(VolumeControlAction.ofVolumeChange(this, avr.getLogicalAddress(),
cecVolume, delta > 0));
}
@@ -828,7 +828,7 @@
// Remove existing volume action.
removeAction(VolumeControlAction.class);
- HdmiCecDeviceInfo avr = getAvrDeviceInfo();
+ HdmiDeviceInfo avr = getAvrDeviceInfo();
addAndStartAction(VolumeControlAction.ofMute(this, avr.getLogicalAddress(), mute));
}
@@ -934,19 +934,19 @@
}
/**
- * Add a new {@link HdmiCecDeviceInfo}. It returns old device info which has the same
+ * Add a new {@link HdmiDeviceInfo}. It returns old device info which has the same
* logical address as new device info's.
*
* <p>Declared as package-private. accessed by {@link HdmiControlService} only.
*
- * @param deviceInfo a new {@link HdmiCecDeviceInfo} to be added.
- * @return {@code null} if it is new device. Otherwise, returns old {@HdmiCecDeviceInfo}
+ * @param deviceInfo a new {@link HdmiDeviceInfo} to be added.
+ * @return {@code null} if it is new device. Otherwise, returns old {@HdmiDeviceInfo}
* that has the same logical address as new one has.
*/
@ServiceThreadOnly
- private HdmiCecDeviceInfo addDeviceInfo(HdmiCecDeviceInfo deviceInfo) {
+ private HdmiDeviceInfo addDeviceInfo(HdmiDeviceInfo deviceInfo) {
assertRunOnServiceThread();
- HdmiCecDeviceInfo oldDeviceInfo = getDeviceInfo(deviceInfo.getLogicalAddress());
+ HdmiDeviceInfo oldDeviceInfo = getDeviceInfo(deviceInfo.getLogicalAddress());
if (oldDeviceInfo != null) {
removeDeviceInfo(deviceInfo.getLogicalAddress());
}
@@ -957,17 +957,17 @@
/**
* Remove a device info corresponding to the given {@code logicalAddress}.
- * It returns removed {@link HdmiCecDeviceInfo} if exists.
+ * It returns removed {@link HdmiDeviceInfo} if exists.
*
* <p>Declared as package-private. accessed by {@link HdmiControlService} only.
*
* @param logicalAddress logical address of device to be removed
- * @return removed {@link HdmiCecDeviceInfo} it exists. Otherwise, returns {@code null}
+ * @return removed {@link HdmiDeviceInfo} it exists. Otherwise, returns {@code null}
*/
@ServiceThreadOnly
- private HdmiCecDeviceInfo removeDeviceInfo(int logicalAddress) {
+ private HdmiDeviceInfo removeDeviceInfo(int logicalAddress) {
assertRunOnServiceThread();
- HdmiCecDeviceInfo deviceInfo = mDeviceInfos.get(logicalAddress);
+ HdmiDeviceInfo deviceInfo = mDeviceInfos.get(logicalAddress);
if (deviceInfo != null) {
mDeviceInfos.remove(logicalAddress);
}
@@ -976,21 +976,21 @@
}
/**
- * Return a list of all {@link HdmiCecDeviceInfo}.
+ * Return a list of all {@link HdmiDeviceInfo}.
*
* <p>Declared as package-private. accessed by {@link HdmiControlService} only.
* This is not thread-safe. For thread safety, call {@link #getSafeExternalInputs} which
* does not include local device.
*/
@ServiceThreadOnly
- List<HdmiCecDeviceInfo> getDeviceInfoList(boolean includelLocalDevice) {
+ List<HdmiDeviceInfo> getDeviceInfoList(boolean includelLocalDevice) {
assertRunOnServiceThread();
if (includelLocalDevice) {
return HdmiUtils.sparseArrayToList(mDeviceInfos);
} else {
- ArrayList<HdmiCecDeviceInfo> infoList = new ArrayList<>();
+ ArrayList<HdmiDeviceInfo> infoList = new ArrayList<>();
for (int i = 0; i < mDeviceInfos.size(); ++i) {
- HdmiCecDeviceInfo info = mDeviceInfos.valueAt(i);
+ HdmiDeviceInfo info = mDeviceInfos.valueAt(i);
if (!isLocalDeviceAddress(info.getLogicalAddress())) {
infoList.add(info);
}
@@ -1002,7 +1002,7 @@
/**
* Return external input devices.
*/
- List<HdmiCecDeviceInfo> getSafeExternalInputs() {
+ List<HdmiDeviceInfo> getSafeExternalInputs() {
synchronized (mLock) {
return mSafeExternalInputs;
}
@@ -1011,8 +1011,8 @@
@ServiceThreadOnly
private void updateSafeDeviceInfoList() {
assertRunOnServiceThread();
- List<HdmiCecDeviceInfo> copiedDevices = HdmiUtils.sparseArrayToList(mDeviceInfos);
- List<HdmiCecDeviceInfo> externalInputs = getInputDevices();
+ List<HdmiDeviceInfo> copiedDevices = HdmiUtils.sparseArrayToList(mDeviceInfos);
+ List<HdmiDeviceInfo> externalInputs = getInputDevices();
synchronized (mLock) {
mSafeAllDeviceInfos = copiedDevices;
mSafeExternalInputs = externalInputs;
@@ -1025,10 +1025,10 @@
* <p>Note that this effectively excludes non-source devices like system audio,
* secondary TV.
*/
- private List<HdmiCecDeviceInfo> getInputDevices() {
- ArrayList<HdmiCecDeviceInfo> infoList = new ArrayList<>();
+ private List<HdmiDeviceInfo> getInputDevices() {
+ ArrayList<HdmiDeviceInfo> infoList = new ArrayList<>();
for (int i = 0; i < mDeviceInfos.size(); ++i) {
- HdmiCecDeviceInfo info = mDeviceInfos.valueAt(i);
+ HdmiDeviceInfo info = mDeviceInfos.valueAt(i);
if (isLocalDeviceAddress(i)) {
continue;
}
@@ -1042,7 +1042,7 @@
// Check if we are hiding CEC devices connected to a legacy (non-CEC) switch.
// Returns true if the policy is set to true, and the device to check does not have
// a parent CEC device (which should be the CEC-enabled switch) in the list.
- private boolean hideDevicesBehindLegacySwitch(HdmiCecDeviceInfo info) {
+ private boolean hideDevicesBehindLegacySwitch(HdmiDeviceInfo info) {
return HdmiConfig.HIDE_DEVICES_BEHIND_LEGACY_SWITCH
&& !isConnectedToCecSwitch(info.getPhysicalAddress(), mCecSwitches);
}
@@ -1069,7 +1069,7 @@
return false;
}
- private void invokeDeviceEventListener(HdmiCecDeviceInfo info, boolean activated) {
+ private void invokeDeviceEventListener(HdmiDeviceInfo info, boolean activated) {
if (!hideDevicesBehindLegacySwitch(info)) {
mService.invokeDeviceEventListeners(info, activated);
}
@@ -1087,23 +1087,23 @@
}
@ServiceThreadOnly
- HdmiCecDeviceInfo getAvrDeviceInfo() {
+ HdmiDeviceInfo getAvrDeviceInfo() {
assertRunOnServiceThread();
return getDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
}
/**
- * Return a {@link HdmiCecDeviceInfo} corresponding to the given {@code logicalAddress}.
+ * Return a {@link HdmiDeviceInfo} corresponding to the given {@code logicalAddress}.
*
* <p>Declared as package-private. accessed by {@link HdmiControlService} only.
* This is not thread-safe. For thread safety, call {@link #getSafeDeviceInfo(int)}.
*
* @param logicalAddress logical address to be retrieved
- * @return {@link HdmiCecDeviceInfo} matched with the given {@code logicalAddress}.
+ * @return {@link HdmiDeviceInfo} matched with the given {@code logicalAddress}.
* Returns null if no logical address matched
*/
@ServiceThreadOnly
- HdmiCecDeviceInfo getDeviceInfo(int logicalAddress) {
+ HdmiDeviceInfo getDeviceInfo(int logicalAddress) {
assertRunOnServiceThread();
return mDeviceInfos.get(logicalAddress);
}
@@ -1112,7 +1112,7 @@
return getSafeAvrDeviceInfo() != null;
}
- HdmiCecDeviceInfo getSafeAvrDeviceInfo() {
+ HdmiDeviceInfo getSafeAvrDeviceInfo() {
return getSafeDeviceInfo(Constants.ADDR_AUDIO_SYSTEM);
}
@@ -1120,10 +1120,10 @@
* Thread safe version of {@link #getDeviceInfo(int)}.
*
* @param logicalAddress logical address to be retrieved
- * @return {@link HdmiCecDeviceInfo} matched with the given {@code logicalAddress}.
+ * @return {@link HdmiDeviceInfo} matched with the given {@code logicalAddress}.
* Returns null if no logical address matched
*/
- HdmiCecDeviceInfo getSafeDeviceInfo(int logicalAddress) {
+ HdmiDeviceInfo getSafeDeviceInfo(int logicalAddress) {
synchronized (mLock) {
return mSafeAllDeviceInfos.get(logicalAddress);
}
@@ -1136,7 +1136,7 @@
* @param info device info of a new device.
*/
@ServiceThreadOnly
- final void addCecDevice(HdmiCecDeviceInfo info) {
+ final void addCecDevice(HdmiDeviceInfo info) {
assertRunOnServiceThread();
addDeviceInfo(info);
if (info.getLogicalAddress() == mAddress) {
@@ -1154,7 +1154,7 @@
@ServiceThreadOnly
final void removeCecDevice(int address) {
assertRunOnServiceThread();
- HdmiCecDeviceInfo info = removeDeviceInfo(address);
+ HdmiDeviceInfo info = removeDeviceInfo(address);
mCecMessageCache.flushMessagesFrom(address);
invokeDeviceEventListener(info, false);
@@ -1204,17 +1204,17 @@
}
/**
- * Returns the {@link HdmiCecDeviceInfo} instance whose physical address matches
+ * Returns the {@link HdmiDeviceInfo} instance whose physical address matches
* the given routing path. CEC devices use routing path for its physical address to
* describe the hierarchy of the devices in the network.
*
* @param path routing path or physical address
- * @return {@link HdmiCecDeviceInfo} if the matched info is found; otherwise null
+ * @return {@link HdmiDeviceInfo} if the matched info is found; otherwise null
*/
@ServiceThreadOnly
- final HdmiCecDeviceInfo getDeviceInfoByPath(int path) {
+ final HdmiDeviceInfo getDeviceInfoByPath(int path) {
assertRunOnServiceThread();
- for (HdmiCecDeviceInfo info : getDeviceInfoList(false)) {
+ for (HdmiDeviceInfo info : getDeviceInfoList(false)) {
if (info.getPhysicalAddress() == path) {
return info;
}
@@ -1234,7 +1234,7 @@
@ServiceThreadOnly
boolean isInDeviceList(int logicalAddress, int physicalAddress) {
assertRunOnServiceThread();
- HdmiCecDeviceInfo device = getDeviceInfo(logicalAddress);
+ HdmiDeviceInfo device = getDeviceInfo(logicalAddress);
if (device == null) {
return false;
}
@@ -1332,7 +1332,7 @@
@ServiceThreadOnly
private void disableArcIfExist() {
assertRunOnServiceThread();
- HdmiCecDeviceInfo avr = getAvrDeviceInfo();
+ HdmiDeviceInfo avr = getAvrDeviceInfo();
if (avr == null) {
return;
}
@@ -1422,10 +1422,10 @@
}
private boolean checkRecorder(int recorderAddress) {
- HdmiCecDeviceInfo device = getDeviceInfo(recorderAddress);
+ HdmiDeviceInfo device = getDeviceInfo(recorderAddress);
return (device != null)
&& (HdmiUtils.getTypeFromAddress(recorderAddress)
- == HdmiCecDeviceInfo.DEVICE_RECORDER);
+ == HdmiDeviceInfo.DEVICE_RECORDER);
}
private boolean checkRecordSource(byte[] recordSource) {
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
index 7e73b47..29a73d0 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import android.util.SparseArray;
@@ -268,9 +268,9 @@
* @return true if the given type is valid
*/
static boolean isValidType(int type) {
- return (HdmiCecDeviceInfo.DEVICE_TV <= type
- && type <= HdmiCecDeviceInfo.DEVICE_VIDEO_PROCESSOR)
- && type != HdmiCecDeviceInfo.DEVICE_RESERVED;
+ return (HdmiDeviceInfo.DEVICE_TV <= type
+ && type <= HdmiDeviceInfo.DEVICE_VIDEO_PROCESSOR)
+ && type != HdmiDeviceInfo.DEVICE_RESERVED;
}
private class PhysicalAddressValidator implements ParameterValidator {
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index edadf6d..3017d2d 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -22,7 +22,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiHotplugEvent;
import android.hardware.hdmi.HdmiPortInfo;
@@ -317,7 +317,7 @@
if (logicalAddress == Constants.ADDR_UNREGISTERED) {
Slog.e(TAG, "Failed to allocate address:[device_type:" + deviceType + "]");
} else {
- HdmiCecDeviceInfo deviceInfo = createDeviceInfo(logicalAddress, deviceType);
+ HdmiDeviceInfo deviceInfo = createDeviceInfo(logicalAddress, deviceType);
localDevice.setDeviceInfo(deviceInfo);
mCecController.addLocalDevice(deviceType, localDevice);
mCecController.addLogicalAddress(logicalAddress);
@@ -467,7 +467,7 @@
}
@ServiceThreadOnly
- HdmiCecDeviceInfo getDeviceInfo(int logicalAddress) {
+ HdmiDeviceInfo getDeviceInfo(int logicalAddress) {
assertRunOnServiceThread();
HdmiCecLocalDeviceTv tv = tv();
if (tv == null) {
@@ -646,10 +646,10 @@
}
}
- private HdmiCecDeviceInfo createDeviceInfo(int logicalAddress, int deviceType) {
+ private HdmiDeviceInfo createDeviceInfo(int logicalAddress, int deviceType) {
// TODO: find better name instead of model name.
String displayName = Build.MODEL;
- return new HdmiCecDeviceInfo(logicalAddress,
+ return new HdmiDeviceInfo(logicalAddress,
getPhysicalAddress(), pathToPortId(getPhysicalAddress()), deviceType,
getVendorId(), displayName);
}
@@ -747,7 +747,7 @@
}
@Override
- public HdmiCecDeviceInfo getActiveSource() {
+ public HdmiDeviceInfo getActiveSource() {
HdmiCecLocalDeviceTv tv = tv();
if (tv == null) {
Slog.w(TAG, "Local tv device not available");
@@ -755,13 +755,13 @@
}
ActiveSource activeSource = tv.getActiveSource();
if (activeSource.isValid()) {
- return new HdmiCecDeviceInfo(activeSource.logicalAddress,
- activeSource.physicalAddress, HdmiCecDeviceInfo.PORT_INVALID,
- HdmiCecDeviceInfo.DEVICE_INACTIVE, 0, "");
+ return new HdmiDeviceInfo(activeSource.logicalAddress,
+ activeSource.physicalAddress, HdmiDeviceInfo.PORT_INVALID,
+ HdmiDeviceInfo.DEVICE_INACTIVE, 0, "");
}
int activePath = tv.getActivePath();
- if (activePath != HdmiCecDeviceInfo.PATH_INVALID) {
- return new HdmiCecDeviceInfo(activePath, tv.getActivePortId());
+ if (activePath != HdmiDeviceInfo.PATH_INVALID) {
+ return new HdmiDeviceInfo(activePath, tv.getActivePortId());
}
return null;
}
@@ -943,7 +943,7 @@
}
@Override
- public List<HdmiCecDeviceInfo> getInputDevices() {
+ public List<HdmiDeviceInfo> getInputDevices() {
enforceAccessPermission();
// No need to hold the lock for obtaining TV device as the local device instance
// is preserved while the HDMI control is enabled.
@@ -1212,7 +1212,7 @@
}
}
- void invokeDeviceEventListeners(HdmiCecDeviceInfo device, boolean activated) {
+ void invokeDeviceEventListeners(HdmiDeviceInfo device, boolean activated) {
synchronized (mLock) {
for (IHdmiDeviceEventListener listener : mDeviceEventListeners) {
try {
@@ -1275,7 +1275,7 @@
}
}
- void invokeInputChangeListener(HdmiCecDeviceInfo info) {
+ void invokeInputChangeListener(HdmiDeviceInfo info) {
synchronized (mLock) {
if (mInputChangeListener != null) {
try {
@@ -1384,7 +1384,7 @@
}
private HdmiCecLocalDeviceTv tv() {
- return (HdmiCecLocalDeviceTv) mCecController.getLocalDevice(HdmiCecDeviceInfo.DEVICE_TV);
+ return (HdmiCecLocalDeviceTv) mCecController.getLocalDevice(HdmiDeviceInfo.DEVICE_TV);
}
boolean isTvDevice() {
@@ -1393,7 +1393,7 @@
private HdmiCecLocalDevicePlayback playback() {
return (HdmiCecLocalDevicePlayback)
- mCecController.getLocalDevice(HdmiCecDeviceInfo.DEVICE_PLAYBACK);
+ mCecController.getLocalDevice(HdmiDeviceInfo.DEVICE_PLAYBACK);
}
AudioManager getAudioManager() {
diff --git a/services/core/java/com/android/server/hdmi/HdmiUtils.java b/services/core/java/com/android/server/hdmi/HdmiUtils.java
index b92e823..a52e0d2 100644
--- a/services/core/java/com/android/server/hdmi/HdmiUtils.java
+++ b/services/core/java/com/android/server/hdmi/HdmiUtils.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import android.util.SparseArray;
@@ -30,21 +30,21 @@
final class HdmiUtils {
private static final int[] ADDRESS_TO_TYPE = {
- HdmiCecDeviceInfo.DEVICE_TV, // ADDR_TV
- HdmiCecDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_1
- HdmiCecDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_2
- HdmiCecDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_1
- HdmiCecDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_1
- HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM, // ADDR_AUDIO_SYSTEM
- HdmiCecDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_2
- HdmiCecDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_3
- HdmiCecDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_2
- HdmiCecDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_3
- HdmiCecDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_4
- HdmiCecDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_3
- HdmiCecDeviceInfo.DEVICE_RESERVED,
- HdmiCecDeviceInfo.DEVICE_RESERVED,
- HdmiCecDeviceInfo.DEVICE_TV, // ADDR_SPECIFIC_USE
+ HdmiDeviceInfo.DEVICE_TV, // ADDR_TV
+ HdmiDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_1
+ HdmiDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_2
+ HdmiDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_1
+ HdmiDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_1
+ HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM, // ADDR_AUDIO_SYSTEM
+ HdmiDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_2
+ HdmiDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_3
+ HdmiDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_2
+ HdmiDeviceInfo.DEVICE_RECORDER, // ADDR_RECORDER_3
+ HdmiDeviceInfo.DEVICE_TUNER, // ADDR_TUNER_4
+ HdmiDeviceInfo.DEVICE_PLAYBACK, // ADDR_PLAYBACK_3
+ HdmiDeviceInfo.DEVICE_RESERVED,
+ HdmiDeviceInfo.DEVICE_RESERVED,
+ HdmiDeviceInfo.DEVICE_TV, // ADDR_SPECIFIC_USE
};
private static final String[] DEFAULT_NAMES = {
@@ -90,7 +90,7 @@
if (isValidAddress(address)) {
return ADDRESS_TO_TYPE[address];
}
- return HdmiCecDeviceInfo.DEVICE_INACTIVE;
+ return HdmiDeviceInfo.DEVICE_INACTIVE;
}
/**
diff --git a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
index 813901d..8fc0bbc 100644
--- a/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
+++ b/services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import com.android.server.hdmi.HdmiControlService.DevicePollingCallback;
@@ -161,11 +161,11 @@
}
}
- private static BitSet infoListToBitSet(List<HdmiCecDeviceInfo> infoList, boolean audioOnly) {
+ private static BitSet infoListToBitSet(List<HdmiDeviceInfo> infoList, boolean audioOnly) {
BitSet set = new BitSet(NUM_OF_ADDRESS);
- for (HdmiCecDeviceInfo info : infoList) {
+ for (HdmiDeviceInfo info : infoList) {
if (audioOnly) {
- if (info.getDeviceType() == HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {
+ if (info.getDeviceType() == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
set.set(info.getLogicalAddress());
}
} else {
@@ -207,7 +207,7 @@
}
private void mayChangeRoutingPath(int address) {
- HdmiCecDeviceInfo info = tv().getDeviceInfo(address);
+ HdmiDeviceInfo info = tv().getDeviceInfo(address);
if (info != null) {
tv().handleRemoveActiveRoutingPath(info.getPhysicalAddress());
}
@@ -236,7 +236,7 @@
}
private void mayDisableSystemAudioAndARC(int address) {
- if (HdmiUtils.getTypeFromAddress(address) != HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {
+ if (HdmiUtils.getTypeFromAddress(address) != HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
return;
}
diff --git a/services/core/java/com/android/server/hdmi/NewDeviceAction.java b/services/core/java/com/android/server/hdmi/NewDeviceAction.java
index 907015b..8154204 100644
--- a/services/core/java/com/android/server/hdmi/NewDeviceAction.java
+++ b/services/core/java/com/android/server/hdmi/NewDeviceAction.java
@@ -15,7 +15,7 @@
*/
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import com.android.server.hdmi.HdmiCecLocalDevice.ActiveSource;
@@ -28,7 +28,7 @@
* connected HDMI-CEC device broadcasts to announce its advent. Additional commands are issued in
* this action to gather more information on the device such as OSD name and device vendor ID.
*
- * <p>The result is made in the form of {@link HdmiCecDeviceInfo} object, and passed to service
+ * <p>The result is made in the form of {@link HdmiDeviceInfo} object, and passed to service
* for the management through its life cycle.
*
* <p>Package-private, accessed by {@link HdmiControlService} only.
@@ -152,14 +152,14 @@
if (mDisplayName == null) {
mDisplayName = HdmiUtils.getDefaultDeviceName(mDeviceLogicalAddress);
}
- tv().addCecDevice(new HdmiCecDeviceInfo(
+ tv().addCecDevice(new HdmiDeviceInfo(
mDeviceLogicalAddress, mDevicePhysicalAddress,
tv().getPortId(mDevicePhysicalAddress),
HdmiUtils.getTypeFromAddress(mDeviceLogicalAddress),
mVendorId, mDisplayName));
if (HdmiUtils.getTypeFromAddress(mDeviceLogicalAddress)
- == HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {
+ == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
if (tv().getSystemAudioModeSetting()) {
addAndStartAction(new SystemAudioAutoInitiationAction(localDevice(),
mDeviceLogicalAddress));
diff --git a/services/core/java/com/android/server/hdmi/RequestArcAction.java b/services/core/java/com/android/server/hdmi/RequestArcAction.java
index cf44607..3b1ad53 100644
--- a/services/core/java/com/android/server/hdmi/RequestArcAction.java
+++ b/services/core/java/com/android/server/hdmi/RequestArcAction.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
@@ -42,8 +42,8 @@
*/
RequestArcAction(HdmiCecLocalDevice source, int avrAddress) {
super(source);
- HdmiUtils.verifyAddressType(getSourceAddress(), HdmiCecDeviceInfo.DEVICE_TV);
- HdmiUtils.verifyAddressType(avrAddress, HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM);
+ HdmiUtils.verifyAddressType(getSourceAddress(), HdmiDeviceInfo.DEVICE_TV);
+ HdmiUtils.verifyAddressType(avrAddress, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
mAvrAddress = avrAddress;
}
diff --git a/services/core/java/com/android/server/hdmi/RoutingControlAction.java b/services/core/java/com/android/server/hdmi/RoutingControlAction.java
index f50ae9b..dbf1961 100644
--- a/services/core/java/com/android/server/hdmi/RoutingControlAction.java
+++ b/services/core/java/com/android/server/hdmi/RoutingControlAction.java
@@ -17,7 +17,7 @@
package com.android.server.hdmi;
import android.annotation.Nullable;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiControlCallback;
import android.os.RemoteException;
@@ -155,7 +155,7 @@
}
switch (timeoutState) {
case STATE_WAIT_FOR_ROUTING_INFORMATION:
- HdmiCecDeviceInfo device = tv().getDeviceInfoByPath(mCurrentRoutingPath);
+ HdmiDeviceInfo device = tv().getDeviceInfoByPath(mCurrentRoutingPath);
if (device != null && mQueryDevicePowerStatus) {
int deviceLogicalAddress = device.getLogicalAddress();
queryDevicePowerStatus(deviceLogicalAddress, new SendMessageCallback() {
diff --git a/services/core/java/com/android/server/hdmi/SetArcTransmissionStateAction.java b/services/core/java/com/android/server/hdmi/SetArcTransmissionStateAction.java
index e0c1ad5..6104eb2 100644
--- a/services/core/java/com/android/server/hdmi/SetArcTransmissionStateAction.java
+++ b/services/core/java/com/android/server/hdmi/SetArcTransmissionStateAction.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
/**
@@ -44,8 +44,8 @@
SetArcTransmissionStateAction(HdmiCecLocalDevice source, int avrAddress,
boolean enabled) {
super(source);
- HdmiUtils.verifyAddressType(getSourceAddress(), HdmiCecDeviceInfo.DEVICE_TV);
- HdmiUtils.verifyAddressType(avrAddress, HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM);
+ HdmiUtils.verifyAddressType(getSourceAddress(), HdmiDeviceInfo.DEVICE_TV);
+ HdmiUtils.verifyAddressType(avrAddress, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
mAvrAddress = avrAddress;
mEnabled = enabled;
}
diff --git a/services/core/java/com/android/server/hdmi/SystemAudioAction.java b/services/core/java/com/android/server/hdmi/SystemAudioAction.java
index 4be036a..057f9ba 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioAction.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioAction.java
@@ -17,7 +17,7 @@
package com.android.server.hdmi;
import android.annotation.Nullable;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiControlCallback;
import android.os.RemoteException;
@@ -65,7 +65,7 @@
SystemAudioAction(HdmiCecLocalDevice source, int avrAddress, boolean targetStatus,
IHdmiControlCallback callback) {
super(source);
- HdmiUtils.verifyAddressType(avrAddress, HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM);
+ HdmiUtils.verifyAddressType(avrAddress, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
mAvrLogicalAddress = avrAddress;
mTargetAudioStatus = targetStatus;
mCallback = callback;
diff --git a/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java b/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java
index df9bdfc..eb5119b 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiControlCallback;
@@ -37,7 +37,7 @@
SystemAudioActionFromAvr(HdmiCecLocalDevice source, int avrAddress,
boolean targetStatus, IHdmiControlCallback callback) {
super(source, avrAddress, targetStatus, callback);
- HdmiUtils.verifyAddressType(getSourceAddress(), HdmiCecDeviceInfo.DEVICE_TV);
+ HdmiUtils.verifyAddressType(getSourceAddress(), HdmiDeviceInfo.DEVICE_TV);
}
@Override
diff --git a/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java b/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java
index cb3588c..02ecd13 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java
@@ -16,7 +16,7 @@
package com.android.server.hdmi;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.IHdmiControlCallback;
@@ -37,7 +37,7 @@
SystemAudioActionFromTv(HdmiCecLocalDevice sourceAddress, int avrAddress,
boolean targetStatus, IHdmiControlCallback callback) {
super(sourceAddress, avrAddress, targetStatus, callback);
- HdmiUtils.verifyAddressType(getSourceAddress(), HdmiCecDeviceInfo.DEVICE_TV);
+ HdmiUtils.verifyAddressType(getSourceAddress(), HdmiDeviceInfo.DEVICE_TV);
}
@Override
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index 9252be4..74f725f 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -21,7 +21,7 @@
import android.content.Context;
import android.content.Intent;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiHotplugEvent;
import android.hardware.hdmi.IHdmiControlService;
import android.hardware.hdmi.IHdmiDeviceEventListener;
@@ -82,7 +82,7 @@
private final TvInputHal mHal = new TvInputHal(this);
private final SparseArray<Connection> mConnections = new SparseArray<>();
private final List<TvInputHardwareInfo> mHardwareList = new ArrayList<>();
- private List<HdmiCecDeviceInfo> mHdmiCecDeviceList = new LinkedList<>();
+ private List<HdmiDeviceInfo> mHdmiCecDeviceList = new LinkedList<>();
/* A map from a device ID to the matching TV input ID. */
private final SparseArray<String> mHardwareInputIdMap = new SparseArray<>();
/* A map from a HDMI logical address to the matching TV input ID. */
@@ -164,9 +164,9 @@
TvInputHardwareInfo info = connection.getHardwareInfoLocked();
if (info.getType() == TvInputHardwareInfo.TV_INPUT_TYPE_HDMI) {
// Remove HDMI CEC devices linked with this hardware.
- for (Iterator<HdmiCecDeviceInfo> it = mHdmiCecDeviceList.iterator();
+ for (Iterator<HdmiDeviceInfo> it = mHdmiCecDeviceList.iterator();
it.hasNext(); ) {
- HdmiCecDeviceInfo deviceInfo = it.next();
+ HdmiDeviceInfo deviceInfo = it.next();
if (deviceInfo.getPortId() == info.getHdmiPortId()) {
mHandler.obtainMessage(ListenerHandler.HDMI_CEC_DEVICE_REMOVED, 0, 0,
deviceInfo).sendToTarget();
@@ -220,7 +220,7 @@
}
}
- public List<HdmiCecDeviceInfo> getHdmiCecInputDeviceList() {
+ public List<HdmiDeviceInfo> getHdmiCecInputDeviceList() {
synchronized (mLock) {
return Collections.unmodifiableList(mHdmiCecDeviceList);
}
@@ -450,7 +450,7 @@
private void processPendingHdmiDeviceEventsLocked() {
for (Iterator<Message> it = mPendingHdmiDeviceEvents.iterator(); it.hasNext(); ) {
Message msg = it.next();
- HdmiCecDeviceInfo deviceInfo = (HdmiCecDeviceInfo) msg.obj;
+ HdmiDeviceInfo deviceInfo = (HdmiDeviceInfo) msg.obj;
TvInputHardwareInfo hardwareInfo =
findHardwareInfoForHdmiPortLocked(deviceInfo.getPortId());
if (hardwareInfo != null) {
@@ -864,8 +864,8 @@
public void onStateChanged(String inputId, int state);
public void onHardwareDeviceAdded(TvInputHardwareInfo info);
public void onHardwareDeviceRemoved(TvInputHardwareInfo info);
- public void onHdmiCecDeviceAdded(HdmiCecDeviceInfo cecDevice);
- public void onHdmiCecDeviceRemoved(HdmiCecDeviceInfo cecDevice);
+ public void onHdmiCecDeviceAdded(HdmiDeviceInfo cecDevice);
+ public void onHdmiCecDeviceRemoved(HdmiDeviceInfo cecDevice);
}
private class ListenerHandler extends Handler {
@@ -895,12 +895,12 @@
break;
}
case HDMI_CEC_DEVICE_ADDED: {
- HdmiCecDeviceInfo info = (HdmiCecDeviceInfo) msg.obj;
+ HdmiDeviceInfo info = (HdmiDeviceInfo) msg.obj;
mListener.onHdmiCecDeviceAdded(info);
break;
}
case HDMI_CEC_DEVICE_REMOVED: {
- HdmiCecDeviceInfo info = (HdmiCecDeviceInfo) msg.obj;
+ HdmiDeviceInfo info = (HdmiDeviceInfo) msg.obj;
mListener.onHdmiCecDeviceRemoved(info);
break;
}
@@ -936,7 +936,7 @@
private final class HdmiDeviceEventListener extends IHdmiDeviceEventListener.Stub {
@Override
- public void onStatusChanged(HdmiCecDeviceInfo deviceInfo, boolean activated) {
+ public void onStatusChanged(HdmiDeviceInfo deviceInfo, boolean activated) {
synchronized (mLock) {
if (activated) {
if (!mHdmiCecDeviceList.contains(deviceInfo)) {
@@ -966,7 +966,7 @@
private final class HdmiInputChangeListener extends IHdmiInputChangeListener.Stub {
@Override
- public void onChanged(HdmiCecDeviceInfo device) throws RemoteException {
+ public void onChanged(HdmiDeviceInfo device) throws RemoteException {
String inputId;
synchronized (mLock) {
if (device.isCecDevice()) {
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index 594e9d0..4ed7cb7 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -38,7 +38,7 @@
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Rect;
-import android.hardware.hdmi.HdmiCecDeviceInfo;
+import android.hardware.hdmi.HdmiDeviceInfo;
import android.media.tv.ITvInputClient;
import android.media.tv.ITvInputHardware;
import android.media.tv.ITvInputHardwareCallback;
@@ -1894,9 +1894,9 @@
}
}
- List<HdmiCecDeviceInfo> cecDeviceInfoList =
+ List<HdmiDeviceInfo> cecDeviceInfoList =
mTvInputHardwareManager.getHdmiCecInputDeviceList();
- for (HdmiCecDeviceInfo cecDeviceInfo : cecDeviceInfoList) {
+ for (HdmiDeviceInfo cecDeviceInfo : cecDeviceInfoList) {
try {
serviceState.mService.notifyHdmiCecDeviceAdded(cecDeviceInfo);
} catch (RemoteException e) {
@@ -2204,7 +2204,7 @@
}
@Override
- public void onHdmiCecDeviceAdded(HdmiCecDeviceInfo cecDeviceInfo) {
+ public void onHdmiCecDeviceAdded(HdmiDeviceInfo cecDeviceInfo) {
synchronized (mLock) {
UserState userState = getUserStateLocked(mCurrentUserId);
// Broadcast the event to all hardware inputs.
@@ -2220,7 +2220,7 @@
}
@Override
- public void onHdmiCecDeviceRemoved(HdmiCecDeviceInfo cecDeviceInfo) {
+ public void onHdmiCecDeviceRemoved(HdmiDeviceInfo cecDeviceInfo) {
synchronized (mLock) {
UserState userState = getUserStateLocked(mCurrentUserId);
// Broadcast the event to all hardware inputs.