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.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
index 68f57a6..4cff8a6 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
@@ -975,9 +975,9 @@
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 @@
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 46bb781..1642641 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
@@ -57,21 +57,21 @@
* Get the list of running controllers. This will include controllers that are
* in the middle of starting up or shutting down.
*/
-- (NSArray<MTRDeviceController *> *)getRunningControllers;
+- (NSArray<MTRDeviceController_Concrete *> *)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
