Signal id of zero is silently ignored per spec

Must initialize with a valid signal id.

Bug: 141758481
Test: Verified connection response recieved with non-zero signal id
Change-Id: Icf0ca6a3404759da3734c2d760683a71063340a4

diff --git a/gd/l2cap/classic/internal/signalling_manager.h b/gd/l2cap/classic/internal/signalling_manager.h
index b7df985..be85873 100644 (file)
--- a/gd/l2cap/classic/internal/signalling_manager.h
+++ b/gd/l2cap/classic/internal/signalling_manager.h
@@ -111,7 +111,7 @@ class ClassicSignallingManager {
   PendingCommand last_sent_command_;
   std::queue<PendingCommand> pending_commands_;
   os::Alarm alarm_;
-  SignalId next_signal_id_ = kInvalidSignalId;
+  SignalId next_signal_id_ = kInitialSignalId;
 };
 
 }  // namespace internal

diff --git a/gd/l2cap/signal_id.h b/gd/l2cap/signal_id.h
index 30db90b..24372b1 100644 (file)
--- a/gd/l2cap/signal_id.h
+++ b/gd/l2cap/signal_id.h
@@ -48,6 +48,7 @@ struct SignalId {
 };
 
 constexpr SignalId kInvalidSignalId{0};
+constexpr SignalId kInitialSignalId{1};
 
 inline bool operator==(const SignalId& lhs, const SignalId& rhs) {
   return lhs.value_ == rhs.value_;