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

Commit 93bfc5fb authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Change the initialization order of AvrcpTargetService 

Create all necessary interfaces and initialize all variables before
registering for callbacks from other locations. This prevents different
interfaces from being null if an event takes place before initialization
is complete.

Bug: 111724742
Test: Sanity test with Carkit
Change-Id: I29efcf1d789fcda9178d08d65bfb10b50e79ff81
parent c30e0759

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;