commit 2a1a52ce489357d58f03c4e3455187ea70fa68ef
author Dichen Zhang <dichenzhang@google.com> Thu Mar 14 16:57:47 2019 -0700
committer Dichen Zhang <dichenzhang@google.com> Fri Mar 15 11:56:52 2019 -0700
tree 6a8f1c3af41defed820f8da0df71c4b3a4a510a7
parent d9c99eafe6d3727b2892aeae5df568c6a97b6e76

Fix addAudioDeviceCallback() memory leak bug

Store jobjects and JObjectHolders as backup, delete JObjectHolders after
usage

Bug: 128341809
Test: RoutingTest#test_MediaPlayer2_RoutingChangedCallback
Change-Id: I70b2312519ab0efef0ed40ce721ae8c26dc1aed2

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h

diff --git a/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h
index 1b3f2dc..f38b7cc 100644
--- a/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h
+++ b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h
@@ -124,7 +124,9 @@
     audio_output_flags_t    mFlags;
     sp<JObjectHolder>       mPreferredDevice;
     mutable Mutex           mLock;
-    Vector<std::pair<jobject, jobject>> mRoutingDelegates; // <listener, routingDelegate>
+
+    // <listener, routingDelegate>
+    Vector<std::pair<sp<JObjectHolder>, sp<JObjectHolder>>> mRoutingDelegates;
 
     // static variables below not protected by mutex
     static bool             mIsOnEmulator;