commit 1e577ced7dcd973267f38351616d28f8a090f013
author Chih-Chung Chang <chihchung@google.com> Tue Sep 22 09:59:46 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 09:59:46 2009 -0700
tree 1a51811eb7b9e79d271924fb9fcc7892cb568f2b
parent 1df988597f113f46fcf1ada68054ff1fc07aa39e
parent 7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6

am 7b7029e0: Merge change 26236 into eclair

Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 37a3bd5..3ac5df5 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -736,6 +736,28 @@
                     if (time != -1) {
                         values.put(Images.Media.DATE_TAKEN, time);
                     }
+
+                    int orientation = exif.getAttributeInt(
+                        ExifInterface.TAG_ORIENTATION, -1);
+                    if (orientation != -1) {
+                        // We only recognize a subset of orientation tag values.
+                        int degree;
+                        switch(orientation) {
+                            case ExifInterface.ORIENTATION_ROTATE_90:
+                                degree = 90;
+                                break;
+                            case ExifInterface.ORIENTATION_ROTATE_180:
+                                degree = 180;
+                                break;
+                            case ExifInterface.ORIENTATION_ROTATE_270:
+                                degree = 270;
+                                break;
+                            default:
+                                degree = 0;
+                                break;
+                        }
+                        values.put(Images.Media.ORIENTATION, degree);
+                    }
                 }
             }