diff options
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index f3a1e46bc1e4..c5eccdf57e73 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -1392,11 +1392,15 @@ public class HdmiControlService extends SystemService { } @Override + @Nullable public HdmiDeviceInfo getActiveSource() { enforceAccessPermission(); HdmiCecLocalDeviceTv tv = tv(); if (tv == null) { - Slog.w(TAG, "Local tv device not available"); + if (isTvDevice()) { + Slog.e(TAG, "Local tv device not available."); + return null; + } if (isPlaybackDevice()) { // if playback device itself is the active source, // return its own device info. @@ -1457,7 +1461,10 @@ public class HdmiControlService extends SystemService { HdmiControlService.this, deviceId, callback)); return; } - Slog.w(TAG, "Local tv device not available"); + if (isTvDevice()) { + Slog.e(TAG, "Local tv device not available"); + return; + } invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE); return; } |