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

Commit 5a3013b4 authored by Iván Budnik's avatar Iván Budnik
Browse files

Fix nullability in MediaController#getPlaybackInfo() 

The playback info field is NonNull, so getPlaybackInfo() is artificially
returning a null value if the Binder transaction to system_server fails.
As per go/android-api-guidelines#framework-rethrow-remoteexception we should always be rethrowing
RemoteExceptions to provide a strong signal that the operation failed.

In practice, the returned value is never null, unless system_server has
died. Several CTS tests already assume this NonNull-ness.

Test: atest CtsMediaBetterTogetherTestCases
Bug: 333564788
Change-Id: Id18cce692d8d0b25486da427ef9860eb2f176aef
parent 8e1ad154

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26592,7 +26592,7 @@ package android.media.session { 
    method public long getFlags();

    method @Nullable public android.media.MediaMetadata getMetadata();

    method public String getPackageName();

    method @Nullable public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();

    method @NonNull public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();

    method @Nullable public android.media.session.PlaybackState getPlaybackState();

    method @Nullable public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();

    method @Nullable public CharSequence getQueueTitle();

media/java/android/media/session/MediaController.java

+5 −9
Original line number Diff line number Diff line
@@ -252,18 +252,14 @@ public final class MediaController { 
        return 0;

    }



    /**

     * Get the current playback info for this session.

     *

     * @return The current playback info or null.

     */

    public @Nullable PlaybackInfo getPlaybackInfo() {

    /** Returns the current playback info for this session. */

    @NonNull

    public PlaybackInfo getPlaybackInfo() {

        try {

            return mSessionBinder.getVolumeAttributes();

        } catch (RemoteException e) {

            Log.wtf(TAG, "Error calling getAudioInfo.", e);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

        return null;

    }



    /**

services/core/java/com/android/server/media/MediaSessionRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
        return -1;

    }



    @NonNull

    private PlaybackInfo getVolumeAttributes() {

        int volumeType;

        AudioAttributes attributes;
@@ -1850,6 +1851,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
            return mFlags;

        }



        @NonNull

        @Override

        public PlaybackInfo getVolumeAttributes() {

            return MediaSessionRecord.this.getVolumeAttributes();