diff options
| author | Angus Kong <shkong@google.com> | 2013-10-12 23:48:46 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-10-13 00:38:38 -0700 |
| commit | 2d5c74785d19f1944cab92948a6fa8233086ebc1 (patch) | |
| tree | f574a9f42aaeccb918dd1a567e553144035d84ce | |
| parent | f1582c9c075e9cd5790b4bbe1101c94a45ac15d2 (diff) | |
| download | android_packages_apps_Snap-2d5c74785d19f1944cab92948a6fa8233086ebc1.tar.gz android_packages_apps_Snap-2d5c74785d19f1944cab92948a6fa8233086ebc1.tar.bz2 android_packages_apps_Snap-2d5c74785d19f1944cab92948a6fa8233086ebc1.zip | |
Don't load data when it's secure camera.
bug:11063164
Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 132e5ceba..dae2d0804 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1106,7 +1106,11 @@ public class CameraActivity extends Activity if (mLocalVideosObserver.isMediaDataChangedDuringPause() || mLocalImagesObserver.isMediaDataChangedDuringPause()) { - mDataAdapter.requestLoad(getContentResolver()); + if (!mSecureCamera) { + // If it's secure camera, requestLoad() should not be called + // as it will load all the data. + mDataAdapter.requestLoad(getContentResolver()); + } } mLocalImagesObserver.setActivityPaused(false); mLocalVideosObserver.setActivityPaused(false); |