am b4036de2: Merge "Fix ANDROID_BITMAP_RESUT_SUCCESS typo"
* commit 'b4036de287ba1f0035c28b2c63309841673a532c':
Fix ANDROID_BITMAP_RESUT_SUCCESS typo
diff --git a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp
index 83f5c17..ed91233 100644
--- a/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp
+++ b/apps/CtsVerifier/jni/cameraanalyzer/com_android_cts_verifier_camera_analyzer_CameraTests.cpp
@@ -51,7 +51,7 @@
inputBitmap,
reinterpret_cast<void**>(&inputBuffer));
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ if (result != ANDROID_BITMAP_RESULT_SUCCESS) {
ALOGE("Unable to lock input bitmap");
}
@@ -106,7 +106,7 @@
long lp = (long)input_testing_image;
result = AndroidBitmap_unlockPixels(env, inputBitmap);
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ if (result != ANDROID_BITMAP_RESULT_SUCCESS) {
ALOGE("Unable to unlock input bitmap");
}
@@ -200,14 +200,14 @@
outputBitmap,
reinterpret_cast<void**>(&outputBuffer) );
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ if (result != ANDROID_BITMAP_RESULT_SUCCESS) {
ALOGE("Unable to lock output bitmap");
}
memcpy(outputBuffer, outputImage, outputWidth * outputHeight * 4);
result = AndroidBitmap_unlockPixels(env, outputBitmap);
- if (result != ANDROID_BITMAP_RESUT_SUCCESS) {
+ if (result != ANDROID_BITMAP_RESULT_SUCCESS) {
ALOGE("Unable to unlock output bitmap");
}