diff options
| author | Angus Kong <shkong@google.com> | 2013-06-26 20:55:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-26 20:55:12 +0000 |
| commit | 30e5b372e3f573d9ea339cc9c01657deae36a834 (patch) | |
| tree | 65814f8f7c2fa229a4f1a8c19eb07267072530e1 /src/com/android/camera/data/LocalData.java | |
| parent | 1abc84c3ec015667ed8f15752b82459492db681d (diff) | |
| parent | a6a6a730074e9fedd56c41cd8fa8f1212cfac108 (diff) | |
| download | android_packages_apps_Snap-30e5b372e3f573d9ea339cc9c01657deae36a834.tar.gz android_packages_apps_Snap-30e5b372e3f573d9ea339cc9c01657deae36a834.tar.bz2 android_packages_apps_Snap-30e5b372e3f573d9ea339cc9c01657deae36a834.zip | |
Merge "Add fullscreen mode." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/data/LocalData.java')
| -rw-r--r-- | src/com/android/camera/data/LocalData.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 216c25a07..384456ed2 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -430,7 +430,8 @@ public interface LocalData extends FilmStripView.ImageData { MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)); } retriever.release(); - if (rotation.equals("90") || rotation.equals("270")) { + if (rotation != null + && (rotation.equals("90") || rotation.equals("270"))) { int b = d.width; d.width = d.height; d.height = b; |