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

Commit 70aa22fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tag some "new Binder()" instances to detect leaks." into sc-dev am: c8955e0799 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225384

Change-Id: I81ff2946a4249fb3663d47090f66a50536265ad5
parents 737ee1a5 6106c360

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; 
 */

public final class BluetoothAdapter {

    private static final String TAG = "BluetoothAdapter";

    private static final String DESCRIPTOR = "android.bluetooth.BluetoothAdapter";

    private static final boolean DBG = true;

    private static final boolean VDBG = false;
@@ -805,7 +806,7 @@ public final class BluetoothAdapter { 
        mManagerService = Objects.requireNonNull(managerService);

        mAttributionSource = Objects.requireNonNull(attributionSource);

        mLeScanClients = new HashMap<LeScanCallback, ScanCallback>();

        mToken = new Binder();

        mToken = new Binder(DESCRIPTOR);

    }



    /**