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

Commit bdb900fa authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Revert "sdp: Use complete Uuids for comparisons"" am: 9ca491ba 

am: 4ed21c04

Change-Id: Ic51026d541219d8b306ceca1e12f73fdd3f917b5
parents 049134b1 4ed21c04

android/app/jni/com_android_bluetooth_sdp.cpp

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


using bluetooth::Uuid;



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}});

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);



namespace android {

static jmethodID method_sdpRecordFoundCallback;