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

Commit e90e3d92 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski Committed by Jakub Pawlowski
Browse files

mcp: Fix possible null pointer exception 

There is a tiny time gap between the MediaControlProfile construction
and the asynchronous init() method call, in which the ListCallback
methods can be called. In such case and exception is thrown.
This change moves the callback registration from the constructor
to the init() routine, right after the member variable initialisation,
to guarantee it being not-null on the first callback call.

Fixes the following exception:
  java.lang.NullPointerException: Attempt to read from field
  'com.android.bluetooth.audio_util.Metadata
  com.android.bluetooth.audio_util.MediaData.metadata' on a
  null object reference at
  com.android.bluetooth.mcp.MediaControlProfile$ListCallback.run(MediaControlProfile.java:82)

Test: atest MediaControlProfileTest
Sponsor: jpawlowski@
Bug: 150670922
Bug: 199499736
Change-Id: Ie8946701b49d6540bbba3d8edad6eb24269263cc
parent fa699f0b

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -212,8 +212,6 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
        } else {

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

        }



        mMediaPlayerList.init(new ListCallback());

    }



    @Override
@@ -651,6 +649,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 


    public void init() {

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

        mMediaPlayerList.init(new ListCallback());



        String appToken = mContext.getPackageName();

        synchronized (mServiceMap) {

android/app/tests/unit/src/com/android/bluetooth/mcp/MediaControlProfileTest.java

+3 −2
Original line number Diff line number Diff line
@@ -133,10 +133,11 @@ public class MediaControlProfileTest { 
        mMediaControlProfile.onServiceInstanceRegistered(ServiceStatus.OK, mMockGMcsService);

        mMcpServiceCallbacks = mMediaControlProfile;



        // Make sure callbacks are not called before it's fully initialized

        verify(mMockMediaPlayerList, times(0)).init(any());

        mMediaControlProfile.init();





        verify(mMockMediaPlayerList).init(listCallbackCaptor.capture());



        listCallback = listCallbackCaptor.getValue();

        listCallback.run(mMockMediaData);

        // Give some time to verify if post function finishes on update player state method call