Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: content/browser/media/session/media_session_android.cc

Issue 2477513002: Fix Java weak reference nullification in MediaSessionAndroid (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabFromChromeExternalNavigationTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/media_session_android.cc
diff --git a/content/browser/media/session/media_session_android.cc b/content/browser/media/session/media_session_android.cc
index 9d74ab4ac2ed880a7f5555ffd117032fbbfd16c8..b4528529130a51740e75fc0d02eccaa1b6b7da80 100644
--- a/content/browser/media/session/media_session_android.cc
+++ b/content/browser/media/session/media_session_android.cc
@@ -63,8 +63,12 @@ ScopedJavaLocalRef<jobject> GetMediaSessionFromWebContents(
void MediaSessionAndroid::MediaSessionDestroyed() {
ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
- if (j_local_session.is_null())
+ if (j_local_session.is_null()) {
+ // If the Java MediaSession is already garbage collected, unset the weak
+ // Java reference.
+ j_media_session_.reset();
return;
+ }
JNIEnv* env = base::android::AttachCurrentThread();
// The Java object will tear down after this call.
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabFromChromeExternalNavigationTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698