diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 15:17:05 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 15:17:05 -0400 |
commit | 00c6447ee18bbf8fd3fe3820854020d6667017a2 (patch) | |
tree | bc3cff1a814909866f41344928b6f4f6830886d9 | |
parent | 78a16d39556c4bf31007ebd33c349cf773fcc8c3 (diff) | |
download | sdl_android-00c6447ee18bbf8fd3fe3820854020d6667017a2.tar.gz |
Revert serviceId refactoring changes
3 files changed, 3 insertions, 3 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 484307be9..17e3d9cd9 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 @@ -146,7 +146,7 @@ public class SdlManagerTests extends AndroidTestCase2 { try { createSampleManager("app",null, Test.GENERAL_LOCKSCREENCONFIG); } catch (IllegalArgumentException ex) { - assertSame(ex.getMessage(), "You must specify an app ID by calling setAppID"); + assertSame(ex.getMessage(), "You must specify an app ID by calling setAppId"); } } 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 ba20a38c5..6f0f5be19 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 @@ -975,7 +975,7 @@ public class SdlManager extends BaseSdlManager{ } if (sdlManager.appId == null) { - throw new IllegalArgumentException("You must specify an app ID by calling setAppID"); + throw new IllegalArgumentException("You must specify an app ID by calling setAppId"); } if (sdlManager.managerListener == null) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index b62fe1e1c..05fa8353f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -3007,7 +3007,7 @@ public class SdlRouterService extends Service{ return appId; } - /*public long getAppID() { + /*public long getAppId() { return appId; }*/ /** |