Fix the bug that video thumbnail is not mirrored in attach mode. do not merge

bug:3208306
Change-Id: Ib0c0a873a797a8a0e03f30897d087d0ddcb1c315

diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 560a565..844a75d 100644 (file)
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -58,7 +58,7 @@ public class Util {
     // Rotates and/or mirrors the bitmap. If a new bitmap is created, the
     // original bitmap is recycled.
     public static Bitmap rotateAndMirror(Bitmap b, int degrees, boolean mirror) {
-        if (degrees != 0 && b != null) {
+        if ((degrees != 0 || mirror) && b != null) {
             Matrix m = new Matrix();
             m.setRotate(degrees,
                     (float) b.getWidth() / 2, (float) b.getHeight() / 2);