Release fixes

library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java

@@ -15,6 +15,7 @@
  */
  */
 package com.google.android.exoplayer2.drm;
 package com.google.android.exoplayer2.drm;
 
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.annotation.TargetApi;
 import android.media.DeniedByServerException;
 import android.media.DeniedByServerException;
 import android.media.MediaCrypto;
 import android.media.MediaCrypto;
@@ -64,6 +65,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     }
     }
   }
   }
 
 
+  @SuppressLint("WrongConstant")
   private FrameworkMediaDrm(UUID uuid) throws UnsupportedSchemeException {
   private FrameworkMediaDrm(UUID uuid) throws UnsupportedSchemeException {
     Assertions.checkNotNull(uuid);
     Assertions.checkNotNull(uuid);
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");

library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java

@@ -18,6 +18,7 @@ package com.google.android.exoplayer2;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assert.fail;
 
 
+import android.support.annotation.Nullable;
 import android.view.Surface;
 import android.view.Surface;
 import com.google.android.exoplayer2.Player.DefaultEventListener;
 import com.google.android.exoplayer2.Player.DefaultEventListener;
 import com.google.android.exoplayer2.Player.EventListener;
 import com.google.android.exoplayer2.Player.EventListener;