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

Merge "Rename getFrontendInfoList to getAvailableFrontendInfo and improve the java doc"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-15 21:30:18 +00:00
committed by Android (Google) Code Review
parent 60a6e3ae35 e1e4241f89
commit dfb11c4dd1
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -5350,9 +5350,9 @@ package android.media.tv.tuner {
method public int disconnectFrontendToCiCam(int);
method public int getAvSyncHwId(@NonNull android.media.tv.tuner.filter.Filter);
method public long getAvSyncTime(int);
method @Nullable public java.util.List<android.media.tv.tuner.frontend.FrontendInfo> getAvailableFrontendInfos();
method @Nullable public android.media.tv.tuner.DemuxCapabilities getDemuxCapabilities();
method @Nullable public android.media.tv.tuner.frontend.FrontendInfo getFrontendInfo();
method @Nullable public java.util.List<android.media.tv.tuner.frontend.FrontendInfo> getFrontendInfoList();
method @Nullable public android.media.tv.tuner.frontend.FrontendStatus getFrontendStatus(@NonNull int[]);
method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_DESCRAMBLER) public android.media.tv.tuner.Descrambler openDescrambler();
method @Nullable public android.media.tv.tuner.dvr.DvrPlayback openDvrPlayback(long, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.dvr.OnPlaybackStatusChangedListener);

21
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -988,9 +988,11 @@ public class Tuner implements AutoCloseable {
}
/**
* Gets the initialized frontend information.
* Gets the currently initialized and activated frontend information. To get all the available
* frontend info on the device, use {@link getAvailableFrontendInfos()}.
*
* @return The frontend information. {@code null} if the operation failed.
* @return The active frontend information. {@code null} if the operation failed.
* @throws IllegalStateException if there is no active frontend currently.
*/
@Nullable
public FrontendInfo getFrontendInfo() {
@@ -1007,13 +1009,20 @@ public class Tuner implements AutoCloseable {
}
/**
* Get a list all the existed frontend information.
* Gets a list of all the available frontend information on the device. To get the information
* of the currently active frontend, use {@link getFrontendInfo()}. The active frontend
* information is also included in the list of the available frontend information.
*
* @return The list of all the frontend information. {@code null} if the operation failed.
* @return The list of all the available frontend information. {@code null} if the operation
* failed.
*/
@Nullable
public List<FrontendInfo> getFrontendInfoList() {
return Arrays.asList(getFrontendInfoListInternal());
public List<FrontendInfo> getAvailableFrontendInfos() {
FrontendInfo[] feInfoList = getFrontendInfoListInternal();
if (feInfoList == null) {
return null;
}
return Arrays.asList(feInfoList);
}
/** @hide */