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

Merge "Make ScanCallback methods verbs" into rvc-dev am: f75c281d9c am: 669db87d0a am: bbd1a08841

Browse Source 
Change-Id: Ic19d2aaaa1911bcf0f56f2f7d23544168c72c92b
This commit is contained in:
TreeHugger Robot
2020-03-20 00:01:57 +00:00
committed by Automerger Merge Worker
parent c57c433ed4 bbd1a08841
commit 3736274f3b
3 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/system-current.txt
View File

@@ -5960,20 +5960,20 @@ package android.media.tv.tuner.frontend {
} }
public interface ScanCallback { public interface ScanCallback {
method public void onAnalogSifStandard(int); method public void onAnalogSifStandardReported(int);
method public void onAtsc3PlpInfos(@NonNull android.media.tv.tuner.frontend.Atsc3PlpInfo[]); method public void onAtsc3PlpInfosReported(@NonNull android.media.tv.tuner.frontend.Atsc3PlpInfo[]);
method public void onDvbsStandard(int); method public void onDvbsStandardReported(int);
method public void onDvbtStandard(int); method public void onDvbtStandardReported(int);
method public void onFrequenciesReport(@NonNull int[]); method public void onFrequenciesReported(@NonNull int[]);
method public void onGroupIds(@NonNull int[]); method public void onGroupIdsReported(@NonNull int[]);
method public void onHierarchy(int); method public void onHierarchyReported(int);
method public void onInputStreamIds(@NonNull int[]); method public void onInputStreamIdsReported(@NonNull int[]);
method public void onLocked(); method public void onLocked();
method public void onPlpIds(@NonNull int[]); method public void onPlpIdsReported(@NonNull int[]);
method public void onProgress(@IntRange(from=0, to=100) int); method public void onProgress(@IntRange(from=0, to=100) int);
method public void onScanStopped(); method public void onScanStopped();
method public void onSignalType(int); method public void onSignalTypeReported(int);
method public void onSymbolRates(@NonNull int[]); method public void onSymbolRatesReported(@NonNull int[]);
} }
} }

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

@@ -706,67 +706,70 @@ public class Tuner implements AutoCloseable {
private void onFrequenciesReport(int[] frequency) { private void onFrequenciesReport(int[] frequency) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onFrequenciesReport(frequency)); mScanCallbackExecutor.execute(() -> mScanCallback.onFrequenciesReported(frequency));
} }
} }
private void onSymbolRates(int[] rate) { private void onSymbolRates(int[] rate) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSymbolRates(rate)); mScanCallbackExecutor.execute(() -> mScanCallback.onSymbolRatesReported(rate));
} }
} }
private void onHierarchy(int hierarchy) { private void onHierarchy(int hierarchy) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onHierarchy(hierarchy)); mScanCallbackExecutor.execute(() -> mScanCallback.onHierarchyReported(hierarchy));
} }
} }
private void onSignalType(int signalType) { private void onSignalType(int signalType) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onSignalType(signalType)); mScanCallbackExecutor.execute(() -> mScanCallback.onSignalTypeReported(signalType));
} }
} }
private void onPlpIds(int[] plpIds) { private void onPlpIds(int[] plpIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onPlpIds(plpIds)); mScanCallbackExecutor.execute(() -> mScanCallback.onPlpIdsReported(plpIds));
} }
} }
private void onGroupIds(int[] groupIds) { private void onGroupIds(int[] groupIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onGroupIds(groupIds)); mScanCallbackExecutor.execute(() -> mScanCallback.onGroupIdsReported(groupIds));
} }
} }
private void onInputStreamIds(int[] inputStreamIds) { private void onInputStreamIds(int[] inputStreamIds) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onInputStreamIds(inputStreamIds)); mScanCallbackExecutor.execute(
() -> mScanCallback.onInputStreamIdsReported(inputStreamIds));
} }
} }
private void onDvbsStandard(int dvbsStandandard) { private void onDvbsStandard(int dvbsStandandard) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onDvbsStandard(dvbsStandandard)); mScanCallbackExecutor.execute(
() -> mScanCallback.onDvbsStandardReported(dvbsStandandard));
} }
} }
private void onDvbtStandard(int dvbtStandard) { private void onDvbtStandard(int dvbtStandard) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onDvbtStandard(dvbtStandard)); mScanCallbackExecutor.execute(() -> mScanCallback.onDvbtStandardReported(dvbtStandard));
} }
} }
private void onAnalogSifStandard(int sif) { private void onAnalogSifStandard(int sif) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onAnalogSifStandard(sif)); mScanCallbackExecutor.execute(() -> mScanCallback.onAnalogSifStandardReported(sif));
} }
} }
private void onAtsc3PlpInfos(Atsc3PlpInfo[] atsc3PlpInfos) { private void onAtsc3PlpInfos(Atsc3PlpInfo[] atsc3PlpInfos) {
if (mScanCallbackExecutor != null && mScanCallback != null) { if (mScanCallbackExecutor != null && mScanCallback != null) {
mScanCallbackExecutor.execute(() -> mScanCallback.onAtsc3PlpInfos(atsc3PlpInfos)); mScanCallbackExecutor.execute(
() -> mScanCallback.onAtsc3PlpInfosReported(atsc3PlpInfos));
} }
} }

