From 1597be7bf723656bfdc1d8b84a4240773e9d1a03 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 23 Sep 2024 17:53:14 -0400 Subject: [PATCH] Change some more internal MTRDeviceControllerFactory APIs to use MTRDeviceController_Concrete. (#35730) These always return concrete controllers. getRunningControllers was already claiming the right signature in the implementation, just not the header. --- .../Framework/CHIP/MTRDeviceControllerFactory.mm | 8 ++++---- .../CHIP/MTRDeviceControllerFactory_Internal.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm index 68f57a6954cc34..4cff8a633105b2 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm @@ -975,9 +975,9 @@ - (void)controllerShuttingDown:(MTRDeviceController_Concrete *)controller return [_controllers copy]; } -- (nullable MTRDeviceController *)runningControllerForFabricIndex:(FabricIndex)fabricIndex - includeControllerStartingUp:(BOOL)includeControllerStartingUp - includeControllerShuttingDown:(BOOL)includeControllerShuttingDown +- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(FabricIndex)fabricIndex + includeControllerStartingUp:(BOOL)includeControllerStartingUp + includeControllerShuttingDown:(BOOL)includeControllerShuttingDown { assertChipStackLockedByCurrentThread(); @@ -1006,7 +1006,7 @@ - (nullable MTRDeviceController *)runningControllerForFabricIndex:(FabricIndex)f return nil; } -- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex +- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex { return [self runningControllerForFabricIndex:fabricIndex includeControllerStartingUp:YES includeControllerShuttingDown:YES]; } diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h index 46bb7819ad43f1..1642641717cbe8 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h @@ -57,21 +57,21 @@ MTR_DIRECT_MEMBERS * Get the list of running controllers. This will include controllers that are * in the middle of starting up or shutting down. */ -- (NSArray *)getRunningControllers; +- (NSArray *)getRunningControllers; /** * Find a running controller, if any, for the given fabric index. */ -- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex; +- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex; /** * Find a running controller, if any, for the given fabric index. Allows * controlling whether to include a controller that is in the middle of startup * or shutdown. */ -- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex - includeControllerStartingUp:(BOOL)includeControllerStartingUp - includeControllerShuttingDown:(BOOL)includeControllerShuttingDown; +- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex + includeControllerStartingUp:(BOOL)includeControllerStartingUp + includeControllerShuttingDown:(BOOL)includeControllerShuttingDown; /** * Notify the controller factory that a new operational instance with the given