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

Hook up system audio mode

Browse Source 
Whenever system audio mode is changed, it should notify to AudioManager
so that AudioManager changes internal output or mute status accordingly.
To have more clear cut between last setting and current system audio mode,
renamed mSystemAudioMode into mSystemAudioActivated and added
getLastSystemAudioMode() which returns last system audio mode value stored
in global settings (NVM).

Bug: 16002150
Change-Id: I5d01d879c1c5a9a3f4b0cf2d25e9e74c26c52fa0
This commit is contained in:
Jungshik Jang
2014-07-15 15:49:02 +09:00
parent 12307ca810
commit 377dcbd53a
7 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -21,9 +21,6 @@ import android.hardware.hdmi.HdmiCecDeviceInfo;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.IHdmiControlCallback;
import android.media.AudioManager;
import android.media.AudioManager.OnAudioPortUpdateListener;
import android.media.AudioPatch;
import android.media.AudioPort;
import android.media.AudioSystem;
import android.os.RemoteException;
import android.os.SystemProperties;
@@ -56,9 +53,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// Whether ARC feature is enabled or not.
private boolean mArcFeatureEnabled = false;
// Whether SystemAudioMode is "On" or not.
// Whether System audio mode is activated or not.
// This becomes true only when all system audio sequences are finished.
@GuardedBy("mLock")
private boolean mSystemAudioMode;
private boolean mSystemAudioActivated = false;
// The previous port id (input) before switching to the new one. This is remembered in order to
// be able to switch to it upon receiving <Inactive Source> from currently active source.
@@ -108,11 +106,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
mAddress, mService.getPhysicalAddress(), mDeviceType));
mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
mAddress, mService.getVendorId()));
mSystemAudioMode = mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, false);
launchRoutingControl(fromBootup);
launchDeviceDiscovery();
registerAudioPortUpdateListener();
// TODO: unregister audio port update listener if local device is released.
}
@Override
@@ -130,30 +125,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_TV, String.valueOf(addr));
}
private void registerAudioPortUpdateListener() {
mService.getAudioManager().registerAudioPortUpdateListener(
new OnAudioPortUpdateListener() {
@Override
public void OnAudioPatchListUpdate(AudioPatch[] patchList) {}
@Override
public void OnAudioPortListUpdate(AudioPort[] portList) {
if (!mSystemAudioMode) {
return;
}
int devices = mService.getAudioManager().getDevicesForStream(
AudioSystem.STREAM_MUSIC);
if ((devices & ~AudioSystem.DEVICE_ALL_HDMI_SYSTEM_AUDIO_AND_SPEAKER)
!= 0) {
// TODO: release system audio here.
}
}
@Override
public void OnServiceDied() {}
});
}
/**
* Performs the action 'device select', or 'one touch play' initiated by TV.
*
@@ -565,7 +536,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// If there is AVR, initiate System Audio Auto initiation action,
// which turns on and off system audio according to last system
// audio setting.
if (mSystemAudioMode && getAvrDeviceInfo() != null) {
if (mSystemAudioActivated && getAvrDeviceInfo() != null) {
addAndStartAction(new SystemAudioAutoInitiationAction(
HdmiCecLocalDeviceTv.this,
getAvrDeviceInfo().getLogicalAddress()));
@@ -608,21 +579,34 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// # Seq 25
void setSystemAudioMode(boolean on, boolean updateSetting) {
if (updateSetting) {
mService.writeBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, on);
}
updateAudioManagerForSystemAudio(on);
synchronized (mLock) {
if (on != mSystemAudioMode) {
mSystemAudioMode = on;
if (updateSetting) {
mService.writeBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, on);
}
if (mSystemAudioActivated != on) {
mSystemAudioActivated = on;
mService.announceSystemAudioModeChange(on);
}
}
}
boolean getSystemAudioMode() {
synchronized (mLock) {
return mSystemAudioMode;
private void updateAudioManagerForSystemAudio(boolean on) {
// TODO: remove output device, once update AudioManager api.
mService.getAudioManager().setHdmiSystemAudioSupported(on);
}
boolean isSystemAudioActivated() {
if (getAvrDeviceInfo() == null) {
return false;
}
synchronized (mLock) {
return mSystemAudioActivated;
}
}
boolean getSystemAudioModeSetting() {
return mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, false);
}
/**
@@ -722,7 +706,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
void changeVolume(int curVolume, int delta, int maxVolume) {
assertRunOnServiceThread();
if (delta == 0 || !isSystemAudioOn()) {
if (delta == 0 || !isSystemAudioActivated()) {
return;
}
@@ -750,7 +734,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
void changeMute(boolean mute) {
assertRunOnServiceThread();
if (!isSystemAudioOn()) {
if (!isSystemAudioActivated()) {
return;
}
@@ -761,12 +745,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
}
private boolean isSystemAudioOn() {
if (getAvrDeviceInfo() == null) {
return false;
}
synchronized (mLock) {
return mSystemAudioMode;
return mSystemAudioActivated;
}
}

2
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -827,7 +827,7 @@ public final class HdmiControlService extends SystemService {
if (tv == null) {
return false;
}
return tv.getSystemAudioMode();
return tv.isSystemAudioActivated();
}
@Override

2
services/core/java/com/android/server/hdmi/HotplugDetectionAction.java
View File

@@ -108,7 +108,7 @@ final class HotplugDetectionAction extends FeatureAction {
if (mTimeoutCount == 0) {
pollAllDevices();
} else {
if (tv().getSystemAudioMode()) {
if (tv().isSystemAudioActivated()) {
pollAudioSystem();
}
}

2
services/core/java/com/android/server/hdmi/NewDeviceAction.java
View File

@@ -158,7 +158,7 @@ final class NewDeviceAction extends FeatureAction {
if (HdmiUtils.getTypeFromAddress(mDeviceLogicalAddress)
== HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {
if (tv().getSystemAudioMode()) {
if (tv().getSystemAudioModeSetting()) {
addAndStartAction(new SystemAudioAutoInitiationAction(localDevice(),
mDeviceLogicalAddress));
}

2
services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java
View File

@@ -48,7 +48,7 @@ final class SystemAudioActionFromAvr extends SystemAudioAction {
}
private void handleSystemAudioActionFromAvr() {
if (mTargetAudioStatus == tv().getSystemAudioMode()) {
if (mTargetAudioStatus == tv().isSystemAudioActivated()) {
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
return;
}

4
services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
View File

@@ -73,7 +73,7 @@ final class SystemAudioAutoInitiationAction extends FeatureAction {
private void handleSystemAudioModeStatusMessage() {
// If the last setting is system audio, turn on system audio whatever AVR status is.
if (tv().getSystemAudioMode()) {
if (tv().getSystemAudioModeSetting()) {
if (canChangeSystemAudio()) {
addAndStartAction(new SystemAudioActionFromTv(tv(), mAvrAddress, true, null));
}
@@ -102,7 +102,7 @@ final class SystemAudioAutoInitiationAction extends FeatureAction {
}
private void handleSystemAudioModeStatusTimeout() {
if (tv().getSystemAudioMode()) {
if (tv().getSystemAudioModeSetting()) {
if (canChangeSystemAudio()) {
addAndStartAction(new SystemAudioActionFromTv(tv(), mAvrAddress, true, null));
}

4
services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java
View File

@@ -68,7 +68,7 @@ final class SystemAudioStatusAction extends FeatureAction {
// the audio amplifier is unknown.
tv().setAudioStatus(false, Constants.UNKNOWN_VOLUME);
int uiCommand = tv().getSystemAudioMode()
int uiCommand = tv().isSystemAudioActivated()
? HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION // SystemAudioMode: ON
: HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION; // SystemAudioMode: OFF
sendUserControlPressedAndReleased(mAvrAddress, uiCommand);
@@ -98,7 +98,7 @@ final class SystemAudioStatusAction extends FeatureAction {
int volume = params[0] & 0x7F;
tv().setAudioStatus(mute, volume);
if ((tv().getSystemAudioMode() && mute) || (!tv().getSystemAudioMode() && !mute)) {
if (!(tv().isSystemAudioActivated() ^ mute)) {
// Toggle AVR's mute status to match with the system audio status.
sendUserControlPressedAndReleased(mAvrAddress, HdmiCecKeycode.CEC_KEYCODE_MUTE);
}