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

Merge "MediaRouter: Add more logs for debugging" into nyc-dev

Browse Source
This commit is contained in:
Jae Seo
2016-05-09 16:39:50 +00:00
committed by Android (Google) Code Review
parent 8e96faae78 18687b7a27
commit 99aa441581
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/AudioRoutesInfo.java
View File

@@ -53,6 +53,23 @@ public class AudioRoutesInfo implements Parcelable {
return 0;
}
@Override
public String toString() {
return getClass().getSimpleName() + "{ type=" + typeToString(mainType)
+ (TextUtils.isEmpty(bluetoothName) ? "" : ", bluetoothName=" + bluetoothName)
+ " }";
}
private static String typeToString(int type) {
if (type == MAIN_SPEAKER) return "SPEAKER";
if ((type & MAIN_HEADSET) != 0) return "HEADSET";
if ((type & MAIN_HEADPHONES) != 0) return "HEADPHONES";
if ((type & MAIN_DOCK_SPEAKERS) != 0) return "DOCK_SPEAKERS";
if ((type & MAIN_HDMI) != 0) return "HDMI";
if ((type & MAIN_USB) != 0) return "USB";
return Integer.toHexString(type);
}
@Override
public void writeToParcel(Parcel dest, int flags) {
TextUtils.writeToParcel(bluetoothName, dest, flags);

5
media/java/android/media/MediaRouter.java
View File

@@ -176,6 +176,7 @@ public class MediaRouter {
}
void updateAudioRoutes(AudioRoutesInfo newRoutes) {
Log.v(TAG, "Updating audio routes: " + newRoutes);
if (newRoutes.mainType != mCurAudioRoutesInfo.mainType) {
mCurAudioRoutesInfo.mainType = newRoutes.mainType;
int name;
@@ -905,6 +906,7 @@ public class MediaRouter {
}
static void selectRouteStatic(int types, @NonNull RouteInfo route, boolean explicit) {
Log.v(TAG, "Selecting route: " + route);
assert(route != null);
final RouteInfo oldRoute = sStatic.mSelectedRoute;
if (oldRoute == route) return;
@@ -1007,6 +1009,7 @@ public class MediaRouter {
}
static void addRouteStatic(RouteInfo info) {
Log.v(TAG, "Adding route: " + info);
final RouteCategory cat = info.getCategory();
if (!sStatic.mCategories.contains(cat)) {
sStatic.mCategories.add(cat);
@@ -1061,6 +1064,7 @@ public class MediaRouter {
}
static void removeRouteStatic(RouteInfo info) {
Log.v(TAG, "Removing route: " + info);
if (sStatic.mRoutes.remove(info)) {
final RouteCategory removingCat = info.getCategory();
final int count = sStatic.mRoutes.size();
@@ -1210,6 +1214,7 @@ public class MediaRouter {
}
static void dispatchRouteChanged(RouteInfo info, int oldSupportedTypes) {
Log.v(TAG, "Dispatching route change: " + info);
final int newSupportedTypes = info.mSupportedTypes;
for (CallbackInfo cbi : sStatic.mCallbacks) {
// Reconstruct some of the history for callbacks that may not have observed