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

Commit a59dea37 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Revert "BluetoothMetrics: Adding fallback solution for the Bloomfilter"" am: 71de2625 

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



Change-Id: I19555a3efe890f9614e25a41e6c5f57f0fd7237a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b62e685f 71de2625

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

+4 −16
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.google.common.hash.BloomFilter;

import com.google.common.hash.Funnels;



import java.io.ByteArrayInputStream;

import java.io.File;

import java.io.FileInputStream;

import java.io.IOException;
@@ -44,8 +43,8 @@ import java.util.HashMap; 
 */

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_PATH = "/data/misc/bluetooth/metrics";

    private static final String BLOOMFILTER_FILE = "/devices";

    public static final String BLOOMFILTER_FULL_PATH = BLOOMFILTER_PATH + BLOOMFILTER_FILE;



    public static final boolean DEBUG = false;
@@ -113,19 +112,8 @@ public class MetricsLogger { 
            FileInputStream in = new FileInputStream(new File(path));

            mBloomFilter = BloomFilter.readFrom(in, Funnels.byteArrayFunnel());

            mBloomFilterInitialized = true;

        } catch (IOException e1) {

            Log.w(TAG, "MetricsLogger can't read the BloomFilter file.");

            byte[] bloomfilterData = DeviceBloomfilterGenerator.hexStringToByteArray(

                    DeviceBloomfilterGenerator.BLOOM_FILTER_DEFAULT);

            try {

                mBloomFilter = BloomFilter.readFrom(

                        new ByteArrayInputStream(bloomfilterData), Funnels.byteArrayFunnel());

                mBloomFilterInitialized = true;

                Log.i(TAG, "The default bloomfilter is used");

                return true;

            } catch (IOException e2) {

                Log.w(TAG, "The default bloomfilter can't be used.");

            }

        } catch (IOException e) {

            Log.w(TAG, "MetricsLogger can't read the BloomFilter file");

            return false;

        }

        return true;