--- a/dom/plugins/base/android/ANPAudio.cpp
+++ b/dom/plugins/base/android/ANPAudio.cpp
@@ -138,19 +138,17 @@ public:
 
 NS_IMETHODIMP
 AudioRunnable::Run()
 {
   JNIEnv* jenv = GetJNIForThread();
   if (!jenv)
     return NS_ERROR_FAILURE;
 
-  if (jenv->PushLocalFrame(128)) {
-    return NS_ERROR_FAILURE;
-  }
+  mozilla::AndroidBridge::AutoLocalJNIFrame autoFrame(jenv);
 
   jbyteArray bytearray = jenv->NewByteArray(mTrack->bufferSize);
   if (!bytearray) {
     LOG("AudioRunnable:: Run.  Could not create bytearray");
     return NS_ERROR_FAILURE;
   }
 
   jbyte *byte = jenv->GetByteArrayElements(bytearray, NULL);
@@ -196,17 +194,16 @@ AudioRunnable::Run()
   }
 
   jenv->DeleteGlobalRef(mTrack->output_unit);
   jenv->DeleteGlobalRef(mTrack->at_class);
 
   free(mTrack);
 
   jenv->ReleaseByteArrayElements(bytearray, byte, 0);
-  jenv->PopLocalFrame(NULL);
 
   return NS_OK;
 }
 
 ANPAudioTrack*
 anp_audio_newTrack(uint32_t sampleRate,    // sampling rate in Hz
                    ANPSampleFormat format,
                    int channelCount,       // MONO=1, STEREO=2