Merge branch 'bugfix/issue_1326_background_task_suspended_before_RAI_sent'

1 files changed, 4 insertions, 4 deletions

diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 908f5c43f..a5fa00f9c 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -282,7 +282,7 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask
         if (shouldRestart) {
             [strongSelf sdl_transitionToState:SDLLifecycleStateStarted];
         } else {
-            // End any background tasks because a session will not be established
+            // End the background task because a session will not be established
             [self.backgroundTaskManager endBackgroundTask];
         }
     });
@@ -498,6 +498,9 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask
         	[self.delegate audioStreamingState:SDLAudioStreamingStateNotAudible didChangeToState:self.audioStreamingState];
     	}
     });
+
+    // Stop the background task now that setup has completed
+    [self.backgroundTaskManager endBackgroundTask];
 }
 
 - (void)didEnterStateUnregistering {
@@ -708,9 +711,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask
 - (void)transportDidConnect {
     SDLLogD(@"Transport connected");
 
-    // End any background tasks since the transport connected successfully
-    [self.backgroundTaskManager endBackgroundTask];
-
     dispatch_async(self.lifecycleQueue, ^{
         [self sdl_transitionToState:SDLLifecycleStateConnected];
     });