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

Commit b541bd15 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "may15" into sc-dev am: 63a1453832 

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

Change-Id: I43824f39320f9e3310bf2a3f33ee6199abc86203
parents 75cec0f6 739f619e

framework/java/android/bluetooth/BluetoothDevice.java

+5 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,11 @@ public final class BluetoothDevice implements Parcelable { 
        return devices;

    }



    /** {@hide} */

    public void prepareToEnterProcess(AttributionSource attributionSource) {

        setAttributionSource(attributionSource);

    }



    @Override

    public boolean equals(@Nullable Object o) {

        if (o instanceof BluetoothDevice) {