summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-03-27 18:01:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-03-27 18:01:39 -0700
commit0c2aa56a268ce4a7af4b90e776b0c30d73ae4b77 (patch)
treea976dd9458b593be7219aaaab5f0a7afff69d513 /src
parentd343fc2bef002a3ceb4c3414fdac57c4bae11c59 (diff)
parent1d9d56f177d115e33d194566f3fb862ce6fb2d44 (diff)
downloadandroid_packages_apps_Snap-0c2aa56a268ce4a7af4b90e776b0c30d73ae4b77.tar.gz
android_packages_apps_Snap-0c2aa56a268ce4a7af4b90e776b0c30d73ae4b77.tar.bz2
android_packages_apps_Snap-0c2aa56a268ce4a7af4b90e776b0c30d73ae4b77.zip
Merge "SnapdragonCamera: Correct AutoHDR callback data size check"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3e98ccb75..3da138d6a 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1040,7 +1040,7 @@ public class PhotoModule
@Override
public void onCameraMetaData (byte[] data, android.hardware.Camera camera) {
int metadata[] = new int[3];
- if (data.length <= 12) {
+ if (data.length >= 12) {
for (int i =0;i<3;i++) {
metadata[i] = byteToInt( (byte []) data, i*4);
}