Skip to content

Commit c744b2d

Browse files
Update setMenuConfiguration
1 parent 2f66c5c commit c744b2d

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,17 +363,6 @@ public void setMenuConfiguration(@NonNull final MenuConfiguration menuConfigurat
363363
return;
364364
}
365365

366-
if (defaultMainWindowCapability == null || defaultMainWindowCapability.getMenuLayoutsAvailable() == null) {
367-
DebugTool.logError("Could not set the main menu configuration. Which menu layouts can be used is not available");
368-
return;
369-
}
370-
371-
if ((menuConfiguration.getMenuLayout() != null && !defaultMainWindowCapability.getMenuLayoutsAvailable().contains(menuConfiguration.getMenuLayout())) ||
372-
(menuConfiguration.getSubMenuLayout() != null && !defaultMainWindowCapability.getMenuLayoutsAvailable().contains(menuConfiguration.getMenuLayout()))) {
373-
DebugTool.logError("One or more of the set menu layouts are not available on this system. The menu configuration will not be set. Available menu layouts: " + defaultMainWindowCapability.getMenuLayoutsAvailable() + " set menu layouts: " + menuConfiguration);
374-
return;
375-
}
376-
377366
if (currentHMILevel == null || currentHMILevel.equals(HMILevel.HMI_NONE) || currentSystemContext.equals(SystemContext.SYSCTXT_MENU)){
378367
// We are in NONE or the menu is in use, bail out of here
379368
DebugTool.logError("Could not set main menu configuration, HMI level: "+currentHMILevel+", required: 'Not-NONE', system context: "+currentSystemContext+", required: 'Not MENU'");

0 commit comments

Comments
 (0)