summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2013-09-29 15:18:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-29 15:18:13 -0700
commitf390ec0c09bbd043466a5b22c9bef70426c3c07b (patch)
tree4c359c4d76b07f216036320a15169161a5ec95ca
parent70d6ff76b6e967fccbaf66256331e076366d6ae0 (diff)
parentfb344efde20ffab903fae7c6e5a2e1c90b4ef085 (diff)
downloadandroid_packages_apps_Snap-f390ec0c09bbd043466a5b22c9bef70426c3c07b.tar.gz
android_packages_apps_Snap-f390ec0c09bbd043466a5b22c9bef70426c3c07b.tar.bz2
android_packages_apps_Snap-f390ec0c09bbd043466a5b22c9bef70426c3c07b.zip
am fb344efd: Temporary removal of resize code to evaluate GCam image bug
* commit 'fb344efde20ffab903fae7c6e5a2e1c90b4ef085': Temporary removal of resize code to evaluate GCam image bug
-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