From 4d3551a398e16b32420c04722775009cc35f4912 Mon Sep 17 00:00:00 2001 From: Amy Date: Wed, 23 Jan 2019 14:17:50 -0800 Subject: Fix log spam "Local tv device not available". Test: manual Bug: 120249926 Change-Id: I07771a2595d1196a773206157444013da4d13b46 (cherry picked from commit 4d3f84608a1e733125286a4b68df188a6bf1da37) --- .../core/java/com/android/server/hdmi/HdmiControlService.java | 11 +++++++++-- 1 file 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; } -- cgit v1.2.3-59-g8ed1b