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

Commit e482ed43 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 am: 17023c60

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



Change-Id: I2d05d9f2bbd1805d49653cc9861ab923520f728b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a404cc0 17023c60

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;