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

Commit f2073c21 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Check all zero address when connecting gatt" am: 810b4917 am:... 

Merge "Check all zero address when connecting gatt" am: 810b4917 am: a6e36417 am: 17808e69 am: 75d3c450

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



Change-Id: I069ddfd81cf5008cf308fd47cd1d3fcd87862a07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bb1ac41 75d3c450

framework/java/android/bluetooth/BluetoothDevice.java

+3 −0
Original line number Diff line number Diff line
@@ -3270,6 +3270,9 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
            if (iGatt == null) {

                // BLE is not supported

                return null;

            } else if (NULL_MAC_ADDRESS.equals(mAddress)) {

                Log.e(TAG, "Unable to connect gatt, invalid address " + mAddress);

                return null;

            }

            BluetoothGatt gatt = new BluetoothGatt(

                    iGatt, this, transport, opportunistic, phy, mAttributionSource);