fix open sub menu

2 files changed, 8 insertions, 7 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
index 6675d2456..94a1d5e42 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
@@ -437,14 +437,14 @@ public class MenuManagerTests extends AndroidTestCase2 {
 		// call open Menu
 		MenuManager mockMenuManager = mock(MenuManager.class);
 		MenuCell cell = mock(MenuCell.class);
-		mockMenuManager.menuCells = null;
+		mockMenuManager.oldMenuCells = null;
 		assertFalse(mockMenuManager.openSubMenu(cell));
 	}
 
 	public void testOpeningSubMenu(){
 		// call open Menu
 		List<MenuCell> testCells = createTestCells();
-		menuManager.menuCells = testCells;
+		menuManager.oldMenuCells = testCells;
 		// has to get success response to be true
 		assertTrue(menuManager.openSubMenu(testCells.get(3)));
 	}
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 b0a7b3e1e..34607a500 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
@@ -277,16 +277,16 @@ abstract class BaseMenuManager extends BaseSubManager {
 	 * @param cell - A <Strong>SubMenu</Strong> cell whose sub menu you wish to open
 	 */
 	public boolean openSubMenu(@NonNull MenuCell cell){
-
-		if (menuCells == null){
+		if (oldMenuCells == null){
+			DebugTool.logError("open sub menu called, but no Menu cells have been set");
 			return false;
 		}
 		// We must see if we have a copy of this cell, since we clone the objects
-		for (MenuCell clonedCell : menuCells){
+		for (MenuCell clonedCell : oldMenuCells){
 			if (clonedCell.equals(cell)){
 				// We've found the correct sub menu cell
-				if (cell.getCellId() != MAX_ID) {
-					sendOpenSubMenu(cell.getCellId());
+				if (clonedCell.getCellId() != MAX_ID) {
+					sendOpenSubMenu(clonedCell.getCellId());
 				}
 				return true;
 			}
@@ -313,6 +313,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 				DebugTool.logError("Open Sub Menu onError: "+ resultCode+ " | Info: "+ info);
 			}
 		});
+
 		internalInterface.sendRPC(showAppMenu);
 	}