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

Commit cce72e96 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Change the initialization order of AvrcpTargetService" am: 38b40fbe 

am: 473e1b6b

Change-Id: Ibc12120ad3ddd72032bc3837f54f75b5aaedce29
parents a1f3d460 473e1b6b

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

+9 −9
Original line number Diff line number Diff line
@@ -146,25 +146,25 @@ public class AvrcpTargetService extends ProfileService { 
            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);



        mMediaPlayerList = new MediaPlayerList(Looper.myLooper(), this);



        mNativeInterface = AvrcpNativeInterface.getInterface();

        mNativeInterface.init(AvrcpTargetService.this);



        mVolumeManager = new AvrcpVolumeManager(this, mAudioManager, mNativeInterface);



        UserManager userManager = UserManager.get(getApplicationContext());

        if (userManager.isUserUnlocked()) {

            mMediaPlayerList.init(new ListCallback());

        }



        mNativeInterface = AvrcpNativeInterface.getInterface();

        mNativeInterface.init(AvrcpTargetService.this);



        mVolumeManager = new AvrcpVolumeManager(this, mAudioManager, mNativeInterface);

        mReceiver = new AvrcpBroadcastReceiver();

        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED);

        registerReceiver(mReceiver, filter);



        // Only allow the service to be used once it is initialized

        sInstance = this;