corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1053889 - Handle null devices returned from Chromecast code. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston
2014-08-25 16:19:29 -07:00
parent 409dd95507
commit d34f84a6a5
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/MediaPlayerManager.java
View File

@@ -24,6 +24,8 @@ import android.util.Log;
import com.google.android.gms.cast.CastMediaControlIntent;
import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
/* Wraper for different MediaRouter types supproted by Android. i.e. Chromecast, Miracast, etc. */
interface GeckoMediaPlayer {
@@ -61,7 +63,7 @@ class MediaPlayerManager implements NativeEventListener,
private final Context context;
private final MediaRouter mediaRouter;
private final HashMap<String, GeckoMediaPlayer> displays = new HashMap<String, GeckoMediaPlayer>();
private final Map<String, GeckoMediaPlayer> displays = new HashMap<String, GeckoMediaPlayer>();
private static MediaPlayerManager instance;
@JNITarget
@@ -125,9 +127,17 @@ class MediaPlayerManager implements NativeEventListener,
if ("MediaPlayer:Get".equals(event)) {
final JSONObject result = new JSONObject();
final JSONArray disps = new JSONArray();
for (GeckoMediaPlayer disp : displays.values()) {
final Iterator<GeckoMediaPlayer> items = displays.values().iterator();
while (items.hasNext()) {
GeckoMediaPlayer disp = items.next();
try {
disps.put(disp.toJSON());
JSONObject json = disp.toJSON();
if (json == null) {
items.remove();
} else {
disps.put(json);
}
} catch(Exception ex) {
// This may happen if the device isn't a real Chromecast,
// for example Firefly casting devices.