Skip to content

Commit 20c55d5

Browse files
authored
Merge branch 'master' into feature/fix-invalid-pid-vid
2 parents a5cbab9 + 79a6aa3 commit 20c55d5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/darwin/Framework/CHIP/MTRDevice_XPC.mm

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ - (oneway void)deviceConfigurationChanged:(NSNumber *)nodeID
163163

164164
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(state, MTRDeviceState, MTRDeviceStateUnknown, getStateWithReply)
165165
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(deviceCachePrimed, BOOL, NO, getDeviceCachePrimedWithReply)
166-
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(estimatedStartTime, NSDate *, nil, getEstimatedStartTimeWithReply)
167-
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(estimatedSubscriptionLatency, NSNumber *, nil, getEstimatedSubscriptionLatencyWithReply)
166+
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(estimatedStartTime, NSDate * _Nullable, nil, getEstimatedStartTimeWithReply)
167+
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(estimatedSubscriptionLatency, NSNumber * _Nullable, nil, getEstimatedSubscriptionLatencyWithReply)
168168

169-
typedef NSDictionary<NSString *, id> * readAttributeResponseType;
169+
typedef NSDictionary<NSString *, id> * _Nullable readAttributeResponseType;
170170
MTR_DEVICE_COMPLEX_REMOTE_XPC_GETTER(readAttributeWithEndpointID
171171
: (NSNumber *) endpointID clusterID
172172
: (NSNumber *) clusterID attributeID
@@ -226,7 +226,7 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
226226
// Not Supported via XPC
227227
//- (oneway void)deviceController:(NSUUID *)controller nodeID:(NSNumber *)nodeID openCommissioningWindowWithSetupPasscode:(NSNumber *)setupPasscode discriminator:(NSNumber *)discriminator duration:(NSNumber *)duration completion:(MTRDeviceOpenCommissioningWindowHandler)completion;
228228

229-
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(clientDataKeys, NSArray *, nil, getClientDataKeysWithReply)
229+
MTR_DEVICE_SIMPLE_REMOTE_XPC_GETTER(clientDataKeys, NSArray * _Nullable, nil, getClientDataKeysWithReply)
230230
MTR_DEVICE_COMPLEX_REMOTE_XPC_GETTER(clientDataForKey
231231
: (NSString *) key, id<NSSecureCoding> _Nullable, nil, clientDataForKey
232232
: key withReply)

0 commit comments

Comments
 (0)