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

Commit 00da8989 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support blink scan"

parents f52107e4 e18379f5
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -740,10 +740,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 (mFrontendType == FrontendSettings.TYPE_DTMB) {