diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-04-02 15:44:47 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-04-02 15:44:47 -0400 |
commit | c744b2d7d4902ed0ff9a6b8ecc2695be6cd3d901 (patch) | |
tree | a2228227c4c9702a5d7adcf412f30d80f519fdb7 /base/src/main/java/com/smartdevicelink/managers/screen/menu | |
parent | 2f66c5c56d45801a6313d25d14f0939ca228147d (diff) | |
download | sdl_android-c744b2d7d4902ed0ff9a6b8ecc2695be6cd3d901.tar.gz |
Update setMenuConfiguration
Diffstat (limited to 'base/src/main/java/com/smartdevicelink/managers/screen/menu')
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index e87f96ed0..414a9163c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -363,17 +363,6 @@ abstract class BaseMenuManager extends BaseSubManager { return; } - if (defaultMainWindowCapability == null || defaultMainWindowCapability.getMenuLayoutsAvailable() == null) { - DebugTool.logError("Could not set the main menu configuration. Which menu layouts can be used is not available"); - return; - } - - if ((menuConfiguration.getMenuLayout() != null && !defaultMainWindowCapability.getMenuLayoutsAvailable().contains(menuConfiguration.getMenuLayout())) || - (menuConfiguration.getSubMenuLayout() != null && !defaultMainWindowCapability.getMenuLayoutsAvailable().contains(menuConfiguration.getMenuLayout()))) { - 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); - return; - } - if (currentHMILevel == null || currentHMILevel.equals(HMILevel.HMI_NONE) || currentSystemContext.equals(SystemContext.SYSCTXT_MENU)){ // We are in NONE or the menu is in use, bail out of here DebugTool.logError("Could not set main menu configuration, HMI level: "+currentHMILevel+", required: 'Not-NONE', system context: "+currentSystemContext+", required: 'Not MENU'"); |