Fix build break on mirror-aosp-master

Handle ResourceBusyException generically, as is being done
upstream, so the addition doesn't break mirror-aosp-master.

bug: 13792521
Change-Id: I0ee09f7e1274503bff8a3b17cdea0baf700c9343

1 files changed, 6 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 8d6f29f7a7..5290721a5b 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -238,7 +238,12 @@ public class MediaDrmBridge {
             Log.e(TAG, "Cannot open a new session", e);
             release();
             return null;
-        } catch (android.media.ResourceBusyException e) {
+        } catch (android.media.NotProvisionedException e) {
+            // Throw NotProvisionedException so that we can startProvisioning().
+            throw e;
+        } catch (android.media.MediaDrmException e) {
+            // Other MediaDrmExceptions (e.g. ResourceBusyException) are not
+            // recoverable.
             Log.e(TAG, "Cannot open a new session", e);
             release();
             return null;