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

Commit 3c949739 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "app::sdpManager: Check for identity address is null" into main am: d641c570 am: ed02c095 

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



Change-Id: Ie00ff0a7d6aaf3aed9a67669145cda4c743a7a9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87dc4586 ed02c095

android/app/src/com/android/bluetooth/sdp/SdpManager.java

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public class SdpManager { 
                                ? Utils.getBrEdrAddress(inst.getDevice(), mAdapterService)

                                : mAdapterService.getIdentityAddress(inst.getDevice().getAddress());

                if (instAddressString != null

                        && addressString != null

                        && instAddressString.equals(addressString)

                        && inst.getUuid().equals(uuid)) {

                    return inst.isSearching();