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

am 86226886: Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.

Browse Source 
* commit '862268860939a8d5002402ceaa4629cf238b8494':
  Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
This commit is contained in:
Jungshik Jang
2014-08-11 05:39:30 +00:00
committed by Android Git Automerger
parent 82828dd99f 1f819bbfc8
commit 40bcb409f3
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -28,6 +28,7 @@ import android.hardware.hdmi.IHdmiControlService;
import android.hardware.hdmi.IHdmiDeviceEventListener;
import android.hardware.hdmi.IHdmiHotplugEventListener;
import android.hardware.hdmi.IHdmiInputChangeListener;
import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener;
import android.media.AudioDevicePort;
import android.media.AudioFormat;
import android.media.AudioGain;
@@ -93,6 +94,8 @@ class TvInputHardwareManager implements TvInputHal.Callback {
new HdmiHotplugEventListener();
private final IHdmiDeviceEventListener mHdmiDeviceEventListener = new HdmiDeviceEventListener();
private final IHdmiInputChangeListener mHdmiInputChangeListener = new HdmiInputChangeListener();
private final IHdmiSystemAudioModeChangeListener mHdmiSystemAudioModeChangeListener =
new HdmiSystemAudioModeChangeListener();
// TODO: Should handle STANDBY case.
private final SparseBooleanArray mHdmiStateMap = new SparseBooleanArray();
private final List<Message> mPendingHdmiDeviceEvents = new LinkedList<>();
@@ -117,6 +120,8 @@ class TvInputHardwareManager implements TvInputHal.Callback {
try {
mHdmiControlService.addHotplugEventListener(mHdmiHotplugEventListener);
mHdmiControlService.addDeviceEventListener(mHdmiDeviceEventListener);
mHdmiControlService.addSystemAudioModeChangeListener(
mHdmiSystemAudioModeChangeListener);
mHdmiDeviceList.addAll(mHdmiControlService.getInputDevices());
mHdmiControlService.setInputChangeListener(mHdmiInputChangeListener);
} catch (RemoteException e) {
@@ -615,7 +620,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
int sinkDevice = mAudioManager.getDevicesForStream(AudioManager.STREAM_MUSIC);
for (AudioPort port : devicePorts) {
AudioDevicePort devicePort = (AudioDevicePort) port;
if (devicePort.type() == sinkDevice) {
if ((devicePort.type() & sinkDevice) != 0) {
return devicePort;
}
}
@@ -838,6 +843,13 @@ class TvInputHardwareManager implements TvInputHal.Callback {
}
}
private void handleAudioSinkUpdated() {
synchronized (mImplLock) {
updateAudioSinkLocked();
updateAudioPatchLocked();
}
}
@Override
public void overrideAudioSink(int audioType, String audioAddress, int samplingRate,
int channelMask, int format) {
@@ -1006,4 +1018,17 @@ class TvInputHardwareManager implements TvInputHal.Callback {
}
}
}
private final class HdmiSystemAudioModeChangeListener extends
IHdmiSystemAudioModeChangeListener.Stub {
@Override
public void onStatusChanged(boolean enabled) throws RemoteException {
synchronized (mLock) {
for (int i = 0; i < mConnections.size(); ++i) {
TvInputHardwareImpl impl = mConnections.valueAt(i).getHardwareImplLocked();
impl.handleAudioSinkUpdated();
}
}
}
}
}