Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide TunedInfo APIs"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-15 02:45:24 +00:00
committed by Android (Google) Code Review
parent ba3b589faf 76d6a2c48a
commit cbf137e288
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/system-current.txt
View File

@@ -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);

2
media/java/android/media/tv/TunedInfo.java
View File

@@ -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";

9
media/java/android/media/tv/TvInputManager.java
View File

@@ -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() {

21
non-updatable-api/system-current.txt
View File

@@ -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);