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

Commit ea62097e authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge \"Fix misc-macro-parentheses warnings\" 

am: 89902a18

Change-Id: Id01ad59201fd97150ecb1ecc539255f64a021246
parents df82ced8 89902a18

jni/com_android_bluetooth_gatt.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -45,13 +45,13 @@ 
    uuid_lsb(uuid_ptr),  uuid_msb(uuid_ptr)

    uuid_lsb(uuid_ptr),  uuid_msb(uuid_ptr)





#define GATT_ID_PARAMS(attr_ptr) \

#define GATT_ID_PARAMS(attr_ptr) \

    attr_ptr->inst_id, \

    (attr_ptr)->inst_id, \

    UUID_PARAMS((&attr_ptr->uuid))

    UUID_PARAMS((&(attr_ptr)->uuid))





#define SRVC_ID_PARAMS(srvc_ptr) \

#define SRVC_ID_PARAMS(srvc_ptr) \

    (srvc_ptr->is_primary ? \

    ((srvc_ptr)->is_primary ? \

    BTGATT_SERVICE_TYPE_PRIMARY : BTGATT_SERVICE_TYPE_SECONDARY), \

    BTGATT_SERVICE_TYPE_PRIMARY : BTGATT_SERVICE_TYPE_SECONDARY), \

    GATT_ID_PARAMS((&srvc_ptr->id))

    GATT_ID_PARAMS(&(srvc_ptr)->id)









static void set_uuid(uint8_t* uuid, jlong uuid_msb, jlong uuid_lsb)

static void set_uuid(uint8_t* uuid, jlong uuid_msb, jlong uuid_lsb)