Check if clonedCells list is not empty

bilal-alsharifi · bilal-alsharifi · commit 5dca01b70e42 · 2019-11-12T10:59:59.000-05:00
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
@@ -176,7 +176,7 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
 			// We are in NONE or the menu is in use, bail out of here
 			waitingOnHMIUpdate = true;
 			waitingUpdateMenuCells = new ArrayList<>();
-			if (clonedCells != null) {
+			if (clonedCells != null && !clonedCells.isEmpty()) {
 				waitingUpdateMenuCells.addAll(clonedCells);
 			}
 			return;
@@ -190,7 +190,7 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
 		}
 		// copy new list
 		menuCells = new ArrayList<>();
-		if (clonedCells != null) {
+		if (clonedCells != null && !clonedCells.isEmpty()) {
 			menuCells.addAll(clonedCells);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public void setMenuCells(@NonNull List<MenuCell> cells){`
`176`	`176`	`// We are in NONE or the menu is in use, bail out of here`
`177`	`177`	`waitingOnHMIUpdate = true;`
`178`	`178`	`waitingUpdateMenuCells = new ArrayList<>();`
`179`		`- if (clonedCells != null) {`
	`179`	`+ if (clonedCells != null && !clonedCells.isEmpty()) {`
`180`	`180`	`waitingUpdateMenuCells.addAll(clonedCells);`
`181`	`181`	`}`
`182`	`182`	`return;`
`@@ -190,7 +190,7 @@ public void setMenuCells(@NonNull List<MenuCell> cells){`
`190`	`190`	`}`
`191`	`191`	`// copy new list`
`192`	`192`	`menuCells = new ArrayList<>();`
`193`		`- if (clonedCells != null) {`
	`193`	`+ if (clonedCells != null && !clonedCells.isEmpty()) {`
`194`	`194`	`menuCells.addAll(clonedCells);`
`195`	`195`	`}`
`196`	`196`