Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Unified Diff: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

Issue 1903343003: media: Use @MainDex for MediaDrmBridge inner classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
index 917a5f20e63f46f863faee14aaffb5ae9b7051b5..d59f025e46cf9949575b573413ed223bb4c5163e 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -12,6 +12,7 @@ import android.os.Build;
import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.MainDex;
import java.nio.ByteBuffer;
import java.util.ArrayDeque;
@@ -89,6 +90,7 @@ public class MediaDrmBridge {
/**
* An equivalent of MediaDrm.KeyStatus, which is only available on M+.
*/
+ @MainDex
private static class KeyStatus {
private final byte[] mKeyId;
private final int mStatusCode;
@@ -122,6 +124,7 @@ public class MediaDrmBridge {
/**
* This class contains data needed to call createSession().
*/
+ @MainDex
private static class PendingCreateSessionData {
private final byte[] mInitData;
private final String mMimeType;
@@ -913,6 +916,7 @@ public class MediaDrmBridge {
}
}
+ @MainDex
private class EventListener implements MediaDrm.OnEventListener {
@Override
public void onEvent(
@@ -976,6 +980,7 @@ public class MediaDrmBridge {
}
@TargetApi(Build.VERSION_CODES.M)
+ @MainDex
private class KeyStatusChangeListener implements MediaDrm.OnKeyStatusChangeListener {
private List<KeyStatus> getKeysInfo(List<MediaDrm.KeyStatus> keyInformation) {
List<KeyStatus> keysInfo = new ArrayList<KeyStatus>();
@@ -995,6 +1000,7 @@ public class MediaDrmBridge {
}
@TargetApi(Build.VERSION_CODES.M)
+ @MainDex
private class ExpirationUpdateListener implements MediaDrm.OnExpirationUpdateListener {
@Override
public void onExpirationUpdate(MediaDrm md, byte[] sessionId, long expirationTime) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698