diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-09-26 19:53:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:53:41 +0000 |
| commit | d3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24 (patch) | |
| tree | 86cee3cde7262030818ce0b60bb0a336036b0d64 | |
| parent | f379211cc6ec4ca292d100a53a8e1ea49958fcae (diff) | |
| parent | ad12363ecaba370c2425677eef6e562bf7c98e3e (diff) | |
| download | android_packages_apps_Camera2-d3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24.tar.gz android_packages_apps_Camera2-d3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24.tar.bz2 android_packages_apps_Camera2-d3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24.zip | |
am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
* commit 'ad12363ecaba370c2425677eef6e562bf7c98e3e':
Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 43103080a..611cc79c5 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1012,18 +1012,6 @@ public class PhotoModule int xOffset = (originalWidth - newWidth)/2; int yOffset = (originalHeight - newHeight)/2; - // For some reason L needs this to work. - // This code is only run on the Nexus 5. - // TODO: Determine why this is needed. - if (Build.VERSION.SDK_INT >= 21 || Build.VERSION.CODENAME.equals("L")) { - Log.v(TAG,"xOffset = " + xOffset); - Log.v(TAG,"yOffset = " + yOffset); - xOffset *= 2; - yOffset = 0; - Log.v(TAG,"new xOffset = " + xOffset); - Log.v(TAG,"new yOffset = " + yOffset); - } - if (xOffset < 0 || yOffset < 0) { return dataBundle; } |