diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-07 19:34:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-07 19:34:07 -0700 |
| commit | 61c9f3c272046571a8febdac81e0062752b57b59 (patch) | |
| tree | 49e9853146ba2c4e26998f21957c729faa40a65e /src/com/android/camera/PhotoModule.java | |
| parent | 5f0bcf9d8ac6bc6f278187ce663818b3e6e986f3 (diff) | |
| parent | 22b52abb2df3d26a2189805eb719955c007a1ae6 (diff) | |
| download | android_packages_apps_Snap-61c9f3c272046571a8febdac81e0062752b57b59.tar.gz android_packages_apps_Snap-61c9f3c272046571a8febdac81e0062752b57b59.tar.bz2 android_packages_apps_Snap-61c9f3c272046571a8febdac81e0062752b57b59.zip | |
Merge "SnapdragonCamera: Fix ANR after capturing pictures continuously" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 30f67a327..206c60010 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1488,9 +1488,17 @@ public class PhotoModule onCaptureDone(); } } - if(!mLongshotActive) - mActivity.updateStorageSpaceAndHint(); - mUI.updateRemainingPhotos(--mRemainingPhotos); + if(!mLongshotActive) { + mActivity.updateStorageSpaceAndHint( + new CameraActivity.OnStorageUpdateDoneListener() { + @Override + public void onStorageUpdateDone(long storageSpace) { + mUI.updateRemainingPhotos(--mRemainingPhotos); + } + }); + } else { + mUI.updateRemainingPhotos(--mRemainingPhotos); + } long now = System.currentTimeMillis(); mJpegCallbackFinishTime = now - mJpegPictureCallbackTime; Log.v(TAG, "mJpegCallbackFinishTime = " |