summaryrefslogtreecommitdiffstats
path: root/media/capture
diff options
context:
space:
mode:
authorsimonb <simonb@chromium.org>2015-07-20 10:22:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-20 17:22:44 +0000
commit47dd5137aeaf662a70b9f08d16cb127ef4aa2fd1 (patch)
treea8b334146ada1393b3d944d8714802cb814f135c /media/capture
parentddef8b66b1a7a5627944b906e7d4579bf49d1568 (diff)
downloadchromium_src-47dd5137aeaf662a70b9f08d16cb127ef4aa2fd1.zip
chromium_src-47dd5137aeaf662a70b9f08d16cb127ef4aa2fd1.tar.gz
chromium_src-47dd5137aeaf662a70b9f08d16cb127ef4aa2fd1.tar.bz2
Use ConvertJavaStringToUTF8() instead of GetStringUTFChars()
BUG=508876 Review URL: https://codereview.chromium.org/1242733002 Cr-Commit-Position: refs/heads/master@{#339463}
Diffstat (limited to 'media/capture')
-rw-r--r--media/capture/video/android/video_capture_device_android.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
index c4ec171..9df39c4 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -5,6 +5,7 @@
#include "media/capture/video/android/video_capture_device_android.h"
#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
#include "base/strings/string_number_conversions.h"
#include "jni/VideoCapture_jni.h"
#include "media/capture/video/android/video_capture_device_factory_android.h"
@@ -171,9 +172,7 @@ void VideoCaptureDeviceAndroid::OnFrameAvailable(JNIEnv* env,
void VideoCaptureDeviceAndroid::OnError(JNIEnv* env,
jobject obj,
jstring message) {
- const char* native_string = env->GetStringUTFChars(message, JNI_FALSE);
- SetErrorState(native_string);
- env->ReleaseStringUTFChars(message, native_string);
+ SetErrorState(base::android::ConvertJavaStringToUTF8(env, message));
}
VideoCapturePixelFormat VideoCaptureDeviceAndroid::GetColorspace() {