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

Commit f9c8dc42 authored by Marco Ballesio's avatar Marco Ballesio
Browse files

Revert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_" 

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696


bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: Id3a41ef1f1b0ee0c75f0fd44358b929a2f39b2db
parent bb2766fc

system/stack/include/l2cdefs.h

+8 −10
Original line number Diff line number Diff line
@@ -174,16 +174,14 @@ inline std::string l2cap_le_result_code_text( 


/* L2CAP Predefined CIDs

*/

enum : uint16_t {

  L2CAP_SIGNALLING_CID = 1,

  L2CAP_CONNECTIONLESS_CID = 2,

  L2CAP_AMP_CID = 3,

  L2CAP_ATT_CID = 4,

  L2CAP_BLE_SIGNALLING_CID = 5,

  L2CAP_SMP_CID = 6,

  L2CAP_SMP_BR_CID = 7,

  L2CAP_BASE_APPL_CID = 0x0040,

};

#define L2CAP_SIGNALLING_CID 1

#define L2CAP_CONNECTIONLESS_CID 2

#define L2CAP_AMP_CID 3

#define L2CAP_ATT_CID 4

#define L2CAP_BLE_SIGNALLING_CID 5

#define L2CAP_SMP_CID 6

#define L2CAP_SMP_BR_CID 7

#define L2CAP_BASE_APPL_CID 0x0040



/* Fixed Channels mask bits */