commit 9008888d24407541aa383aa4bd363a40abbf954b
author Myles Watson <mylesgw@google.com> Tue Nov 15 16:33:22 2016 -0800
committer Myles Watson <mylesgw@google.com> Wed Nov 23 09:45:50 2016 -0800
tree abb8df907de6f97ad4bccc77492d1f0ac5838807
parent 9979121f0865e07432215529f9b157792ae3ef21

Fix formatting after removing defines

clang-format -i --style=file bta/*/* btif/*/* include/*

Test: mma -j32
Change-Id: I9ebb32f0cc5bd24a7cb2ae25699999aab5036b13

bta/dm/bta_dm_main.cc

diff --git a/bta/dm/bta_dm_main.cc b/bta/dm/bta_dm_main.cc
index d8810d0..b8c572b 100644
--- a/bta/dm/bta_dm_main.cc
+++ b/bta/dm/bta_dm_main.cc
@@ -124,8 +124,8 @@
   BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL, /* 15 bta_dm_search_cancel_transac_cmpl */
   BTA_DM_DISC_RMT_NAME,              /* 16 bta_dm_disc_rmt_name */
   BTA_DM_API_DI_DISCOVER,            /* 17 bta_dm_di_disc */
-  BTA_DM_CLOSE_GATT_CONN, /* 18 bta_dm_close_gatt_conn */
-  BTA_DM_SEARCH_NUM_ACTIONS /* 19 */
+  BTA_DM_CLOSE_GATT_CONN,            /* 18 bta_dm_close_gatt_conn */
+  BTA_DM_SEARCH_NUM_ACTIONS          /* 19 */
 };
 
 /* action function list */
@@ -150,8 +150,7 @@
                                           */
     bta_dm_disc_rmt_name,              /* 16 BTA_DM_DISC_RMT_NAME */
     bta_dm_di_disc,                    /* 17 BTA_DM_API_DI_DISCOVER */
-    bta_dm_close_gatt_conn
-};
+    bta_dm_close_gatt_conn};
 
 #define BTA_DM_SEARCH_IGNORE BTA_DM_SEARCH_NUM_ACTIONS
 /* state table information */
@@ -183,8 +182,7 @@
     /* API_DI_DISCOVER_EVT */ {BTA_DM_API_DI_DISCOVER, BTA_DM_SEARCH_IGNORE,
                                BTA_DM_SEARCH_ACTIVE},
     /* DISC_CLOSE_TOUT_EVT */
-    {BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IDLE}
-};
+    {BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IDLE}};
 const uint8_t bta_dm_search_search_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {
 
     /* Event                        Action 1
@@ -237,8 +235,7 @@
         /* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
                                    BTA_DM_SEARCH_CANCELLING},
         /* DISC_CLOSE_TOUT_EVT */
-        {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_CANCELLING}
-};
+        {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_CANCELLING}};
 
 const uint8_t bta_dm_search_disc_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {
 
@@ -263,8 +260,7 @@
     /* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
                                BTA_DM_DISCOVER_ACTIVE},
     /* DISC_CLOSE_TOUT_EVT */
-    {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_DISCOVER_ACTIVE}
-};
+    {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_DISCOVER_ACTIVE}};
 
 typedef const uint8_t (*tBTA_DM_ST_TBL)[BTA_DM_SEARCH_NUM_COLS];