#2045 P25 Phase 1 Data channels are now ignored if the channel config calls for it. (#2046)

Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2024-10-27 05:29:25 -04:00
committed by GitHub
parent 649d1f650a
commit b3cd3f431f

View File

@@ -1163,16 +1163,20 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
return;
}
if(mIgnoreDataCalls && isDataChannelGrant && tracker == null)
if(mIgnoreDataCalls && isDataChannelGrant)
{
P25ChannelGrantEvent event = P25ChannelGrantEvent.builder(decodeEventType, timestamp, serviceOptions)
.channelDescriptor(apco25Channel)
.details("IGNORED: PHASE 1 DATA CALL " + (serviceOptions != null ? serviceOptions : ""))
.identifiers(ic)
.build();
tracker = new P25TrafficChannelEventTracker(event);
addTracker(tracker, frequency, P25P1Message.TIMESLOT_1);
broadcast(tracker);
if(tracker == null)
{
P25ChannelGrantEvent event = P25ChannelGrantEvent.builder(decodeEventType, timestamp, serviceOptions)
.channelDescriptor(apco25Channel)
.details("IGNORED: PHASE 1 DATA CALL " + (serviceOptions != null ? serviceOptions : ""))
.identifiers(ic)
.build();
tracker = new P25TrafficChannelEventTracker(event);
addTracker(tracker, frequency, P25P1Message.TIMESLOT_1);
broadcast(tracker);
}
return;
}