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

Commit 69eeeabd authored by Rishab Ghanti's avatar Rishab Ghanti Committed by Gerrit Code Review
Browse files

Merge "[BluetoothMetrics] Update the bloom filter" into main

parents c73a64d4 2f1a23f3

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

+388 −158

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.List; 
public class MetricsLogger {

    private static final String TAG = "BluetoothMetricsLogger";

    private static final String BLOOMFILTER_PATH = "/data/misc/bluetooth";

    private static final String BLOOMFILTER_FILE = "/devices_for_metrics";

    private static final String BLOOMFILTER_FILE = "/devices_for_metrics_v2";

    public static final String BLOOMFILTER_FULL_PATH = BLOOMFILTER_PATH + BLOOMFILTER_FILE;



    // 6 hours timeout for counter metrics

android/app/tests/unit/src/com/android/bluetooth/btservice/MetricsLoggerTest.java

+15 −19
Original line number Diff line number Diff line
@@ -64,30 +64,26 @@ public class MetricsLoggerTest { 
        SANITIZED_DEVICE_NAME_MAP.put("Someone's AirpoDs", "airpods");

        SANITIZED_DEVICE_NAME_MAP.put("Galaxy Buds pro", "galaxybudspro");

        SANITIZED_DEVICE_NAME_MAP.put("Someone's AirpoDs", "airpods");

        SANITIZED_DEVICE_NAME_MAP.put("Who's Pixel 7", "pixel7");

        SANITIZED_DEVICE_NAME_MAP.put("陈的pixel 7手机", "pixel7");

        SANITIZED_DEVICE_NAME_MAP.put("pixel 7 pro", "pixel7pro");

        SANITIZED_DEVICE_NAME_MAP.put("My Pixel 7 Pro", "pixel7pro");

        SANITIZED_DEVICE_NAME_MAP.put("My Pixel   7   PRO", "pixel7pro");

        SANITIZED_DEVICE_NAME_MAP.put("My Pixel   7   - PRO", "pixel7pro");

        SANITIZED_DEVICE_NAME_MAP.put("My BMW X5", "bmwx5");

        SANITIZED_DEVICE_NAME_MAP.put("My BMW X5", "bmw");

        SANITIZED_DEVICE_NAME_MAP.put("Jane Doe's Tesla Model--X", "teslamodelx");

        SANITIZED_DEVICE_NAME_MAP.put("TESLA of Jane DOE", "tesla");

        SANITIZED_DEVICE_NAME_MAP.put("SONY WH-1000XM noise cancelling headsets", "sonywh1000xm");

        SANITIZED_DEVICE_NAME_MAP.put("Amazon Echo Dot in Kitchen", "amazonechodot");

        SANITIZED_DEVICE_NAME_MAP.put("斯巴鲁 Starlink", "starlink");

        SANITIZED_DEVICE_NAME_MAP.put("大黄蜂MyLink", "mylink");

        SANITIZED_DEVICE_NAME_MAP.put("Dad's Fitbit Charge 3", "fitbitcharge3");

        SANITIZED_DEVICE_NAME_MAP.put("SONY WH-1000XM4", "wh1000xm4");

        SANITIZED_DEVICE_NAME_MAP.put("Amazon Echo Dot", "echo");

        SANITIZED_DEVICE_NAME_MAP.put("Chevy my link", "chevymylink");

        SANITIZED_DEVICE_NAME_MAP.put("Dad's Hyundai i10", "hyundai");

        SANITIZED_DEVICE_NAME_MAP.put("Mike's new Galaxy Buds 2", "galaxybuds2");

        SANITIZED_DEVICE_NAME_MAP.put("My third Ford F-150", "fordf150");

        SANITIZED_DEVICE_NAME_MAP.put("BOSE QC_35 Noise Cancelling Headsets", "boseqc35");

        SANITIZED_DEVICE_NAME_MAP.put("Fitbit versa 3 band", "fitbitversa3");

        SANITIZED_DEVICE_NAME_MAP.put("vw atlas", "vwatlas");

        SANITIZED_DEVICE_NAME_MAP.put("My volkswagen tiguan", "volkswagentiguan");

        SANITIZED_DEVICE_NAME_MAP.put("Bose QuietComfort 35 Series 2", "bosequietcomfort35");

        SANITIZED_DEVICE_NAME_MAP.put("Fitbit versa 3 band", "versa3");

        SANITIZED_DEVICE_NAME_MAP.put("my vw bt", "myvw");

        SANITIZED_DEVICE_NAME_MAP.put("SomeDevice1", "");

        SANITIZED_DEVICE_NAME_MAP.put("Some Device-2", "");

        SANITIZED_DEVICE_NAME_MAP.put("abcgfDG gdfg", "");

        SANITIZED_DEVICE_NAME_MAP.put("Bluetooth headset", "");

        SANITIZED_DEVICE_NAME_MAP.put("My traverse", "traverse");

        SANITIZED_DEVICE_NAME_MAP.put("My Xbox wireless", "xboxwireless");

        SANITIZED_DEVICE_NAME_MAP.put("Your buds3 lite NC", "buds3lite");

        SANITIZED_DEVICE_NAME_MAP.put("MC's razer", "razer");

        SANITIZED_DEVICE_NAME_MAP.put("Tim's Google Pixel Watch", "googlepixelwatch");

        SANITIZED_DEVICE_NAME_MAP.put("lexus is connected", "lexusis");

        SANITIZED_DEVICE_NAME_MAP.put("My wireless flash x earbuds", "wirelessflashx");

    }



    private TestableMetricsLogger mTestableMetricsLogger;