summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorBryan Mawhinney <bryanmawhinney@google.com>2012-10-25 02:06:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-25 02:06:37 -0700
commit33c0a616dbd284b47cc8e6af2eec358fba7c701f (patch)
treed9b43259cf9b91e0ac2b214057475a63afe2e201 /media
parentead7d90e8b049c9689560015dbb761242fd86c99 (diff)
parent2bb7c122ef6ce8539dfbaeb3292adcd942185f82 (diff)
downloadframeworks_base-33c0a616dbd284b47cc8e6af2eec358fba7c701f.zip
frameworks_base-33c0a616dbd284b47cc8e6af2eec358fba7c701f.tar.gz
frameworks_base-33c0a616dbd284b47cc8e6af2eec358fba7c701f.tar.bz2
Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaRouter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 82ed432..e08d494 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -239,6 +239,9 @@ public class MediaRouter {
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 ");
}