diff options
| author | Brett W <geekman3454@protonmail.com> | 2017-10-09 13:34:18 -0400 |
|---|---|---|
| committer | Brett W <geekman3454@protonmail.com> | 2017-10-09 13:34:18 -0400 |
| commit | 519c89b8582669472040132d7eb6a4d4f9ade687 (patch) | |
| tree | 11c920e2175a2f98d99b4a834366e6a6851db746 | |
| parent | df6d55d4d7c7b0dcb482dfd66c49c7423000d7e1 (diff) | |
| download | sdl_android-bugfix/issue_470.tar.gz | |
increased wait time slightly, fixed comparisonbugfix/issue_470
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java | 4 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java index 0c6c24bd5..07be596dc 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java +++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java @@ -50,7 +50,7 @@ public class SdlConnection implements IProtocolListener, ITransportListener { protected static MultiplexTransportConfig cachedMultiConfig = null;
private Handler WOKEN_RS_HANDLER;
- public final static int RSERVICE_WAIT_MS = 2000;
+ public final static int RSERVICE_WAIT_MS = 2500;
/**
* Constructor.
@@ -137,7 +137,7 @@ public class SdlConnection implements IProtocolListener, ITransportListener { (transportConfig.getTransportType() == TransportType.MULTIPLEX)){
_transport = new MultiplexTransport((MultiplexTransportConfig)transportConfig,this);
}else if(isLegacyModeEnabled() && legacyTransportRequest == TransportType.BLUETOOTH){
- _transport = new BTTransport(this, true);
+ _transport = new BTTransport(this, true);
}else if(transportConfig.getTransportType() == TransportType.BLUETOOTH){
_transport = new BTTransport(this,((BTTransportConfig)transportConfig).getKeepSocketActive());
}
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 7cc011742..a8fc587bf 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java @@ -513,7 +513,7 @@ public class RouterServiceValidator { String packageName = resolveInfo.activityInfo.packageName; if(packageName != null){ if(lastClosedService != null){ - if(isTrustedPackage(packageName, manager) && !lastClosedService.equals(packageName)){ + if(isTrustedPackage(packageName, manager) && !lastClosedService.toString().equals(packageName)){ return true; } }else{ |