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

Commit 1ec66182 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioManager: annotate legacy callback registrations 

Annotate legacy callback registration methods with @Nullable for
the Handler parameter.

Bug: 139645596
Test: atest AudioManagerTest
Change-Id: I212e506fffbd1ed436556c07f52d7cc92b9d9b56
parent 8413638d

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -23803,9 +23803,9 @@ package android.media { 
    method public void loadSoundEffects();

    method public void playSoundEffect(int);

    method public void playSoundEffect(int, float);

    method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, android.os.Handler);

    method public void registerAudioPlaybackCallback(@NonNull android.media.AudioManager.AudioPlaybackCallback, android.os.Handler);

    method public void registerAudioRecordingCallback(@NonNull android.media.AudioManager.AudioRecordingCallback, android.os.Handler);

    method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, @Nullable android.os.Handler);

    method public void registerAudioPlaybackCallback(@NonNull android.media.AudioManager.AudioPlaybackCallback, @Nullable android.os.Handler);

    method public void registerAudioRecordingCallback(@NonNull android.media.AudioManager.AudioRecordingCallback, @Nullable android.os.Handler);

    method @Deprecated public void registerMediaButtonEventReceiver(android.content.ComponentName);

    method @Deprecated public void registerMediaButtonEventReceiver(android.app.PendingIntent);

    method @Deprecated public void registerRemoteControlClient(android.media.RemoteControlClient);

media/java/android/media/AudioManager.java

+5 −3
Original line number Diff line number Diff line
@@ -3645,7 +3645,8 @@ public class AudioManager { 
     * the callback. If <code>null</code>, the {@link Handler} associated with the main

     * {@link Looper} will be used.

     */

    public void registerAudioPlaybackCallback(@NonNull AudioPlaybackCallback cb, Handler handler)

    public void registerAudioPlaybackCallback(@NonNull AudioPlaybackCallback cb,

                                              @Nullable Handler handler)

    {

        if (cb == null) {

            throw new IllegalArgumentException("Illegal null AudioPlaybackCallback argument");
@@ -3834,7 +3835,8 @@ public class AudioManager { 
     * the callback. If <code>null</code>, the {@link Handler} associated with the main

     * {@link Looper} will be used.

     */

    public void registerAudioRecordingCallback(@NonNull AudioRecordingCallback cb, Handler handler)

    public void registerAudioRecordingCallback(@NonNull AudioRecordingCallback cb,

                                               @Nullable Handler handler)

    {

        if (cb == null) {

            throw new IllegalArgumentException("Illegal null AudioRecordingCallback argument");
@@ -5172,7 +5174,7 @@ public class AudioManager { 
     * {@link Looper} will be used.

     */

    public void registerAudioDeviceCallback(AudioDeviceCallback callback,

            android.os.Handler handler) {

            @Nullable Handler handler) {

        synchronized (mDeviceCallbacks) {

            if (callback != null && !mDeviceCallbacks.containsKey(callback)) {

                if (mDeviceCallbacks.size() == 0) {