diff --git a/android/.gitignore b/android/.gitignore
index c1e42dcfb44..56cacb3ced2 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -4,6 +4,7 @@
.gradle/
.idea/*
!/.idea/codeStyles/
+!/.idea/inspectionProfiles/
.project/
.settings/
build/
diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000000..910984207bc
--- /dev/null
+++ b/android/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm b/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm
index b42c898f213..0db0dbb8aba 100644
--- a/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm
+++ b/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm
@@ -755,8 +755,17 @@ beprovided to handle the result.
holder = holder->FindInstanceInPrototypeChain(getProxyTemplate(isolate));
}
if (holder.IsEmpty() || holder->IsNull()) {
- LOGE(TAG, "Couldn't obtain argument holder");
- args.GetReturnValue().Set(v8::Undefined(isolate));
- return;
+ if (!moduleInstance.IsEmpty()) {
+ holder = moduleInstance.Get(isolate);
+ if (holder.IsEmpty() || holder->IsNull()) {
+ LOGE(TAG, "Couldn't obtain argument holder");
+ args.GetReturnValue().Set(v8::Undefined(isolate));
+ return;
+ }
+ } else {
+ LOGE(TAG, "Couldn't obtain argument holder");
+ args.GetReturnValue().Set(v8::Undefined(isolate));
+ return;
+ }
}
diff --git a/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.cpp.fm b/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.cpp.fm
index e49dfa7b8e4..96aa813b1d9 100644
--- a/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.cpp.fm
+++ b/android/kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBindingV8.cpp.fm
@@ -37,6 +37,7 @@ using namespace v8;
<#assign className = Proxy.className(proxyClassName)>
Persistent ${className}::proxyTemplate;
+Persistent