diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/Tuner.java | 14 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/frontend/ScanCallback.java | 12 | ||||
| -rw-r--r-- | non-updatable-api/system-current.txt | 2 |
4 files changed, 30 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index bcea591f869d..f8c850d58c22 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6282,7 +6282,9 @@ package android.media.tv.tuner.frontend { method public void onHierarchyReported(int); method public void onInputStreamIdsReported(@NonNull int[]); method public void onLocked(); + method public default void onModulationReported(int); method public void onPlpIdsReported(@NonNull int[]); + method public default void onPriorityReported(boolean); method public void onProgress(@IntRange(from=0, to=100) int); method public void onScanStopped(); method public void onSignalTypeReported(int); diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index 56499e26bafe..a4dc5f7fe386 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -1047,6 +1047,20 @@ public class Tuner implements AutoCloseable { } } + private void onModulationReported(int modulation) { + if (mScanCallbackExecutor != null && mScanCallback != null) { + mScanCallbackExecutor.execute( + () -> mScanCallback.onModulationReported(modulation)); + } + } + + private void onPriorityReported(boolean isHighPriority) { + if (mScanCallbackExecutor != null && mScanCallback != null) { + mScanCallbackExecutor.execute( + () -> mScanCallback.onPriorityReported(isHighPriority)); + } + } + /** * Opens a filter object based on the given types and buffer size. * diff --git a/media/java/android/media/tv/tuner/frontend/ScanCallback.java b/media/java/android/media/tv/tuner/frontend/ScanCallback.java index b0491fdbde1a..c1400c8f6842 100644 --- a/media/java/android/media/tv/tuner/frontend/ScanCallback.java +++ b/media/java/android/media/tv/tuner/frontend/ScanCallback.java @@ -19,6 +19,7 @@ package android.media.tv.tuner.frontend; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.util.Log; /** * Scan callback. @@ -27,6 +28,8 @@ import android.annotation.SystemApi; */ @SystemApi public interface ScanCallback { + /** @hide **/ + String TAG = "ScanCallback"; /** Scan locked the signal. */ void onLocked(); @@ -70,4 +73,13 @@ public interface ScanCallback { /** Frontend signal type. */ void onSignalTypeReported(@AnalogFrontendSettings.SignalType int signalType); + /** Frontend modulation reported. */ + default void onModulationReported(@FrontendStatus.FrontendModulation int modulation) { + Log.d(TAG, "Received modulation scan message"); + } + + /** Frontend scan message priority reported. */ + default void onPriorityReported(boolean isHighPriority) { + Log.d(TAG, "Received priority scan message: isHighPriority=" + isHighPriority); + } } diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index 13ed7f134370..d6a4038f163c 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -6222,7 +6222,9 @@ package android.media.tv.tuner.frontend { method public void onHierarchyReported(int); method public void onInputStreamIdsReported(@NonNull int[]); method public void onLocked(); + method public default void onModulationReported(int); method public void onPlpIdsReported(@NonNull int[]); + method public default void onPriorityReported(boolean); method public void onProgress(@IntRange(from=0, to=100) int); method public void onScanStopped(); method public void onSignalTypeReported(int); |