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

Commit 2706db43 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Signal id of zero is silently ignored per spec" 

am: 66f6fddc

Change-Id: I2726be8bf93bd483d8ff33b83b53a949b2bdb1ea
parents 2ef97567 66f6fddc

system/gd/l2cap/classic/internal/signalling_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -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

system/gd/l2cap/signal_id.h

+1 −0
Original line number Diff line number Diff line
@@ -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_;