Merge "Remove log spam in MediaRouter"
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 70ab863..d5afd9a 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -610,7 +610,9 @@
&& mSelectedRoute != mBluetoothA2dpRoute)) {
return;
}
- Log.v(TAG, "onRestoreRoute() : route=" + mSelectedRoute);
+ if (DEBUG) {
+ Log.d(TAG, "onRestoreRoute() : route=" + mSelectedRoute);
+ }
mSelectedRoute.select();
}
});
@@ -965,19 +967,6 @@
&& (route == btRoute || route == sStatic.mDefaultAudioVideo)) {
try {
sStatic.mAudioService.setBluetoothA2dpOn(route == btRoute);
- // TODO: Remove the following logging when no longer needed.
- if (route != btRoute) {
- StackTraceElement[] callStack = Thread.currentThread().getStackTrace();
- StringBuffer sb = new StringBuffer();
- // callStack[3] is the caller of this method.
- for (int i = 3; i < callStack.length; i++) {
- StackTraceElement caller = callStack[i];
- sb.append(caller.getClassName() + "." + caller.getMethodName()
- + ":" + caller.getLineNumber()).append(" ");
- }
- Log.w(TAG, "Default route is selected while a BT route is available: pkgName="
- + sStatic.mPackageName + ", callers=" + sb.toString());
- }
} catch (RemoteException e) {
Log.e(TAG, "Error changing Bluetooth A2DP state", e);
}
@@ -1064,7 +1053,9 @@
}
static void addRouteStatic(RouteInfo info) {
- Log.v(TAG, "Adding route: " + info);
+ if (DEBUG) {
+ Log.d(TAG, "Adding route: " + info);
+ }
final RouteCategory cat = info.getCategory();
if (!sStatic.mCategories.contains(cat)) {
sStatic.mCategories.add(cat);
@@ -1119,7 +1110,9 @@
}
static void removeRouteStatic(RouteInfo info) {
- Log.v(TAG, "Removing route: " + info);
+ if (DEBUG) {
+ Log.d(TAG, "Removing route: " + info);
+ }
if (sStatic.mRoutes.remove(info)) {
final RouteCategory removingCat = info.getCategory();
final int count = sStatic.mRoutes.size();
diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index a7df0e2..3eb7321 100644
--- a/services/core/java/com/android/server/media/MediaRouterService.java
+++ b/services/core/java/com/android/server/media/MediaRouterService.java
@@ -414,7 +414,9 @@
}
// We don't need to change a2dp status when bluetooth is not connected.
if (btDevice != null) {
- Slog.v(TAG, "restoreBluetoothA2dp(" + a2dpOn + ")");
+ if (DEBUG) {
+ Slog.d(TAG, "restoreBluetoothA2dp(" + a2dpOn + ")");
+ }
mAudioService.setBluetoothA2dpOn(a2dpOn);
}
} catch (RemoteException e) {