From 5ff55ec27864c131759a4b7cadf8d0b731164dc9 Mon Sep 17 00:00:00 2001 From: Kyunglyul Hyun Date: Mon, 18 May 2020 16:37:43 +0900 Subject: [PATCH] Log info on system route provider This CL logs provider info and session info of the system route provider for debugging purpose. Set DEBUG = true to gather logs for a while. Bug: 156723680 Test: manually checking log Change-Id: I4b020e951ff3b5bd7350cc733c822c702526e260 --- .../server/media/SystemMediaRoute2Provider.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java index fdee9f86bfafa..d7e724780c94a 100644 --- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java +++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java @@ -45,7 +45,7 @@ import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; import android.text.TextUtils; -import android.util.Log; +import android.util.Slog; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; @@ -58,7 +58,8 @@ import java.util.Objects; // TODO: check thread safety. We may need to use lock to protect variables. class SystemMediaRoute2Provider extends MediaRoute2Provider { private static final String TAG = "MR2SystemProvider"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + // TODO(b/156996903): Revert it when releasing the framework. + private static final boolean DEBUG = true; static final String DEFAULT_ROUTE_ID = "DEFAULT_ROUTE"; static final String DEVICE_ROUTE_ID = "DEVICE_ROUTE"; @@ -269,7 +270,11 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { builder.addRoute(route); } } - setProviderState(builder.build()); + MediaRoute2ProviderInfo providerInfo = builder.build(); + setProviderState(providerInfo); + if (DEBUG) { + Slog.d(TAG, "Updating system provider info : " + providerInfo); + } } /** @@ -327,6 +332,9 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { if (Objects.equals(oldSessionInfo, newSessionInfo)) { return false; } else { + if (DEBUG) { + Slog.d(TAG, "Updating system routing session info : " + newSessionInfo); + } mSessionInfos.clear(); mSessionInfos.add(newSessionInfo); mDefaultSessionInfo = new RoutingSessionInfo.Builder(