commit 6383d97558433e39e4f43a5895d81bba0d0aafba
author Sam Judd <judds@google.com> Tue Mar 18 16:00:32 2014 -0700
committer Sam Judd <judds@google.com> Tue Mar 18 16:01:02 2014 -0700
tree 7414e11d8950c88baa336e65bd77248418ee7fe7
parent bd245b28022503b5f9060b384cb8b6601aba66b5

Dont call requestLoadNewPhotos in secure camera mode.

Bug: 13530796
Change-Id: I6e9bb51ed529bc633511f7c29d3ac9268c617717

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 534672e..75179a3 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1521,12 +1521,15 @@
         }
         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();