diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-31 00:30:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-31 00:30:32 +0000 |
| commit | 0a9f4b4ff07025f3757794155ef4c9db5fd1abe1 (patch) | |
| tree | 56412b2eaf77f219de15ab11206224755293b5f9 | |
| parent | c97bc467cf7868c09b950ff97cf297caded1c038 (diff) | |
| parent | c067dc997982a929f8bee20a2ab71b02577a42b7 (diff) | |
Merge "Support blink scan" am: 1d4bf166d4 am: c067dc9979
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb3e92354bb34dc4503e69628e338dd0e61ea152
| -rw-r--r-- | media/java/android/media/tv/tuner/Tuner.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index 8f991126ce3c..37723f1254ae 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -627,10 +627,14 @@ public class Tuner implements AutoCloseable { @Result public int scan(@NonNull FrontendSettings settings, @ScanType int scanType, @NonNull @CallbackExecutor Executor executor, @NonNull ScanCallback scanCallback) { - if (mScanCallback != null || mScanCallbackExecutor != null) { + /** + * Scan can be called again for blink scan if scanCallback and executor are same as before. + */ + if (((mScanCallback != null) && (mScanCallback != scanCallback)) + || ((mScanCallbackExecutor != null) && (mScanCallbackExecutor != executor))) { throw new IllegalStateException( - "Scan already in progress. stopScan must be called before a new scan can be " - + "started."); + "Different Scan session already in progress. stopScan must be called " + + "before a new scan session can be " + "started."); } mFrontendType = settings.getType(); if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND)) { |