Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 308e9a5d authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix bug where the ID stored for an OnAudioFocusChangeListener is an 

empty string when audio focus is requested or abandonned with a
null listener.

Change-Id: I7709b75c6092aefc002806343298bc679d42d6c6
parent d1f78767

media/java/android/media/AudioManager.java

+1 −4
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ public class AudioManager { 


    private String getIdForAudioFocusListener(OnAudioFocusChangeListener l) {

        if (l == null) {

            return new String();

            return new String(this.toString());

        } else {

            return new String(this.toString() + l.toString());

        }
@@ -1263,9 +1263,6 @@ public class AudioManager { 
     * Register a listener for audio focus updates.

     */

    public void registerAudioFocusListener(OnAudioFocusChangeListener l) {

        if (l == null) {

            return;

        }

        synchronized(mFocusListenerLock) {

            if (mAudioFocusIdListenerMap.containsKey(getIdForAudioFocusListener(l))) {

                return;