diff options
| author | NicoleYarroch <nicole@livio.io> | 2021-02-24 10:19:39 -0500 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2021-02-24 10:19:39 -0500 |
| commit | 46c2b9cced35da590d4d0f0a6778ff322d15be0b (patch) | |
| tree | 1172cf5c16098f8de7a6f1ada20e1ed97658221c | |
| parent | f597491d96c4ade89ce8f495c7295325c9705e01 (diff) | |
| parent | 92c04d7d1ae37b58deb27736f048296ab290ec78 (diff) | |
| download | sdl_ios-bugfix/7.1_transport_fixes.tar.gz | |
Merge branch 'issue-799-prevent-incorrect-background-processing' into bugfix/7.1_transport_fixesbugfix/7.1_transport_fixes
| -rw-r--r-- | SmartDeviceLink/private/SDLLifecycleManager.m | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/SmartDeviceLink/private/SDLLifecycleManager.m b/SmartDeviceLink/private/SDLLifecycleManager.m index 8d25b79f7..8fe6b6f9a 100644 --- a/SmartDeviceLink/private/SDLLifecycleManager.m +++ b/SmartDeviceLink/private/SDLLifecycleManager.m @@ -14,7 +14,6 @@ #import "SDLLifecycleRPCAdapter.h" #import "SDLAsynchronousRPCOperation.h" #import "SDLAsynchronousRPCRequestOperation.h" -#import "SDLBackgroundTaskManager.h" #import "SDLChangeRegistration.h" #import "SDLConfiguration.h" #import "SDLConnectionManagerType.h" @@ -107,7 +106,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask @property (copy, nonatomic) SDLManagerReadyBlock readyHandler; @property (copy, nonatomic) dispatch_queue_t lifecycleQueue; @property (assign, nonatomic) int32_t lastCorrelationId; -@property (copy, nonatomic) SDLBackgroundTaskManager *backgroundTaskManager; @property (strong, nonatomic) SDLLanguage currentVRLanguage; // RPC Handlers @@ -190,8 +188,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hmiStatusDidChange:) name:SDLDidChangeHMIStatusNotification object:_notificationDispatcher]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remoteHardwareDidUnregister:) name:SDLDidReceiveAppUnregisteredNotification object:_notificationDispatcher]; - _backgroundTaskManager = [[SDLBackgroundTaskManager alloc] initWithBackgroundTaskName:BackgroundTaskTransportName]; - return self; } @@ -254,9 +250,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask } - (void)didEnterStateStarted { - // Start a background task so a session can be established even when the app is backgrounded. - [self.backgroundTaskManager startBackgroundTask]; - // Start up the internal protocol, transport, and other internal managers self.secondaryTransportManager = nil; SDLLifecycleConfiguration *lifecycleConfig = self.configuration.lifecycleConfig; @@ -357,9 +350,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask if (shouldRestart) { [strongSelf sdl_transitionToState:SDLLifecycleStateStarted]; - } else { - // End the background task because a session will not be established - [strongSelf.backgroundTaskManager endBackgroundTask]; } }); } @@ -586,9 +576,6 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask if ([self.delegate respondsToSelector:@selector(videoStreamingState:didChangetoState:)]) { [self.delegate videoStreamingState:SDLVideoStreamingStateNotStreamable didChangetoState:self.videoStreamingState]; } - - // Stop the background task now that setup has completed - [self.backgroundTaskManager endBackgroundTask]; } - (void)didEnterStateUnregistering { |