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

Commit 7bacb9d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refactor GATT logging to be unguarded in ScanController" into main am:... 

Merge "Refactor GATT logging to be unguarded in ScanController" into main am: 95a357af am: 0c7bf6e3

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



Change-Id: I248ca1393fef09abd26741ade38cf046bd795c9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 971dbefd 0c7bf6e3

android/app/src/com/android/bluetooth/le_scan/ScanController.java

+2 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.bluetooth.le.ScanResult; 
import android.bluetooth.le.ScanSettings;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Build;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.WorkSource;
@@ -35,7 +34,6 @@ import android.util.Log; 
import java.util.List;



public class ScanController {

    private static final boolean DBG = Build.TYPE.equals("userdebug") || Build.TYPE.equals("eng");

    private static final String TAG = ScanController.class.getSimpleName();



    public final TransitionalScanHelper mTransitionalScanHelper;
@@ -50,9 +48,7 @@ public class ScanController { 
    }



    public void start() {

        if (DBG) {

        Log.d(TAG, "start()");

        }

        isAvailable = true;

        HandlerThread thread = new HandlerThread("BluetoothScanManager");

        thread.start();
@@ -60,9 +56,7 @@ public class ScanController { 
    }



    public void stop() {

        if (DBG) {

        Log.d(TAG, "stop()");

        }

        isAvailable = false;

        mTransitionalScanHelper.stop();

        mTransitionalScanHelper.cleanup();