Merge pull request #1020 from smartdevicelink/feature/permission_manager_npe

Fix potential NPE in PermissionManager

1 files changed, 7 insertions, 2 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
index 999e3a167..1fbedd85f 100644
--- a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java
@@ -112,8 +112,13 @@ abstract class BasePermissionManager extends BaseSubManager{
                 List<PermissionItem> permissionItems = ((OnPermissionsChange)notification).getPermissionItem();
                 Map<FunctionID, PermissionItem> previousPermissionItems = currentPermissionItems;
                 currentPermissionItems = new HashMap<>();
-                for (PermissionItem permissionItem : permissionItems) {
-                    currentPermissionItems.put(FunctionID.getEnumForString(permissionItem.getRpcName()), permissionItem);
+                if (permissionItems != null && !permissionItems.isEmpty()) {
+                    for (PermissionItem permissionItem : permissionItems) {
+                        FunctionID functionID = FunctionID.getEnumForString(permissionItem.getRpcName());
+                        if (functionID != null) {
+                            currentPermissionItems.put(functionID, permissionItem);
+                        }
+                    }
                 }
                 notifyListeners(previousPermissionItems, currentHMILevel, currentPermissionItems, currentHMILevel);
                 previousPermissionItems.clear();