diff options
| author | xhwang <xhwang@chromium.org> | 2016-03-24 11:57:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 18:58:41 +0000 |
| commit | 950d2d3ba6e0aee4bbae0c67eb6c77feaae55314 (patch) | |
| tree | c336175b342bc9db0f67865f2bd42bd65316a27b /media | |
| parent | 8db63e7006141a3b5ff5f7d2d3c4f4ee2a262eed (diff) | |
| download | chromium_src-950d2d3ba6e0aee4bbae0c67eb6c77feaae55314.zip chromium_src-950d2d3ba6e0aee4bbae0c67eb6c77feaae55314.tar.gz chromium_src-950d2d3ba6e0aee4bbae0c67eb6c77feaae55314.tar.bz2 | |
media : Return after rejecting promise in MediaDrmBridge
This fixes a bug where we continue to call Java after rejecting a
promise, which could trigger rejecting the same promise again.
BUG=597514
TEST=No double promise rejection in manual testing.
Review URL: https://codereview.chromium.org/1823413003
Cr-Commit-Position: refs/heads/master@{#383110}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/media_drm_bridge.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc index 2b1a83f..f82d176 100644 --- a/media/base/android/media_drm_bridge.cc +++ b/media/base/android/media_drm_bridge.cc @@ -390,6 +390,7 @@ void MediaDrmBridge::CreateSessionAndGenerateRequest( &init_data_from_delegate, &optional_parameters_from_delegate)) { promise->reject(INVALID_ACCESS_ERROR, 0, "Invalid init data."); + return; } if (!init_data_from_delegate.empty()) { j_init_data = |