summaryrefslogtreecommitdiff
path: root/SmartDeviceLink/SDLLifecycleManager.m
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2017-10-04 12:10:53 -0400
committerNicoleYarroch <nicole@livio.io>2017-10-04 12:10:53 -0400
commite1028fe45ecc934decb83f1e632d16168992a96d (patch)
tree05e7365066f5b52cdf42d199b3fc018a6753d2c8 /SmartDeviceLink/SDLLifecycleManager.m
parent32dcb92238092fb304c75bea60a6185efe47dde4 (diff)
downloadsdl_ios-e1028fe45ecc934decb83f1e632d16168992a96d.tar.gz
Debugging
Signed-off-by: NicoleYarroch <nicole@livio.io>
Diffstat (limited to 'SmartDeviceLink/SDLLifecycleManager.m')
-rw-r--r--SmartDeviceLink/SDLLifecycleManager.m22
1 files changed, 4 insertions, 18 deletions
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 6a70e6675..759a576d5 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -71,7 +71,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
// Private properties
@property (copy, nonatomic) SDLManagerReadyBlock readyHandler;
-@property (assign, nonatomic) BOOL firstHMINonNoneOccurred;
@end
@@ -105,7 +104,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
_notificationDispatcher = [[SDLNotificationDispatcher alloc] init];
_responseDispatcher = [[SDLResponseDispatcher alloc] initWithNotificationDispatcher:_notificationDispatcher];
_registerResponse = nil;
- _firstHMINonNoneOccurred = NO;
// Managers
_fileManager = [[SDLFileManager alloc] initWithConnectionManager:self];
@@ -184,6 +182,10 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
self.proxy = [SDLProxyFactory buildSDLProxyWithListener:self.notificationDispatcher];
}
#pragma clang diagnostic pop
+
+ if (self.streamManager != nil) {
+ [self.streamManager startWithProtocol:self.proxy.protocol];
+ }
}
- (void)didEnterStateStopped {
@@ -208,7 +210,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
self.hmiLevel = nil;
self.audioStreamingState = nil;
self.systemContext = nil;
-
self.proxy = nil;
// Due to a race condition internally with EAStream, we cannot immediately attempt to restart the proxy, as we will randomly crash.
@@ -442,16 +443,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
return YES;
}
-- (void)sdl_onFirstHMINonNone {
- // If we are a nav / projection app and desire to stream, we need to be in HMI background, limited, or full and perform additional setup when that occurs
- if (self.streamManager == nil) {
- return;
- }
-
- [self.streamManager startWithProtocol:self.proxy.protocol];
-}
-
-
#pragma mark SDL notification observers
- (void)transportDidConnect {
@@ -484,11 +475,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
self.systemContext = hmiStatusNotification.systemContext;
SDLLogD(@"HMI level changed from %@ to %@", oldHMILevel, self.hmiLevel);
-
- if (!self.firstHMINonNoneOccurred && ![self.hmiLevel isEqualToEnum:SDLHMILevelNone]) {
- self.firstHMINonNoneOccurred = YES;
- [self sdl_onFirstHMINonNone];
- }
if ([self.lifecycleStateMachine isCurrentState:SDLLifecycleStateSettingUpHMI]) {
[self.lifecycleStateMachine transitionToState:SDLLifecycleStateReady];