From 17337e39ba7bccbfd0620d9fbc1f6c6fc747dc41 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sun, 29 Aug 2021 22:10:41 +0200
Subject: [PATCH] Fixed another issue

---
 .../hal/plugin/assistant/google/trait/DeviceTraitFactory.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
index 649a677a..68931862 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
@@ -28,6 +28,7 @@ import se.hal.intf.HalAbstractDevice;
 import se.hal.struct.Sensor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -63,6 +64,9 @@ public class DeviceTraitFactory {
     }
 
     public static List<String> getTraitIds(DeviceTrait[] traits) {
+        if (traits == null)
+            return Collections.emptyList();
+
         List<String> list = new ArrayList<>(traits.length);
 
         for (DeviceTrait trait : traits) {