Skip to content

Commit 6c55685

Browse files
Fix potential NPE in LCM (#1710)
1 parent 2ac4eae commit 6c55685

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ private void sendRPCMessagePrivate(RPCMessage message, boolean isInternalMessage
876876
// 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.
877877
void fixIncorrectDisplayCapabilities(RPCMessage rpc) {
878878
if (RPCMessage.KEY_RESPONSE.equals(rpc.getMessageType()) && rpc.getFunctionName().equals(FunctionID.SET_DISPLAY_LAYOUT.toString()) &&
879-
initialMediaCapabilities != null && lastDisplayLayoutRequestTemplate.equals(PredefinedLayout.MEDIA.toString())) {
879+
initialMediaCapabilities != null && PredefinedLayout.MEDIA.toString().equals(lastDisplayLayoutRequestTemplate)) {
880880

881881
SetDisplayLayoutResponse setDisplayLayoutResponse = (SetDisplayLayoutResponse) rpc;
882882
setDisplayLayoutResponse.setDisplayCapabilities(initialMediaCapabilities);

0 commit comments

Comments
 (0)