Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c7e865 authored by Henry Fang's avatar Henry Fang
Browse files

Support blink scan 

Allow scan again if callback and executor are same as before.

bug: 173239634
Test: atest -c TunerTest
Change-Id: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea
Merged-In: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea
parent ba032abd

media/java/android/media/tv/tuner/Tuner.java

+7 −3
Original line number Diff line number Diff line
@@ -616,10 +616,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)) {