diff options
| author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2021-06-28 10:55:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 10:55:55 -0400 |
| commit | 6c55685cd3542a27aa3ef9c63e71ec050e75f0be (patch) | |
| tree | d7169682315668e0ed32d3245546767a879dbb57 | |
| parent | 2ac4eaece83dc0409982c5f8c0bf74fad3268ab2 (diff) | |
| download | sdl_android-6c55685cd3542a27aa3ef9c63e71ec050e75f0be.tar.gz | |
Fix potential NPE in LCM (#1710)
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java index 1af45abb1..9cf72f7cd 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -876,7 +876,7 @@ abstract class BaseLifecycleManager { // HAX: Issue #1690, Ford Sync bug returning incorrect display capabilities (https://github.com/smartdevicelink/sdl_java_suite/issues/1690). Use the initial capabilities from RAIR instead of the incorrect ones that are included in SetDisplayLayoutResponse. void fixIncorrectDisplayCapabilities(RPCMessage rpc) { if (RPCMessage.KEY_RESPONSE.equals(rpc.getMessageType()) && rpc.getFunctionName().equals(FunctionID.SET_DISPLAY_LAYOUT.toString()) && - initialMediaCapabilities != null && lastDisplayLayoutRequestTemplate.equals(PredefinedLayout.MEDIA.toString())) { + initialMediaCapabilities != null && PredefinedLayout.MEDIA.toString().equals(lastDisplayLayoutRequestTemplate)) { SetDisplayLayoutResponse setDisplayLayoutResponse = (SetDisplayLayoutResponse) rpc; setDisplayLayoutResponse.setDisplayCapabilities(initialMediaCapabilities); |