Merge pull request #9204 from garymathews/TIMOB-24926_6_1_X

[6_1_X][TIMOB-24926] Android: Prevent fireEvent on null proxy
tidev · Jul 10, 2017 · a1f324e · a1f324e
2 parents 54e22a7 + 0db90f4
commit a1f324e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java
@@ -1932,6 +1932,9 @@ public boolean fireEvent(String eventName, KrollDict data) {
 	}
 
 	public boolean fireEvent(String eventName, KrollDict data, boolean bubbles) {
+		if (proxy == null) {
+			return false;
+		}
 		if (data == null && additionalEventData != null) {
 			data = new KrollDict(additionalEventData);
 		} else if (additionalEventData != null) {