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

Expose FrontendInfo list of all the existed Frontends in Tuner java

Browse Source 
Test: make
Bug: 158818697
Change-Id: Iddea804a2ab9c8609d843c6259763e092b003131
This commit is contained in:
Amy Zhang
2020-08-19 15:05:29 -07:00
parent 782672aabd
commit 1c15cee227
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -5091,6 +5091,7 @@ package android.media.tv.tuner {
method public long getAvSyncTime(int);
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 public int linkFrontendToCiCam(int);
method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_DESCRAMBLER) public android.media.tv.tuner.Descrambler openDescrambler();

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

@@ -5031,6 +5031,7 @@ package android.media.tv.tuner {
method public long getAvSyncTime(int);
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 public int linkFrontendToCiCam(int);
method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_DESCRAMBLER) public android.media.tv.tuner.Descrambler openDescrambler();

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

@@ -61,6 +61,7 @@ import com.android.internal.util.FrameworkStatsLog;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -369,6 +370,28 @@ public class Tuner implements AutoCloseable {
mTunerResourceManager.setFrontendInfoList(infos);
}
/**
* Get frontend info list from native and build them into a {@link FrontendInfo} list. Any
* {@code null} FrontendInfo element would be removed.
*/
private FrontendInfo[] getFrontendInfoListInternal() {
List<Integer> ids = getFrontendIds();
if (ids == null) {
return null;
}
FrontendInfo[] infos = new FrontendInfo[ids.size()];
for (int i = 0; i < ids.size(); i++) {
int id = ids.get(i);
FrontendInfo frontendInfo = getFrontendInfoById(id);
if (frontendInfo == null) {
Log.e(TAG, "Failed to get a FrontendInfo on frontend id:" + id + "!");
continue;
}
infos[i] = frontendInfo;
}
return Arrays.stream(infos).filter(Objects::nonNull).toArray(FrontendInfo[]::new);
}
/** @hide */
public static int getTunerVersion() {
return sTunerVersion;
@@ -932,7 +955,7 @@ public class Tuner implements AutoCloseable {
}
/**
* Gets the frontend information.
* Gets the initialized frontend information.
*
* @return The frontend information. {@code null} if the operation failed.
*/
@@ -950,6 +973,16 @@ public class Tuner implements AutoCloseable {
return mFrontendInfo;
}
/**
* Get a list all the existed frontend information.
*
* @return The list of all the frontend information. {@code null} if the operation failed.
*/
@Nullable
public List<FrontendInfo> getFrontendInfoList() {
return Arrays.asList(getFrontendInfoListInternal());
}
/** @hide */
public FrontendInfo getFrontendInfoById(int id) {
return nativeGetFrontendInfo(id);