Fix crash running ExoPlayer demo on JB. My bad!

- We can't refer to UnsupportedSchemeException outside of the
V18 compat inner classes.
- There were also a few missing return; calls.

demo/src/main/java/com/google/android/exoplayer/demo/full/player/DashRendererBuilder.java

@@ -163,12 +163,8 @@ public class DashRendererBuilder implements RendererBuilder,
         // HD streams require L1 security.
         // HD streams require L1 security.
         filterHdContent = videoAdaptationSet != null && videoAdaptationSet.hasContentProtection()
         filterHdContent = videoAdaptationSet != null && videoAdaptationSet.hasContentProtection()
             && !drmSessionManagerData.second;
             && !drmSessionManagerData.second;
-      } catch (UnsupportedSchemeException e) {
-        callback.onRenderersError(
-            new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME, e));
-      } catch (Exception e) {
-        callback.onRenderersError(
-            new UnsupportedDrmException(UnsupportedDrmException.REASON_UNKNOWN, e));
+      } catch (UnsupportedDrmException e) {
+        callback.onRenderersError(e);
         return;
         return;
       }
       }
     }
     }
@@ -328,12 +324,18 @@ public class DashRendererBuilder implements RendererBuilder,
   private static class V18Compat {
   private static class V18Compat {
 
 
     public static Pair<DrmSessionManager, Boolean> getDrmSessionManagerData(DemoPlayer player,
     public static Pair<DrmSessionManager, Boolean> getDrmSessionManagerData(DemoPlayer player,
-        MediaDrmCallback drmCallback) throws UnsupportedSchemeException {
+        MediaDrmCallback drmCallback) throws UnsupportedDrmException {
+      try {
         StreamingDrmSessionManager streamingDrmSessionManager = new StreamingDrmSessionManager(
         StreamingDrmSessionManager streamingDrmSessionManager = new StreamingDrmSessionManager(
             DemoUtil.WIDEVINE_UUID, player.getPlaybackLooper(), drmCallback, null,
             DemoUtil.WIDEVINE_UUID, player.getPlaybackLooper(), drmCallback, null,
             player.getMainHandler(), player);
             player.getMainHandler(), player);
         return Pair.create((DrmSessionManager) streamingDrmSessionManager,
         return Pair.create((DrmSessionManager) streamingDrmSessionManager,
             getWidevineSecurityLevel(streamingDrmSessionManager) == SECURITY_LEVEL_1);
             getWidevineSecurityLevel(streamingDrmSessionManager) == SECURITY_LEVEL_1);
+      } catch (UnsupportedSchemeException e) {
+        throw new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME);
+      } catch (Exception e) {
+        throw new UnsupportedDrmException(UnsupportedDrmException.REASON_UNKNOWN, e);
+      }
     }
     }
 
 
     private static int getWidevineSecurityLevel(StreamingDrmSessionManager sessionManager) {
     private static int getWidevineSecurityLevel(StreamingDrmSessionManager sessionManager) {

demo/src/main/java/com/google/android/exoplayer/demo/full/player/SmoothStreamingRendererBuilder.java

@@ -118,12 +118,8 @@ public class SmoothStreamingRendererBuilder implements RendererBuilder,
       try {
       try {
         drmSessionManager = V18Compat.getDrmSessionManager(manifest.protectionElement.uuid, player,
         drmSessionManager = V18Compat.getDrmSessionManager(manifest.protectionElement.uuid, player,
             drmCallback);
             drmCallback);
-      } catch (UnsupportedSchemeException e) {
-        callback.onRenderersError(
-            new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME, e));
-      } catch (Exception e) {
-        callback.onRenderersError(
-            new UnsupportedDrmException(UnsupportedDrmException.REASON_UNKNOWN, e));
+      } catch (UnsupportedDrmException e) {
+        callback.onRenderersError(e);
         return;
         return;
       }
       }
     }
     }
@@ -259,9 +255,15 @@ public class SmoothStreamingRendererBuilder implements RendererBuilder,
   private static class V18Compat {
   private static class V18Compat {
 
 
     public static DrmSessionManager getDrmSessionManager(UUID uuid, DemoPlayer player,
     public static DrmSessionManager getDrmSessionManager(UUID uuid, DemoPlayer player,
-        MediaDrmCallback drmCallback) throws UnsupportedSchemeException {
+        MediaDrmCallback drmCallback) throws UnsupportedDrmException {
+      try {
         return new StreamingDrmSessionManager(uuid, player.getPlaybackLooper(), drmCallback, null,
         return new StreamingDrmSessionManager(uuid, player.getPlaybackLooper(), drmCallback, null,
             player.getMainHandler(), player);
             player.getMainHandler(), player);
+      } catch (UnsupportedSchemeException e) {
+        throw new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME);
+      } catch (Exception e) {
+        throw new UnsupportedDrmException(UnsupportedDrmException.REASON_UNKNOWN, e);
+      }
     }
     }
 
 
   }
   }