diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:33:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:33:17 +0000 |
| commit | 885b03e4ab27214bc7b54bbc6c854a383c8c846c (patch) | |
| tree | 9a1da267461fa31365778817f8d5e2488fc61330 | |
| parent | 91e23a367c2f4ac150b6a2b4c744b03bd776f6e7 (diff) | |
| parent | 1b459d203f01d0b85016ab20032c0b1d0bd0bb42 (diff) | |
| download | platform_packages_apps_LegacyCamera-android10-mainline-resolv-release.tar.gz platform_packages_apps_LegacyCamera-android10-mainline-resolv-release.tar.bz2 platform_packages_apps_LegacyCamera-android10-mainline-resolv-release.zip | |
Snap for 6001391 from 1b459d203f01d0b85016ab20032c0b1d0bd0bb42 to qt-aml-resolv-releaseandroid10-mainline-resolv-release
Change-Id: I48b05deab2e6631b136819c9ac1134a9386beb92
| -rwxr-xr-x | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/feature_mos_jni.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 37213bcf..92758494 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -20,10 +20,6 @@ LOCAL_CFLAGS += \ -Wno-unused-variable \ -Wno-unused-function \ -# some warnings should be fixed -LOCAL_CFLAGS += \ - -Wno-error=sometimes-uninitialized \ - LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_SRC_FILES := \ diff --git a/jni/feature_mos_jni.cpp b/jni/feature_mos_jni.cpp index c2dcabfe..344c5983 100644 --- a/jni/feature_mos_jni.cpp +++ b/jni/feature_mos_jni.cpp @@ -419,7 +419,7 @@ JNIEXPORT jfloatArray JNICALL Java_com_android_camera_panorama_Mosaic_setSourceI double t0, t1, time_c; t0 = now_ms(); - int ret_code; + int ret_code = Mosaic::MOSAIC_RET_OK; if(frame_number_HR<MAX_FRAMES && frame_number_LR<MAX_FRAMES) { |