Snap for 6439596 from f01f73e6d950f8c2cce04cc6f0404a4cb17fa7bd to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: Iced36fb7328d9cb490e37b55bbd3c9f1dd8c2e2a

4 files changed, 8 insertions, 7 deletions

diff --git a/Android.mk b/Android.mk
index 65f8ac87..50edc7c4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,5 +15,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 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 92758494..37213bcf 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,6 +20,10 @@ 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 344c5983..c2dcabfe 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 = 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 322ab0d0..b50ab180 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1583,8 +1583,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         }
         // Dismiss open menu if exists.
         PopupManager.getInstance(this).notifyShowPopup(null);
-
-        if (mCameraSound == null) mCameraSound = new MediaActionSound();
     }
 
     @Override
@@ -1593,10 +1591,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         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.