From ada2fd5b77c49f616106e2493614e21ed5e69b24 Mon Sep 17 00:00:00 2001 From: Bilal Alsharifi Date: Wed, 9 Jun 2021 15:53:46 -0400 Subject: [PATCH] Fix potential NPE in LCM --- .../managers/lifecycle/BaseLifecycleManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1af45abb1d..9cf72f7cdf 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 @@ private void sendRPCMessagePrivate(RPCMessage message, boolean isInternalMessage // 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);