diff options
| author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2019-05-08 15:22:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 15:22:48 -0400 |
| commit | 7ad11692571841def5ff66bc6222f55f2bc83064 (patch) | |
| tree | 0bbbe2c5ea559d3c3c4695c590639aa59b98752f | |
| parent | b17def774c411f9165f24298dc8032a8105363e7 (diff) | |
| parent | 7098b00a1585c5b707aadea12bc058ad56f5939e (diff) | |
| download | sdl_android-7ad11692571841def5ff66bc6222f55f2bc83064.tar.gz | |
Merge pull request #1053 from smartdevicelink/feature/sdl_manager_states
Update SdlManager state when dispose() is called
3 files changed, 10 insertions, 0 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java index 17e3d9cd9..1c465c382 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java @@ -288,6 +288,11 @@ public class SdlManagerTests extends AndroidTestCase2 { sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP); sdlManager.checkState(); assertEquals(BaseSubManager.LIMITED, sdlManager.getState()); + + + // Case 6 + sdlManager.dispose(); + assertEquals(BaseSubManager.SHUTDOWN, sdlManager.getState()); } public void testSendRPC(){ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index bdba58a6a..ea1e88dcc 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -287,6 +287,8 @@ public class SdlManager extends BaseSdlManager{ managerListener.onDestroy(); managerListener = null; } + + transitionToState(BaseSubManager.SHUTDOWN); } // MANAGER GETTERS @@ -589,6 +591,7 @@ public class SdlManager extends BaseSdlManager{ initNotificationQueue(); } catch (SdlException e) { + transitionToState(BaseSubManager.ERROR); if (managerListener != null) { managerListener.onError("Unable to start manager", e); } diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java index 4c1b15398..146382de9 100644 --- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -242,6 +242,8 @@ public class SdlManager extends BaseSdlManager{ managerListener.onDestroy(this); managerListener = null; } + + transitionToState(BaseSubManager.SHUTDOWN); } |