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

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

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 2c5adf3846b12b306d3216d897de187735c537b9..627c0715bcb3da7ef4f0b95dbd334b9b60a95091 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -378,7 +378,11 @@ public class MediaDrmBridge {
         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());
         }
@@ -568,7 +572,11 @@ public class MediaDrmBridge {
             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);