media: Use @MainDex for MediaDrmBridge inner classes

media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.annotation.TargetApi;
 import android.media.MediaCrypto;
 import android.media.MediaDrm;
 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;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
 /**
@@ skipping 57 matching lines @@
     private ArrayDeque<PendingCreateSessionData> mPendingCreateSessionDataQueue;
 
     private boolean mResetDeviceCredentialsPending;
 
     // MediaDrmBridge is waiting for provisioning response from the server.
     private boolean mProvisioningPending;
 
     /**
      *  An equivalent of MediaDrm.KeyStatus, which is only available on M+.
      */
+    @MainDex
     private static class KeyStatus {
         private final byte[] mKeyId;
         private final int mStatusCode;
 
         private KeyStatus(byte[] keyId, int statusCode) {
             mKeyId = keyId;
             mStatusCode = statusCode;
         }
 
         @CalledByNative("KeyStatus")
@@ skipping 13 matching lines @@
      */
     private static List<KeyStatus> getDummyKeysInfo(int statusCode) {
         List<KeyStatus> keysInfo = new ArrayList<KeyStatus>();
         keysInfo.add(new KeyStatus(DUMMY_KEY_ID, statusCode));
         return keysInfo;
     }
 
     /**
      *  This class contains data needed to call createSession().
      */
+    @MainDex
     private static class PendingCreateSessionData {
         private final byte[] mInitData;
         private final String mMimeType;
         private final HashMap<String, String> mOptionalParameters;
         private final long mPromiseId;
 
         private PendingCreateSessionData(byte[] initData, String mimeType,
                 HashMap<String, String> optionalParameters, long promiseId) {
             mInitData = initData;
             mMimeType = mimeType;
@@ skipping 771 matching lines @@
             nativeOnLegacySessionError(mNativeMediaDrmBridge, sessionId, errorMessage);
         }
     }
 
     private void onResetDeviceCredentialsCompleted(final boolean success) {
         if (isNativeMediaDrmBridgeValid()) {
             nativeOnResetDeviceCredentialsCompleted(mNativeMediaDrmBridge, success);
         }
     }
 
+    @MainDex
     private class EventListener implements MediaDrm.OnEventListener {
         @Override
         public void onEvent(
                 MediaDrm mediaDrm, byte[] sessionId, int event, int extra, byte[] data) {
             if (sessionId == null) {
                 Log.e(TAG, "EventListener: Null session.");
                 return;
             }
             if (!sessionExists(sessionId)) {
                 Log.e(TAG, "EventListener: Invalid session %s", bytesToHexString(sessionId));
@@ skipping 43 matching lines @@
                     assert false;  // Should never happen.
                     break;
                 default:
                     Log.e(TAG, "Invalid DRM event " + event);
                     return;
             }
         }
     }
 
     @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>();
             for (MediaDrm.KeyStatus keyStatus : keyInformation) {
                 keysInfo.add(new KeyStatus(keyStatus.getKeyId(), keyStatus.getStatusCode()));
             }
             return keysInfo;
         }
 
         @Override
         public void onKeyStatusChange(MediaDrm md, byte[] sessionId,
                 List<MediaDrm.KeyStatus> keyInformation, boolean hasNewUsableKey) {
             Log.d(TAG, "KeysStatusChange: " + bytesToHexString(sessionId) + ", " + hasNewUsableKey);
 
             onSessionKeysChange(sessionId, getKeysInfo(keyInformation).toArray(), hasNewUsableKey);
         }
     }
 
     @TargetApi(Build.VERSION_CODES.M)
+    @MainDex
     private class ExpirationUpdateListener implements MediaDrm.OnExpirationUpdateListener {
         @Override
         public void onExpirationUpdate(MediaDrm md, byte[] sessionId, long expirationTime) {
             Log.d(TAG, "ExpirationUpdate: " + bytesToHexString(sessionId) + ", " + expirationTime);
             onSessionExpirationUpdate(sessionId, expirationTime);
         }
     }
 
     // Native functions. At the native side, must post the task immediately to
     // avoid reentrancy issues.
@@ skipping 15 matching lines @@
     private native void nativeOnSessionKeysChange(long nativeMediaDrmBridge, byte[] sessionId,
             Object[] keysInfo, boolean hasAdditionalUsableKey);
     private native void nativeOnSessionExpirationUpdate(
             long nativeMediaDrmBridge, byte[] sessionId, long expirationTime);
     private native void nativeOnLegacySessionError(
             long nativeMediaDrmBridge, byte[] sessionId, String errorMessage);
 
     private native void nativeOnResetDeviceCredentialsCompleted(
             long nativeMediaDrmBridge, boolean success);
 }