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

Commit 9252ef03 authored by zhoutengteng's avatar zhoutengteng Committed by android-build-merger
Browse files

Merge "Fix leak of registerReceiver" am: 85f7bff9 am: af91b3bc am: 1724f7b5 

am: e49d14ea

Change-Id: I1f97235995c50d8ca3c12be3a1771d8309d91ef5
parents 90003ce6 e49d14ea

android/app/src/com/android/bluetooth/newavrcp/AvrcpTargetService.java

+5 −5
Original line number Diff line number Diff line
@@ -140,17 +140,17 @@ public class AvrcpTargetService extends ProfileService { 
        Log.i(TAG, "Starting the AVRCP Target Service");

        mCurrentData = new MediaData(null, null, null);



        mReceiver = new AvrcpBroadcastReceiver();

        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED);

        registerReceiver(mReceiver, filter);



        if (!SystemProperties.getBoolean(AVRCP_ENABLE_PROPERTY, true)) {

            Log.w(TAG, "Skipping initialization of the new AVRCP Target Service");

            sInstance = null;

            return true;

        }



        mReceiver = new AvrcpBroadcastReceiver();

        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED);

        registerReceiver(mReceiver, filter);



        mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);

        sDeviceMaxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);