summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Huibers <andyhuibers@google.com>2014-09-26 12:42:54 -0700
committerAndy Huibers <andyhuibers@google.com>2014-09-26 12:42:54 -0700
commitad12363ecaba370c2425677eef6e562bf7c98e3e (patch)
treec16c84ee0d96eabbefd8fae89eb14a91e77a89ef
parent47c4474ea9e51a58f2ba1795de90c9aaf135f442 (diff)
downloadandroid_packages_apps_Camera2-ad12363ecaba370c2425677eef6e562bf7c98e3e.tar.gz
android_packages_apps_Camera2-ad12363ecaba370c2425677eef6e562bf7c98e3e.tar.bz2
android_packages_apps_Camera2-ad12363ecaba370c2425677eef6e562bf7c98e3e.zip
Revert app workaround for bug 17614203 now that HAL is fixed.
This reverts ag/543302. Bug: 17614203 Bug: 17145703 Change-Id: I3ec21902e59156ea30c181ecd6a7728f7262110a
-rw-r--r--src/com/android/camera/PhotoModule.java12
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;
}