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

Commit 282b5c20 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev

parents 87293fda 9db88a2f

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -29356,9 +29356,9 @@ package android.media.tv { 
  public abstract class TvInputService extends android.app.Service {

  public abstract class TvInputService extends android.app.Service {

    ctor public TvInputService();

    ctor public TvInputService();

    method public final android.os.IBinder onBind(android.content.Intent);

    method public final android.os.IBinder onBind(android.content.Intent);

    method @Nullable public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(String);

    method @Nullable public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(@NonNull String);

    method @Nullable public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(@NonNull String, @NonNull String);

    method @Nullable public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(@NonNull String, @NonNull String);

    method @Nullable public abstract android.media.tv.TvInputService.Session onCreateSession(String);

    method @Nullable public abstract android.media.tv.TvInputService.Session onCreateSession(@NonNull String);

    method @Nullable public android.media.tv.TvInputService.Session onCreateSession(@NonNull String, @NonNull String);

    method @Nullable public android.media.tv.TvInputService.Session onCreateSession(@NonNull String, @NonNull String);

    field public static final int PRIORITY_HINT_USE_CASE_TYPE_BACKGROUND = 100; // 0x64

    field public static final int PRIORITY_HINT_USE_CASE_TYPE_BACKGROUND = 100; // 0x64

    field public static final int PRIORITY_HINT_USE_CASE_TYPE_LIVE = 400; // 0x190

    field public static final int PRIORITY_HINT_USE_CASE_TYPE_LIVE = 400; // 0x190

media/java/android/media/tv/TvInputService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@ public abstract class TvInputService extends Service { 
     * @param inputId The ID of the TV input associated with the session.

     * @param inputId The ID of the TV input associated with the session.

     */

     */

    @Nullable

    @Nullable

    public abstract Session onCreateSession(String inputId);

    public abstract Session onCreateSession(@NonNull String inputId);





    /**

    /**

     * Returns a concrete implementation of {@link RecordingSession}.

     * Returns a concrete implementation of {@link RecordingSession}.
@@ -251,7 +251,7 @@ public abstract class TvInputService extends Service { 
     * @param inputId The ID of the TV input associated with the recording session.

     * @param inputId The ID of the TV input associated with the recording session.

     */

     */

    @Nullable

    @Nullable

    public RecordingSession onCreateRecordingSession(String inputId) {

    public RecordingSession onCreateRecordingSession(@NonNull String inputId) {

        return null;

        return null;

    }

    }