diff options
| author | Joey Grover <joeygrover@gmail.com> | 2016-06-28 10:36:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 10:36:20 -0400 |
| commit | 688d6dd3ed593650d9675e47cea5c12bcd028121 (patch) | |
| tree | 0eecae3a33a3971c720d3ddc30689efdab6fea4f | |
| parent | 3ec8a3b7871f001e8219a6b50f1a341838d4df5d (diff) | |
| parent | ba85adceccd0ae868e54c03bdcd38d194e9ef6cd (diff) | |
| download | sdl_android-688d6dd3ed593650d9675e47cea5c12bcd028121.tar.gz | |
Merge pull request #286 from smartdevicelink/feature/improved_resume_with_data
Fix proxy getter for app resumption with persistent data
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java index 7810e2a03..b8a7a17f4 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java @@ -1784,13 +1784,13 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> if (_bAppResumeEnabled)
{
- if ( (msg.getResultCode() == Result.RESUME_FAILED) || (msg.getResultCode() != Result.SUCCESS) )
+ if ( (_sdlMsgVersion.getMajorVersion() > 2) && (_lastHashID != null) && (msg.getSuccess()) && (msg.getResultCode() != Result.RESUME_FAILED) )
+ _bResumeSuccess = true;
+ else
{
_bResumeSuccess = false;
_lastHashID = null;
}
- else if ( (_sdlMsgVersion.getMajorVersion() > 2) && (_lastHashID != null) && (msg.getResultCode() == Result.SUCCESS) )
- _bResumeSuccess = true;
}
_diagModes = msg.getSupportedDiagModes();
@@ -1937,15 +1937,15 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> if (_bAppResumeEnabled)
{
- if ( (msg.getResultCode() == Result.RESUME_FAILED) || (msg.getResultCode() != Result.SUCCESS) )
+ if ( (_sdlMsgVersion.getMajorVersion() > 2) && (_lastHashID != null) && (msg.getSuccess()) && (msg.getResultCode() != Result.RESUME_FAILED) )
+ _bResumeSuccess = true;
+ else
{
_bResumeSuccess = false;
_lastHashID = null;
}
- else if ( (_sdlMsgVersion.getMajorVersion() > 2) && (_lastHashID != null) && (msg.getResultCode() == Result.SUCCESS) )
- _bResumeSuccess = true;
- }
-
+ }
+
_diagModes = msg.getSupportedDiagModes();
if (!isDebugEnabled())
|