summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 94508d255..dc1e2ba05 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1522,12 +1522,15 @@ public class CameraActivity extends Activity
}
mLocalImagesObserver.setActivityPaused(false);
mLocalVideosObserver.setActivityPaused(false);
- mLocalImagesObserver.setForegroundChangeListener(new LocalMediaObserver.ChangeListener() {
- @Override
- public void onChange() {
- mDataAdapter.requestLoadNewPhotos();
- }
- });
+ if (!mSecureCamera) {
+ mLocalImagesObserver.setForegroundChangeListener(
+ new LocalMediaObserver.ChangeListener() {
+ @Override
+ public void onChange() {
+ mDataAdapter.requestLoadNewPhotos();
+ }
+ });
+ }
keepScreenOnForAWhile();