Skip to content

Commit 6a714f3

Browse files
Fix potential NPEs in BaseMenuManager
1 parent 9377865 commit 6a714f3

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,11 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
175175
if (currentHMILevel == null || currentHMILevel.equals(HMILevel.HMI_NONE) || currentSystemContext.equals(SystemContext.SYSCTXT_MENU)){
176176
// We are in NONE or the menu is in use, bail out of here
177177
waitingOnHMIUpdate = true;
178-
waitingUpdateMenuCells = new ArrayList<>(clonedCells);
178+
if (clonedCells == null) {
179+
waitingUpdateMenuCells = new ArrayList<>();
180+
} else {
181+
waitingUpdateMenuCells = new ArrayList<>(clonedCells);
182+
}
179183
return;
180184
}
181185
waitingOnHMIUpdate = false;
@@ -186,7 +190,11 @@ public void setMenuCells(@NonNull List<MenuCell> cells){
186190
oldMenuCells = new ArrayList<>(menuCells);
187191
}
188192
// copy new list
189-
menuCells = new ArrayList<>(clonedCells);
193+
if (clonedCells == null) {
194+
menuCells = new ArrayList<>();
195+
} else {
196+
menuCells = new ArrayList<>(clonedCells);
197+
}
190198

191199
// HashSet order doesnt matter / does not allow duplicates
192200
HashSet<String> titleCheckSet = new HashSet<>();

0 commit comments

Comments
 (0)