From 32f2e6267481bd4b81b71061c539748143342fef Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@google.com>
Date: Thu, 10 Oct 2013 10:11:27 -0700
Subject: [PATCH] Handle null thread name more gracefully in
 javaCreateThreadEtc()

Change-Id: I67bebb05736b717e0da60da36839985be08cf1d6
---
 core/jni/AndroidRuntime.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 8518101432803..2bc1879ebbf7a 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1023,7 +1023,8 @@ static int javaDetachThread(void)
     void** args = (void**) malloc(3 * sizeof(void*));   // javaThreadShell must free
     int result;
 
-    assert(threadName != NULL);
+    if (!threadName)
+        threadName = "unnamed thread";
 
     args[0] = (void*) entryFunction;
     args[1] = userData;