diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-06-25 17:25:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-25 03:38:12 +0000 |
| commit | 489e969ea8162ab3b591496185c5bb30a2d41831 (patch) | |
| tree | e1e5154aa967363f29b3cfdade6d08fe71a7e9b1 /media | |
| parent | 21f72d39fdcd06983f7460f2c2e82d9287549915 (diff) | |
| parent | ff5cc0c2da010845caeb2b88b0b294c6ccfc2c2d (diff) | |
| download | chromium_org-489e969ea8162ab3b591496185c5bb30a2d41831.tar.gz | |
Merge "Handle ResourceBusyException from MediaDrm.openSession"
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 e890236105..8d6f29f7a7 100644 --- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java @@ -238,8 +238,12 @@ public class MediaDrmBridge { Log.e(TAG, "Cannot open a new session", e); release(); return null; + } catch (android.media.ResourceBusyException e) { + Log.e(TAG, "Cannot open a new session", e); + release(); + return null; } - } + } /** * Close a session. |