Snap for 6439596 from f01f73e6d950f8c2cce04cc6f0404a4cb17fa7bd to qt-aml-tzdata-release
Change-Id: Iced36fb7328d9cb490e37b55bbd3c9f1dd8c2e2a
diff --git a/Android.mk b/Android.mk
index 65f8ac8..50edc7c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,5 +15,7 @@
include $(BUILD_PACKAGE)
+ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
# Use the following include to make our test apk.
include $(call all-makefiles-under, $(LOCAL_PATH))
+endif
diff --git a/jni/Android.mk b/jni/Android.mk
index 9275849..37213bc 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,6 +20,10 @@
-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 344c598..c2dcabf 100644
--- a/jni/feature_mos_jni.cpp
+++ b/jni/feature_mos_jni.cpp
@@ -419,7 +419,7 @@
double t0, t1, time_c;
t0 = now_ms();
- int ret_code = Mosaic::MOSAIC_RET_OK;
+ int ret_code;
if(frame_number_HR<MAX_FRAMES && frame_number_LR<MAX_FRAMES)
{
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 322ab0d..b50ab18 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1583,8 +1583,6 @@
}
// Dismiss open menu if exists.
PopupManager.getInstance(this).notifyShowPopup(null);
-
- if (mCameraSound == null) mCameraSound = new MediaActionSound();
}
@Override
@@ -1593,10 +1591,7 @@
stopPreview();
// Close the camera now because other activities may need to use it.
closeCamera();
- if (mCameraSound != null) {
- mCameraSound.release();
- mCameraSound = null;
- }
+ if (mCameraSound != null) mCameraSound.release();
resetScreenOn();
// Clear UI.
