summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2018-10-17 11:24:59 -0400
committerJoey Grover <joeygrover@gmail.com>2018-10-17 11:24:59 -0400
commite2c3ceb5fdc622abdb7414ca7cff9b180423bae2 (patch)
tree1deeb041d928c1826586ad627c1a25a442420f48
parent7792ce2893a2c4133d29fbaaf8b6f161325480f6 (diff)
downloadsdl_android-e2c3ceb5fdc622abdb7414ca7cff9b180423bae2.tar.gz
Optimize SdlAppInfo null checks and log error
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
index dba80d1c9..38e881b60 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
@@ -68,13 +68,17 @@ public class SdlAppInfo {
this.routerServiceComponentName = new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
Bundle metadata = resolveInfo.serviceInfo.metaData;
+ if(metadata != null) {
- if(metadata != null && metadata.containsKey(SDL_ROUTER_VERSION_METADATA)){
- this.routerServiceVersion = metadata.getInt(SDL_ROUTER_VERSION_METADATA);
- }
+ if (metadata.containsKey(SDL_ROUTER_VERSION_METADATA)){
+ this.routerServiceVersion = metadata.getInt(SDL_ROUTER_VERSION_METADATA);
+ }
- if(metadata != null && metadata.containsKey(SDL_CUSTOM_ROUTER_METADATA)){
- this.isCustomRouterService = metadata.getBoolean(SDL_CUSTOM_ROUTER_METADATA);
+ if (metadata.containsKey(SDL_CUSTOM_ROUTER_METADATA)) {
+ this.isCustomRouterService = metadata.getBoolean(SDL_CUSTOM_ROUTER_METADATA);
+ }
+ } else {
+ Log.w(TAG, packageName + " has not supplied metadata with their router service!");
}
}