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

Reuse setSystemAudioMode() in terminateSystemAudioMode()

Browse Source 
Bug: 80296770
Test: atest com.android.server.hdmi
Change-Id: I12244fd8bdd8b0a15f5abde498f9b6ae2831a03a
This commit is contained in:
Shubang
2018-07-19 16:41:17 -07:00
parent 2fd186ea71
commit bc2aab3e0f
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
View File

@@ -66,11 +66,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,
mSystemAudioActivated ? "true" : "false");
}
if (setSystemAudioMode(false)) {
mService.sendCecCommand(
HdmiCecMessageBuilder.buildSetSystemAudioMode(
mAddress, Constants.ADDR_BROADCAST, false));
}
terminateSystemAudioMode();
}
@Override
@@ -335,31 +331,15 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
protected void terminateSystemAudioMode() {
// remove pending initiation actions
removeAction(SystemAudioInitiationActionFromAvr.class);
synchronized (mLock) {
if (!mSystemAudioActivated) {
return;
}
if (!isSystemAudioActivated()) {
return;
}
// send <Set System Audio Mode> [“Off”]
mService.sendCecCommand(
HdmiCecMessageBuilder.buildSetSystemAudioMode(
mAddress, Constants.ADDR_BROADCAST, false));
// mute speaker
if (!mService.getAudioManager().isStreamMute(AudioManager.STREAM_MUSIC)) {
mService.getAudioManager()
.adjustStreamVolume(
AudioManager.STREAM_MUSIC,
AudioManager.ADJUST_MUTE,
0);
}
mSystemAudioSource = null;
synchronized (mLock) {
mSystemAudioActivated = false;
mService.announceSystemAudioModeChange(false);
if (setSystemAudioMode(false)) {
// send <Set System Audio Mode> [“Off”]
mService.sendCecCommand(
HdmiCecMessageBuilder.buildSetSystemAudioMode(
mAddress, Constants.ADDR_BROADCAST, false));
}
}