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

Commit de098bb6 authored by Myles Watson's avatar Myles Watson Committed by android-build-team Robot
Browse files

sdp: Use complete Uuids for comparisons 

Bug: 67671467
Test: Share a picture using Bluetooth
Change-Id: I4cac70afb7f2bacc469e3a148b59954cbf5bb1af
(cherry picked from commit 63f736fe)
parent bbce03fa

android/app/jni/com_android_bluetooth_sdp.cpp

+15 −5
Original line number Diff line number Diff line
@@ -27,11 +27,21 @@ 


using bluetooth::Uuid;



static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From16Bit(0x1105);

static const Uuid UUID_PBAP_PSE = Uuid::From16Bit(0x112F);

static const Uuid UUID_MAP_MAS = Uuid::From16Bit(0x1132);

static const Uuid UUID_MAP_MNS = Uuid::From16Bit(0x1133);

static const Uuid UUID_SAP = Uuid::From16Bit(0x112D);

static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From128BitBE(

    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00, 0x80,

                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});

static const Uuid UUID_PBAP_PSE = Uuid::From128BitBE(

    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00, 0x80,

                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});

static const Uuid UUID_MAP_MAS = Uuid::From128BitBE(

    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x32, 0x00, 0x00, 0x10, 0x00, 0x80,

                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});

static const Uuid UUID_MAP_MNS = Uuid::From128BitBE(

    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x33, 0x00, 0x00, 0x10, 0x00, 0x80,

                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});

static const Uuid UUID_SAP = Uuid::From128BitBE(

    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2D, 0x00, 0x00, 0x10, 0x00, 0x80,

                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});



namespace android {

static jmethodID method_sdpRecordFoundCallback;