From 506bad4d8de3b2111daf7557ee051f648bae1905 Mon Sep 17 00:00:00 2001
From: Michael Gangolf <m1ga@users.noreply.github.com>
Date: Wed, 29 Jan 2025 22:12:23 +0100
Subject: [PATCH] fix(android): fix crash when using window.add([]) with a null
 object (#14164)

---
 .../java/org/appcelerator/titanium/proxy/TiViewProxy.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
index 77a86fafa7f..3d82f0448a9 100644
--- a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
+++ b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
@@ -587,7 +587,11 @@ public void add(Object args)
 				if (arg instanceof TiViewProxy) {
 					add((TiViewProxy) arg);
 				} else {
-					Log.w(TAG, "add() unsupported array object: " + arg.getClass().getSimpleName());
+					if (arg == null) {
+						Log.w(TAG, "add() unsupported array object: null");
+					} else {
+						Log.w(TAG, "add() unsupported array object: " + arg.getClass().getSimpleName());
+					}
 				}
 			}
 		} else if (args instanceof TiViewProxy) {