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

Commit b6c83ced authored by David Zhao's avatar David Zhao Committed by Automerger Merge Worker
Browse files

Merge "API Review: Remove NonNull on primitives" into udc-dev am: 5ac8a614 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21809380



Change-Id: I5baa92b969d312e3143e7c346e9a34b37f562265
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e15b4a0 5ac8a614

core/api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -27501,17 +27501,17 @@ package android.media.tv { 
    method @NonNull public android.net.Uri getChannelUri();

    method @NonNull public java.util.List<android.media.tv.TvContentRating> getContentRatings();

    method @NonNull public String getDescription();

    method @NonNull public long getEndPaddingMillis();

    method public long getEndPaddingMillis();

    method @NonNull public String getName();

    method @Nullable public android.net.Uri getProgramUri();

    method @IntRange(from=0xffffffff) @NonNull public long getRecordingDurationMillis();

    method @IntRange(from=0xffffffff) public long getRecordingDurationMillis();

    method @NonNull public String getRecordingId();

    method @IntRange(from=0xffffffff) @NonNull public long getRecordingStartTimeMillis();

    method @IntRange(from=0xffffffff) public long getRecordingStartTimeMillis();

    method @Nullable public android.net.Uri getRecordingUri();

    method @NonNull public int getRepeatDays();

    method @IntRange(from=0) @NonNull public long getScheduledDurationMillis();

    method @IntRange(from=0) @NonNull public long getScheduledStartTimeMillis();

    method @NonNull public long getStartPaddingMillis();

    method public int getRepeatDays();

    method @IntRange(from=0) public long getScheduledDurationMillis();

    method @IntRange(from=0) public long getScheduledStartTimeMillis();

    method public long getStartPaddingMillis();

    method public void setDescription(@NonNull String);

    method public void setName(@NonNull String);

    method public void writeToParcel(@NonNull android.os.Parcel, int);
@@ -27817,7 +27817,7 @@ package android.media.tv.interactive { 
    method @CallSuper public void requestTimeShiftMode();

    method @CallSuper public void requestTrackInfoList();

    method @CallSuper public void requestTvRecordingInfo(@NonNull String);

    method @CallSuper public void requestTvRecordingInfoList(@NonNull int);

    method @CallSuper public void requestTvRecordingInfoList(int);

    method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle);

    method @CallSuper public void sendTimeShiftCommandRequest(@NonNull String, @Nullable android.os.Bundle);

    method @CallSuper public void setMediaViewEnabled(boolean);
@@ -27916,7 +27916,7 @@ package android.media.tv.interactive { 
    method public void onRequestTimeShiftMode(@NonNull String);

    method public void onRequestTrackInfoList(@NonNull String);

    method public void onRequestTvRecordingInfo(@NonNull String, @NonNull String);

    method public void onRequestTvRecordingInfoList(@NonNull String, @NonNull int);

    method public void onRequestTvRecordingInfoList(@NonNull String, int);

    method public void onSetTvRecordingInfo(@NonNull String, @NonNull String, @NonNull android.media.tv.TvRecordingInfo);

    method public void onSetVideoBounds(@NonNull String, @NonNull android.graphics.Rect);

    method public void onStateChanged(@NonNull String, int, int);

media/java/android/media/tv/TvRecordingInfo.java

+0 −7
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * cause the recording to start later than the specified time. This should cause the actual

     * duration of the recording to decrease.

     */

    @NonNull

    public long getStartPaddingMillis() {

        return mStartPaddingMillis;

    }
@@ -144,7 +143,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * cause the recording to end earlier than the specified time. This should cause the actual

     * duration of the recording to decrease.

     */

    @NonNull

    public long getEndPaddingMillis() {

        return mEndPaddingMillis;

    }
@@ -176,7 +174,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * https://www.oipf.tv/docs/OIPF-T1-R2_Specification-Volume-5-Declarative-Application-Environment-v2_3-2014-01-24.pdf

     * ">Open IPTV Forum Release 2 Specification</a>. It is described in Volume 5, section 7.10.1.1.

     */

    @NonNull

    @DaysOfWeek

    public int getRepeatDays() {

        return mRepeatDays;
@@ -228,7 +225,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * Returns the scheduled start time of the recording in milliseconds since the epoch.

     */

    @IntRange(from = 0)

    @NonNull

    public long getScheduledStartTimeMillis() {

        return mScheduledStartTimeMillis;

    }
@@ -237,7 +233,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * Returns the scheduled duration of the recording in milliseconds since the epoch.

     */

    @IntRange(from = 0)

    @NonNull

    public long getScheduledDurationMillis() {

        return mScheduledDurationMillis;

    }
@@ -292,7 +287,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * <p> Returns -1 for recordings that have not yet started.

     */

    @IntRange(from = -1)

    @NonNull

    public long getRecordingStartTimeMillis() {

        return mRecordingStartTimeMillis;

    }
@@ -306,7 +300,6 @@ public final class TvRecordingInfo implements Parcelable { 
     * <p> Returns -1 for recordings that have not yet started.

     */

    @IntRange(from = -1)

    @NonNull

    public long getRecordingDurationMillis() {

        return mRecordingDurationMillis;

    }

media/java/android/media/tv/interactive/TvInteractiveAppService.java

+1 −2
Original line number Diff line number Diff line
@@ -1507,8 +1507,7 @@ public abstract class TvInteractiveAppService extends Service { 
         * @param type The type of recording to retrieve.

         */

        @CallSuper

        public void requestTvRecordingInfoList(@NonNull @TvRecordingInfo.TvRecordingListType

                int type) {

        public void requestTvRecordingInfoList(@TvRecordingInfo.TvRecordingListType int type) {

            executeOrPostRunnableOnMainThread(() -> {

                try {

                    if (DEBUG) {

media/java/android/media/tv/interactive/TvInteractiveAppView.java

+1 −1
Original line number Diff line number Diff line
@@ -1350,7 +1350,7 @@ public class TvInteractiveAppView extends ViewGroup { 
         */

        public void onRequestTvRecordingInfoList(

                @NonNull String iAppServiceId,

                @NonNull @TvRecordingInfo.TvRecordingListType int type) {

                @TvRecordingInfo.TvRecordingListType int type) {

        }

    }