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

am 4de8368e: am d0d188e5: Merge "Remove unnecessary warning." into lmp-dev

Browse Source 
* commit '4de8368e1e9eb9499c82202d95bf19f5d2d14562':
  Remove unnecessary warning.
This commit is contained in:
Jungshik Jang
2014-09-15 02:58:08 +00:00
committed by Android Git Automerger
parent 189a3e7eaf 65e6e76900
commit 6cbc5d741f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -732,7 +732,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
}
private void updateAudioManagerForSystemAudio(boolean on) {
mService.getAudioManager().setHdmiSystemAudioSupported(on);
int device = mService.getAudioManager().setHdmiSystemAudioSupported(on);
HdmiLogger.debug("[A]UpdateSystemAudio mode[on=%b] output=[%X]", on, device);
}
boolean isSystemAudioActivated() {
@@ -756,6 +757,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
boolean setArcStatus(boolean enabled) {
assertRunOnServiceThread();
HdmiLogger.debug("Set Arc Status[old:%b new:%b]", mArcEstablished, enabled);
boolean oldStatus = mArcEstablished;
// 1. Enable/disable ARC circuit.
mService.setAudioReturnChannel(enabled);
@@ -885,7 +888,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly
void changeMute(boolean mute) {
assertRunOnServiceThread();
HdmiLogger.debug("[A]:Change mute:%b", mute);
if (!isSystemAudioActivated()) {
HdmiLogger.debug("[A]:System audio is not activated.");
return;
}

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

@@ -67,8 +67,6 @@ abstract class RequestArcAction extends HdmiCecFeatureAction {
} else {
return false;
}
default:
Slog.w(TAG, "Unsupported opcode:" + cmd.toString());
}
return false;
}