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

Commit a7de15a5 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Remove flag scan_timeout_reset" into main am: ab0ad309 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3008136



Change-Id: I533abde93ad5b0f690c9b6211d42a97c37839fad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c7bf6e3 ab0ad309

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+1 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.view.Display; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.BluetoothAdapterProxy;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.gatt.FilterParams;

import com.android.bluetooth.gatt.GattObjectsFactory;

import com.android.bluetooth.gatt.GattServiceConfig;
@@ -448,9 +447,7 @@ public class ScanManager { 
                        Message msg = obtainMessage(MSG_SCAN_TIMEOUT);

                        msg.obj = client;

                        // Only one timeout message should exist at any time

                        if (Flags.scanTimeoutReset()) {

                        removeMessages(MSG_SCAN_TIMEOUT, client);

                        }

                        sendMessageDelayed(msg, mAdapterService.getScanTimeoutMillis());

                        Log.d(TAG,

                                "apply scan timeout (" + mAdapterService.getScanTimeoutMillis()

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

+0 −2
Original line number Diff line number Diff line
@@ -682,8 +682,6 @@ public class ScanManagerTest { 


    @Test

    public void testScanTimeoutResetForNewScan() {

        mSetFlagsRule.enableFlags(Flags.FLAG_SCAN_TIMEOUT_RESET);



        mTestLooper.stopAutoDispatchAndIgnoreExceptions();

        // Set filtered scan flag

        final boolean isFiltered = false;

flags/gap.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -43,13 +43,6 @@ flag { 
    bug: "316885813"

}



flag {

    name: "scan_timeout_reset"

    namespace: "bluetooth"

    description: "Ensure scan timeout is reset if new scan started"

    bug: "316266556"

}



flag {

    name: "le_scan_fix_remote_exception"

    namespace: "bluetooth"