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

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

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

am: 1724f7b5

Change-Id: I6fa8fc7895530c40417cad75b10a7c6156683330
parents 2120191c 1724f7b5

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);