22
media/java/android/media/tv/tuner/frontend/ScanCallback.java
View File

@@ -38,36 +38,36 @@ public interface ScanCallback {
void onProgress(@IntRange(from = 0, to = 100) int percent); void onProgress(@IntRange(from = 0, to = 100) int percent);
/** Signal frequencies in Hertz */ /** Signal frequencies in Hertz */
void onFrequenciesReport(@NonNull int[] frequency); void onFrequenciesReported(@NonNull int[] frequency);
/** Symbols per second */ /** Symbols per second */
void onSymbolRates(@NonNull int[] rate); void onSymbolRatesReported(@NonNull int[] rate);
/** Locked Plp Ids for DVBT2 frontend. */ /** Locked Plp Ids for DVBT2 frontend. */
void onPlpIds(@NonNull int[] plpIds); void onPlpIdsReported(@NonNull int[] plpIds);
/** Locked group Ids for DVBT2 frontend. */ /** Locked group Ids for DVBT2 frontend. */
void onGroupIds(@NonNull int[] groupIds); void onGroupIdsReported(@NonNull int[] groupIds);
/** Stream Ids. */ /** Stream Ids. */
void onInputStreamIds(@NonNull int[] inputStreamIds); void onInputStreamIdsReported(@NonNull int[] inputStreamIds);
/** Locked signal standard for DVBS. */ /** Locked signal standard for DVBS. */
void onDvbsStandard(@DvbsFrontendSettings.Standard int dvbsStandard); void onDvbsStandardReported(@DvbsFrontendSettings.Standard int dvbsStandard);
/** Locked signal standard. for DVBT */ /** Locked signal standard. for DVBT */
void onDvbtStandard(@DvbtFrontendSettings.Standard int dvbtStandard); void onDvbtStandardReported(@DvbtFrontendSettings.Standard int dvbtStandard);
/** Locked signal SIF standard for Analog. */ /** Locked signal SIF standard for Analog. */
void onAnalogSifStandard(@AnalogFrontendSettings.SifStandard int sif); void onAnalogSifStandardReported(@AnalogFrontendSettings.SifStandard int sif);
/** PLP status in a tuned frequency band for ATSC3 frontend. */ /** PLP status in a tuned frequency band for ATSC3 frontend. */
void onAtsc3PlpInfos(@NonNull Atsc3PlpInfo[] atsc3PlpInfos); void onAtsc3PlpInfosReported(@NonNull Atsc3PlpInfo[] atsc3PlpInfos);
/** Frontend hierarchy. */ /** Frontend hierarchy. */
void onHierarchy(@DvbtFrontendSettings.Hierarchy int hierarchy); void onHierarchyReported(@DvbtFrontendSettings.Hierarchy int hierarchy);
/** Frontend signal type. */ /** Frontend signal type. */
void onSignalType(@AnalogFrontendSettings.SignalType int signalType); void onSignalTypeReported(@AnalogFrontendSettings.SignalType int signalType);
} }