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

Commit 17023c60 authored by Avner Cohen's avatar Avner Cohen Committed by Automerger Merge Worker
Browse files

Merge "Amend the location denylist for Bluetooth scans to match the updated... 

Merge "Amend the location denylist for Bluetooth scans to match the updated value currently rolled out through an experiment." into main am: e6815f3f

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



Change-Id: I7a27b5985fad25084bc0acd6462d2cf9707e540f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70d7b0a3 e6815f3f

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+5 −2
Original line number Diff line number Diff line
@@ -7779,9 +7779,12 @@ public class AdapterService extends Service { 
                "screen_off_balanced_interval_millis";

        private static final String LE_AUDIO_ALLOW_LIST = "le_audio_allow_list";



        /** Default denylist which matches Eddystone and iBeacon payloads. */

        /**

         * Default denylist which matches Eddystone (except for Eddystone-E2EE-EID) and iBeacon

         * payloads.

         */

        private static final String DEFAULT_LOCATION_DENYLIST_ADVERTISING_DATA =

                "⊆0016AAFE/00FFFFFF,⊆00FF4C0002/00FFFFFFFF";

                "⊈0016AAFE40/00FFFFFFF0,⊆0016AAFE/00FFFFFF,⊆00FF4C0002/00FFFFFFFF";



        private static final int DEFAULT_SCAN_QUOTA_COUNT = 5;

        private static final long DEFAULT_SCAN_QUOTA_WINDOW_MILLIS = 30 * SECOND_IN_MILLIS;