Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev

Bryan Mawhinney · Android (Google) Code Review · commit 33c0a616dbd2 · 2012-10-25T02:06:37.000-07:00
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
@@ -239,6 +239,9 @@ static String typesToString(int types) {
         if ((types & ROUTE_TYPE_LIVE_AUDIO) != 0) {
             result.append("ROUTE_TYPE_LIVE_AUDIO ");
         }
+        if ((types & ROUTE_TYPE_LIVE_VIDEO) != 0) {
+            result.append("ROUTE_TYPE_LIVE_VIDEO ");
+        }
         if ((types & ROUTE_TYPE_USER) != 0) {
             result.append("ROUTE_TYPE_USER ");
         }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,9 @@ static String typesToString(int types) {`
`239`	`239`	`if ((types & ROUTE_TYPE_LIVE_AUDIO) != 0) {`
`240`	`240`	`result.append("ROUTE_TYPE_LIVE_AUDIO ");`
`241`	`241`	`}`
	`242`	`+ if ((types & ROUTE_TYPE_LIVE_VIDEO) != 0) {`
	`243`	`+ result.append("ROUTE_TYPE_LIVE_VIDEO ");`
	`244`	`+ }`
`242`	`245`	`if ((types & ROUTE_TYPE_USER) != 0) {`
`243`	`246`	`result.append("ROUTE_TYPE_USER ");`
`244`	`247`	`}`