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

Commit 9fa47b84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Prevent opportunistic scans from changing the hardware filter"

parents a8af79d7 03d7afd1

src/com/android/bluetooth/gatt/ScanManager.java

+7 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ public class ScanManager { 
                Log.w(TAG,

                        "Moving scan client to opportunistic (scannerId " + client.scannerId + ")");

                setOpportunisticScanClient(client);

                removeScanFilters(client.scannerId);

                client.stats.setScanTimeout();

            }
@@ -762,6 +763,12 @@ public class ScanManager { 
            int scannerId = client.scannerId;

            int deliveryMode = getDeliveryMode(client);

            int trackEntries = 0;



            // Do not add any filters set by opportunistic scan clients

            if (isOpportunisticScanClient(client)) {

                return;

            }



            if (!shouldAddAllPassFilterToController(client, deliveryMode)) {

                return;

            }