commit 5d3f77aab397e4496374708db21e71255992c46e
author Matthew Xie <mattx@google.com> Mon Nov 11 19:01:23 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 11 19:01:23 2013 -0800
tree 42aa16a7aff08978da9bccc466f2e622b29d487f
parent 39e51a853375a8380b68e55957eacd3eb4f598f4
parent 46ebeb1d5f2536445590d142f01247de4e24893c

am 46ebeb1d: Merge "LE: Increase number of simultaneous connections" into klp-dev

* commit '46ebeb1d5f2536445590d142f01247de4e24893c':
  LE: Increase number of simultaneous connections

bta/gatt/bta_gattc_int.h

diff --git a/bta/gatt/bta_gattc_int.h b/bta/gatt/bta_gattc_int.h
index 87210fc..c2056d4 100644
--- a/bta/gatt/bta_gattc_int.h
+++ b/bta/gatt/bta_gattc_int.h
@@ -320,7 +320,7 @@
 } tBTA_GATTC_SERV;
 
 #ifndef BTA_GATTC_NOTIF_REG_MAX
-#define BTA_GATTC_NOTIF_REG_MAX     4
+#define BTA_GATTC_NOTIF_REG_MAX     7
 #endif
 
 typedef struct

include/bt_target.h

diff --git a/include/bt_target.h b/include/bt_target.h
index 3ad4602..a106773 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -1445,7 +1445,7 @@
 #endif
 
 #ifndef GATT_MAX_PHY_CHANNEL
-#define GATT_MAX_PHY_CHANNEL        4
+#define GATT_MAX_PHY_CHANNEL        7
 #endif
 
 /* Used for conformance testing ONLY */