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

Commit 8d313940 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Prevent create bond for null MAC address" am: b0c01df9 

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

Change-Id: Iadaba7b1e607fc7b14cf1d45ac7e70cc67542cdd
parents f80edee1 b0c01df9

core/java/android/bluetooth/BluetoothDevice.java

+6 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,8 @@ public final class BluetoothDevice implements Parcelable { 
    /** Address is either resolvable, non-resolvable or static. */

    public static final int ADDRESS_TYPE_RANDOM = 1;



    private static final String NULL_MAC_ADDRESS = "00:00:00:00:00:00";



    /**

     * Lazy initialization. Guaranteed final after first object constructed, or

     * getService() called.
@@ -1371,6 +1373,10 @@ public final class BluetoothDevice implements Parcelable { 
            Log.w(TAG, "BT not enabled, createBondOutOfBand failed");

            return false;

        }

        if (NULL_MAC_ADDRESS.equals(mAddress)) {

            Log.e(TAG, "Unable to create bond, invalid address " + mAddress);

            return false;

        }

        try {

            return service.createBond(this, transport, remoteP192Data, remoteP256Data);

        } catch (RemoteException e) {