summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/data
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2013-09-29 15:02:50 -0700
committerAlan Newberger <alann@google.com>2013-09-29 15:14:49 -0700
commitfb344efde20ffab903fae7c6e5a2e1c90b4ef085 (patch)
tree6404afc3e87608573155cf0de08ba911e92b6e73 /src/com/android/camera/data
parentac5cb2430408f9a1854a4e22e8297733279bf75b (diff)
downloadandroid_packages_apps_Snap-fb344efde20ffab903fae7c6e5a2e1c90b4ef085.tar.gz
android_packages_apps_Snap-fb344efde20ffab903fae7c6e5a2e1c90b4ef085.tar.bz2
android_packages_apps_Snap-fb344efde20ffab903fae7c6e5a2e1c90b4ef085.zip
Temporary removal of resize code to evaluate GCam image bug
removes LocalMediaData resize code to evaluate black screenshots. this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF. Bug: 10988273 Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
Diffstat (limited to 'src/com/android/camera/data')
-rw-r--r--src/com/android/camera/data/LocalMediaData.java40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index f2df94fd4..ca29ad24b 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -513,39 +513,6 @@ public abstract class LocalMediaData implements LocalData {
}
Bitmap b = BitmapFactory.decodeFile(mPath, opts);
- // For correctness, we need to double check the size here. The
- // good news is that decoding bounds take much less time than
- // decoding samples like < 1%.
- // TODO: better organize the decoding and sampling by using a
- // image cache.
- int width = 0;
- int height = 0;
- BitmapFactory.Options justBoundsOpts = new BitmapFactory.Options();
- justBoundsOpts.inJustDecodeBounds = true;
- BitmapFactory.decodeFile(mPath, justBoundsOpts);
- if (justBoundsOpts.outWidth > 0 && justBoundsOpts.outHeight > 0) {
- width = justBoundsOpts.outWidth;
- height = justBoundsOpts.outHeight;
- }
- if (mOrientation == 90 || mOrientation == 270) {
- int temp = width;
- width = height;
- height = temp;
- }
-
- // If the decoded width and height is valid and not matching the
- // values from MediaStore, then update the MediaStore. This only
- // happened when the MediaStore had been told a wrong data.
- if (width > 0 && height > 0 && (width != mWidth || height != mHeight)) {
- ContentValues values = new ContentValues();
- values.put(Images.Media.WIDTH, width);
- values.put(Images.Media.HEIGHT, height);
- mResolver.update(getContentUri(), values, null, null);
- mNeedsRefresh = true;
- Log.w(TAG, "MediaStore has been updated with correct size!");
- return null;
- }
-
if (mOrientation != 0 && b != null) {
if (isCancelled() || !isUsing()) {
return null;
@@ -557,13 +524,6 @@ public abstract class LocalMediaData implements LocalData {
return b;
}
- @Override
- protected void onPostExecute(Bitmap bitmap) {
- super.onPostExecute(bitmap);
- if (mNeedsRefresh && mAdapter != null) {
- mAdapter.refresh(mResolver, getContentUri());
- }
- }
}
@Override