Merge "Unhide TunedInfo APIs" (cbf137e2) · Commits · e / os / android_frameworks_base

api/system-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -4770,6 +4770,22 @@ package android.media.tv {
		field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;
		}

		public final class TunedInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getAppTag();
		method public int getAppType();
		method @Nullable public android.net.Uri getChannelUri();
		method @NonNull public String getInputId();
		method public boolean isForeground();
		method public boolean isRecordingSession();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int APP_TAG_SELF = 0; // 0x0
		field public static final int APP_TYPE_NON_SYSTEM = 3; // 0x3
		field public static final int APP_TYPE_SELF = 1; // 0x1
		field public static final int APP_TYPE_SYSTEM = 2; // 0x2
		field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TunedInfo> CREATOR;
		}

		public final class TvContentRatingSystemInfo implements android.os.Parcelable {
		method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);
		method public int describeContents();
		@@ -4885,6 +4901,7 @@ package android.media.tv {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);
		method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);
		method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);
		method @NonNull @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS") public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();
		method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();
		method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();
		method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();
		@@ -4910,6 +4927,10 @@ package android.media.tv {
		method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);
		}

		public abstract static class TvInputManager.TvInputCallback {
		method public void onCurrentTunedInfosUpdated(@NonNull java.util.List<android.media.tv.TunedInfo>);
		}

		public abstract class TvInputService extends android.app.Service {
		method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);
		method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);

media/java/android/media/tv/TunedInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.media.tv;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -35,6 +36,7 @@ import java.util.Objects;
		* or pass-through input.
		* @hide
		*/
		@SystemApi
		public final class TunedInfo implements Parcelable {
		static final String TAG = "TunedInfo";

media/java/android/media/tv/TvInputManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -906,8 +906,8 @@ public final class TvInputManager {
		* @param tunedInfos a list of {@link TunedInfo} objects of new tuned information.
		* @hide
		*/
		public void onCurrentTunedInfosUpdated(
		@NonNull List<TunedInfo> tunedInfos) {
		@SystemApi
		public void onCurrentTunedInfosUpdated(@NonNull List<TunedInfo> tunedInfos) {
		}
		}

		@@ -969,7 +969,7 @@ public final class TvInputManager {
		});
		}

		public void onCurrentTunedInfosUpdated(final List<TunedInfo> currentTunedInfos) {
		public void postCurrentTunedInfosUpdated(final List<TunedInfo> currentTunedInfos) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		@@ -1286,7 +1286,7 @@ public final class TvInputManager {
		public void onCurrentTunedInfosUpdated(List<TunedInfo> currentTunedInfos) {
		synchronized (mLock) {
		for (TvInputCallbackRecord record : mCallbackRecords) {
		record.onCurrentTunedInfosUpdated(currentTunedInfos);
		record.postCurrentTunedInfosUpdated(currentTunedInfos);
		}
		}
		}
		@@ -1988,6 +1988,7 @@ public final class TvInputManager {
		* {@link TunedInfo#getChannelUri()} returns {@code null}.
		* @hide
		*/
		@SystemApi
		@RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS")
		@NonNull
		public List<TunedInfo> getCurrentTunedInfos() {

non-updatable-api/system-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -4710,6 +4710,22 @@ package android.media.tv {
		field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DvbDeviceInfo> CREATOR;
		}

		public final class TunedInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getAppTag();
		method public int getAppType();
		method @Nullable public android.net.Uri getChannelUri();
		method @NonNull public String getInputId();
		method public boolean isForeground();
		method public boolean isRecordingSession();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int APP_TAG_SELF = 0; // 0x0
		field public static final int APP_TYPE_NON_SYSTEM = 3; // 0x3
		field public static final int APP_TYPE_SELF = 1; // 0x1
		field public static final int APP_TYPE_SYSTEM = 2; // 0x2
		field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TunedInfo> CREATOR;
		}

		public final class TvContentRatingSystemInfo implements android.os.Parcelable {
		method public static android.media.tv.TvContentRatingSystemInfo createTvContentRatingSystemInfo(int, android.content.pm.ApplicationInfo);
		method public int describeContents();
		@@ -4825,6 +4841,7 @@ package android.media.tv {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PARENTAL_CONTROLS) public void addBlockedRating(@NonNull android.media.tv.TvContentRating);
		method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public boolean captureFrame(String, android.view.Surface, android.media.tv.TvStreamConfig);
		method @RequiresPermission(android.Manifest.permission.CAPTURE_TV_INPUT) public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(String);
		method @NonNull @RequiresPermission("com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS") public java.util.List<android.media.tv.TunedInfo> getCurrentTunedInfos();
		method @NonNull @RequiresPermission("android.permission.DVB_DEVICE") public java.util.List<android.media.tv.DvbDeviceInfo> getDvbDeviceList();
		method @RequiresPermission(android.Manifest.permission.TV_INPUT_HARDWARE) public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();
		method @RequiresPermission(android.Manifest.permission.READ_CONTENT_RATING_SYSTEMS) public java.util.List<android.media.tv.TvContentRatingSystemInfo> getTvContentRatingSystemList();
		@@ -4850,6 +4867,10 @@ package android.media.tv {
		method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);
		}

		public abstract static class TvInputManager.TvInputCallback {
		method public void onCurrentTunedInfosUpdated(@NonNull java.util.List<android.media.tv.TunedInfo>);
		}

		public abstract class TvInputService extends android.app.Service {
		method @Nullable public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);
		method @Nullable public String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);