From 2d5c74785d19f1944cab92948a6fa8233086ebc1 Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Sat, 12 Oct 2013 23:48:46 -0700
Subject: Don't load data when it's secure camera.

  bug:11063164

Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
---
 src/com/android/camera/CameraActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3