summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2018-10-05 12:19:57 -0400
committerJoey Grover <joeygrover@gmail.com>2018-10-05 12:19:57 -0400
commit095853b6ced16c45bbddb2a0253b487620ad2274 (patch)
tree8029317402cd28fbacad256ecbabc28ed1666ba7
parentdda037d5fa7d2260c5d70af3859fe5b9b987e763 (diff)
downloadsdl_android-095853b6ced16c45bbddb2a0253b487620ad2274.tar.gz
Fix issue with transportManager not setting sec lvl
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java8
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java2
2 files changed, 9 insertions, 1 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index d4b341721..2efb77119 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
@@ -23,6 +23,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.Build;
+import android.support.annotation.NonNull;
import android.util.Log;
import com.smartdevicelink.util.AndroidTools;
@@ -99,6 +100,13 @@ public class RouterServiceValidator {
inDebugMode = inDebugMode();
this.service = service;
}
+
+ public RouterServiceValidator(@NonNull MultiplexTransportConfig config){
+ inDebugMode = inDebugMode();
+ this.context = config.context;
+ this.service = config.service;
+ setSecurityLevel(config.securityLevel);
+ }
/**
* Main function to call to ensure we are connecting to a validated router service
* @return whether or not the currently running router service can be trusted.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
index db818f7ef..38df218b2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -82,7 +82,7 @@ public class TransportManager {
config.service = SdlBroadcastReceiver.consumeQueuedRouterService();
}
- RouterServiceValidator validator = new RouterServiceValidator(config.context,config.service);
+ RouterServiceValidator validator = new RouterServiceValidator(config);
if(validator.validate()){
transport = new TransportBrokerImpl(config.context, config.appId,config.service);
}else{