diff options
| author | Adam Powell <adamp@google.com> | 2012-06-18 12:13:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 12:13:57 -0700 |
| commit | 987f4a504aa90a99bc4930fe9ee35c52907bca80 (patch) | |
| tree | 89f899b33210333e36d43ccbdf018f35004d50e0 /media/java | |
| parent | 3281c38ec4bf53731df2ccc18f65b469ee52720b (diff) | |
| parent | 12c2fbd3b7e98132fe1388b065a5dd09c20ef390 (diff) | |
| download | frameworks_base-987f4a504aa90a99bc4930fe9ee35c52907bca80.zip frameworks_base-987f4a504aa90a99bc4930fe9ee35c52907bca80.tar.gz frameworks_base-987f4a504aa90a99bc4930fe9ee35c52907bca80.tar.bz2 | |
am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
* commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
Restrict MediaRouter selection
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 715e752..6f9cc62 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -276,6 +276,7 @@ public class MediaRouter { Log.w(TAG, "selectRoute ignored; cannot select route with supported types " + typesToString(route.getSupportedTypes()) + " into route types " + typesToString(types)); + return; } if (sStatic.mSelectedRoute != null) { |