diff options
author | Jing (Mia) Wang <kaiyiz@codeaurora.org> | 2014-12-12 10:17:49 +0800 |
---|---|---|
committer | Jing (Mia) Wang <kaiyiz@codeaurora.org> | 2014-12-12 10:17:49 +0800 |
commit | 635160088a0f38f75998e167557d1d6e494d098b (patch) | |
tree | 11d16c98ce8ae45b5d88b9e55194f736f1252129 /src | |
parent | 36dd26755a2fd13c20bc4267298f603e99c0e867 (diff) | |
download | android_packages_apps_Snap-635160088a0f38f75998e167557d1d6e494d098b.tar.gz android_packages_apps_Snap-635160088a0f38f75998e167557d1d6e494d098b.tar.bz2 android_packages_apps_Snap-635160088a0f38f75998e167557d1d6e494d098b.zip |
Camera2: fix preview thumb could not update after delete photo
The preview thumb bitmap is still exist after restart Camera even if
some photo in phone is changed.
Clear preview thumb bitmap when resume camera activity.
CRs-Fixed: 768224
Change-Id: I3d0713a38d92d7d28a73f833df6d7e8e53faa23c
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b5fc0a676..3c4a93a18 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -621,8 +621,10 @@ public class CameraActivity extends Activity if (cursor == null) return null; int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); - cursor.moveToFirst(); - String s = cursor.getString(column_index); + String s = null; + if (cursor.moveToFirst()) { + s = cursor.getString(column_index); + } cursor.close(); return s; } @@ -1418,6 +1420,7 @@ public class CameraActivity extends Activity // If it's secure camera, requestLoad() should not be called // as it will load all the data. mDataAdapter.requestLoad(getContentResolver()); + setPreviewThumbnailBitmap(null); } } mLocalImagesObserver.setActivityPaused(false); |