Bug 749788 - Fix some JNI code bugs. r=blassey

widget/android/AndroidBridge.cpp

@@ -858,7 +858,7 @@ AndroidBridge::Vibrate(const nsTArray<PRUint32>& aPattern)
     if (!env)
         return;
 
-    AutoLocalJNIFrame frame;
+    AutoLocalJNIFrame jniFrame(env);
 
     ALOG_BRIDGE("AndroidBridge::Vibrate");
 
@@ -1669,7 +1669,7 @@ AndroidBridge::GetMessage(PRInt32 aMessageId, PRInt32 aRequestId, PRUint64 aProc
 {
     ALOG_BRIDGE("AndroidBridge::GetMessage");
 
-    JNIEnv *env = env;
+    JNIEnv *env = GetJNIEnv();
     if (!env)
         return;
 

widget/android/AndroidJavaWrappers.cpp

@@ -746,7 +746,11 @@ AndroidGeckoSurfaceView::GetSurface()
 jobject
 AndroidGeckoSurfaceView::GetSurfaceHolder()
 {
-    return GetJNIForThread()->CallObjectMethod(wrapped_obj, jGetHolderMethod);
+    JNIEnv *env = GetJNIForThread();
+    if (!env)
+        return nsnull;
+
+    return env->CallObjectMethod(wrapped_obj, jGetHolderMethod);
 }
 
 void
@@ -886,8 +890,13 @@ nsJNIString::nsJNIString(jstring jstr, JNIEnv *jenv)
         return;
     }
     JNIEnv *jni = jenv;
-    if (!jni)
+    if (!jni) {
         jni = AndroidBridge::GetJNIEnv();
+        if (!jni) {
+            SetIsVoid(true);
+            return;
+        }
+    }
     const jchar* jCharPtr = jni->GetStringChars(jstr, NULL);
 
     if (!jCharPtr) {