Merge pull request #1216 from smartdevicelink/bugfix/issue_1215

Fix potential NPEs in BaseMenuManager

Author: joeygrover

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java

@@ -425,6 +425,27 @@ public void testAlgorithmTest5(){
 		assertEquals(menuManager.keepsOld.size(), 3);
 	}
 
+	public void testSettingNullMenu(){
+
+		// Make sure we can send an empty menu with no issues
+		// start fresh
+		menuManager.oldMenuCells = null;
+		menuManager.menuCells = null;
+		menuManager.inProgressUpdate = null;
+		menuManager.waitingUpdateMenuCells = null;
+		menuManager.waitingOnHMIUpdate = false;
+
+		menuManager.currentHMILevel = HMILevel.HMI_FULL;
+		// send new cells. They should set the old way
+		List<MenuCell> oldMenu = createDynamicMenu1();
+		List<MenuCell> newMenu = null;
+		menuManager.setMenuCells(oldMenu);
+		assertEquals(menuManager.menuCells.size(), 4);
+
+		menuManager.setMenuCells(newMenu);
+		assertEquals(menuManager.menuCells.size(), 0);
+	}
+
 	public void testClearingMenu(){
 
 		// Make sure we can send an empty menu with no issues

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

@@ -175,7 +175,10 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
 		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
 			waitingOnHMIUpdate = true;
-			waitingUpdateMenuCells = new ArrayList<>(clonedCells);
+			waitingUpdateMenuCells = new ArrayList<>();
+			if (clonedCells != null && !clonedCells.isEmpty()) {
+				waitingUpdateMenuCells.addAll(clonedCells);
+			}
 			return;
 		}
 		waitingOnHMIUpdate = false;
@@ -186,7 +189,10 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
 			oldMenuCells = new ArrayList<>(menuCells);
 		}
 		// copy new list
-		menuCells = new ArrayList<>(clonedCells);
+		menuCells = new ArrayList<>();
+		if (clonedCells != null && !clonedCells.isEmpty()) {
+			menuCells.addAll(clonedCells);
+		}
 
 		// HashSet order doesnt matter / does not allow duplicates
 		HashSet<String> titleCheckSet = new HashSet<>();