MediaDrmBridge: guards MediaDrm.removeKeys call in case of failure.

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.AsyncTask;
@@ skipping 360 matching lines @@
         // Do not reset mHandler so that we can still post tasks back to native code.
         // Note that mNativeMediaDrmBridge may have already been reset (see destroy()).
 
         for (PendingCreateSessionData data : mPendingCreateSessionDataQueue) {
             onPromiseRejected(data.promiseId(), "Create session aborted.");
         }
         mPendingCreateSessionDataQueue.clear();
         mPendingCreateSessionDataQueue = null;
 
         for (ByteBuffer sessionId : mSessionIds.keySet()) {
-            mMediaDrm.removeKeys(sessionId.array());
+            try {
+                mMediaDrm.removeKeys(sessionId.array());
+            } catch (Exception e) {
+                Log.e(TAG, "removeKeys failed: ", e);

[xhwang, 2015/04/10 04:44:22]

add a comment with bug number

[gunsch, 2015/04/10 20:47:17]

Done.

+            }
             mMediaDrm.closeSession(sessionId.array());
             onSessionClosed(sessionId.array());
         }
         mSessionIds.clear();
         mSessionIds = null;
 
         // This session was closed in the "for" loop above.
         mMediaCryptoSession = null;
 
         if (mMediaCrypto != null) {
@@ skipping 169 matching lines @@
             onPromiseRejected(promiseId, "closeSession() called when MediaDrm is null.");
             return;
         }
 
         if (!sessionExists(sessionId)) {
             onPromiseRejected(promiseId,
                     "Invalid sessionId in closeSession(): " + bytesToHexString(sessionId));
             return;
         }
 
-        mMediaDrm.removeKeys(sessionId);
+        try {
+            mMediaDrm.removeKeys(sessionId);
+        } catch (Exception e) {
+            Log.e(TAG, "removeKeys failed: ", e);

[xhwang, 2015/04/10 04:44:22]

add a comment with bug number

[gunsch, 2015/04/10 20:47:17]

Done.

+        }
         mMediaDrm.closeSession(sessionId);
         mSessionIds.remove(ByteBuffer.wrap(sessionId));
         onPromiseResolved(promiseId);
         onSessionClosed(sessionId);
         Log.d(TAG, "Session " + bytesToHexString(sessionId) + " closed.");
     }
 
     /**
      * Update a session with response.
      *
@@ skipping 364 matching lines @@
     private native void nativeOnSessionKeysChange(long nativeMediaDrmBridge, byte[] sessionId,
             boolean hasAdditionalUsableKey, int keyStatus);
     private native void nativeOnLegacySessionError(
             long nativeMediaDrmBridge, byte[] sessionId, String errorMessage);
 
     private native void nativeOnResetDeviceCredentialsCompleted(
             long nativeMediaDrmBridge, boolean success);
 
     private static native void nativeAddKeySystemUuidMapping(String keySystem, ByteBuffer uuid);
 }