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

Commit 2c060396 authored by Kihong Seong's avatar Kihong Seong Committed by Gerrit Code Review
Browse files

Merge "Fix ScanManagerTest#testFilteredScanTimeout" into main

parents aa34c3ef e25d0810

android/app/src/com/android/bluetooth/gatt/AppScanStats.java

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ import java.util.Objects; 
            return false;

        }

        return (SystemClock.elapsedRealtime() - mScanStartTime)

                > mAdapterService.getScanTimeoutMillis();

                >= mAdapterService.getScanTimeoutMillis();

    }



    synchronized boolean hasRecentScan() {

android/app/tests/unit/src/com/android/bluetooth/gatt/ScanManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ import org.mockito.Spy; 
@RunWith(AndroidJUnit4.class)

public class ScanManagerTest {

    private static final String TAG = ScanManagerTest.class.getSimpleName();

    private static final int DELAY_ASYNC_MS = 10;

    private static final int DELAY_ASYNC_MS = 40;

    private static final int DELAY_DEFAULT_SCAN_TIMEOUT_MS = 1500000;

    private static final int DELAY_SCAN_TIMEOUT_MS = 100;

    private static final int DEFAULT_SCAN_REPORT_DELAY_MS = 100;
@@ -613,7 +613,7 @@ public class ScanManagerTest { 
            // Turn off screen

            sendMessageWaitForProcessed(createScreenOnOffMessage(false));

            assertThat(client.settings.getScanMode()).isEqualTo(SCAN_MODE_SCREEN_OFF);

            // Set as backgournd app

            // Set as background app

            sendMessageWaitForProcessed(createImportanceMessage(false));

            assertThat(client.settings.getScanMode()).isEqualTo(SCAN_MODE_SCREEN_OFF);

            // Turn on screen