1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 43867bbfe..2f8573e60 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -46,6 +46,8 @@ import com.android.gallery3d.data.MediaObject;
 import com.android.gallery3d.data.MediaSet;
 import com.android.gallery3d.data.MtpSource;
 import com.android.gallery3d.data.Path;
+import com.android.gallery3d.data.SecureAlbum;
+import com.android.gallery3d.data.SecureSource;
 import com.android.gallery3d.data.SnailAlbum;
 import com.android.gallery3d.data.SnailItem;
 import com.android.gallery3d.data.SnailSource;
@@ -112,6 +114,9 @@ public class PhotoPage extends ActivityState implements
     // E.g., viewing a photo in gmail attachment
     private FilterDeleteSet mMediaSet;
 
+    // The mediaset used by camera launched from secure lock screen.
+    private SecureAlbum mSecureAlbum;
+
     private int mCurrentIndex = 0;
     private Handler mHandler;
     private boolean mShowBars = true;
@@ -244,6 +249,12 @@ public class PhotoPage extends ActivityState implements
                         .getMediaObject(screenNailItemPath);
                 mScreenNailItem.setScreenNail(mAppBridge.attachScreenNail());
 
+                // Check if the path is a secure album.
+                if (SecureSource.isSecurePath(mSetPathString)) {
+                    mSecureAlbum = (SecureAlbum) mActivity.getDataManager()
+                            .getMediaSet(mSetPathString);
+                }
+
                 // Combine the original MediaSet with the one for ScreenNail
                 // from AppBridge.
                 mSetPathString = "/combo/item/{" + screenNailSetPath +
@@ -580,6 +591,11 @@ public class PhotoPage extends ActivityState implements
     }
 
     @Override
+    public void addSecureAlbumItem(boolean isVideo, int id) {
+        mSecureAlbum.addMediaItem(isVideo, id);
+    }
+
+    @Override
     protected boolean onCreateActionBar(Menu menu) {
         mActionBar.createActionBarMenu(R.menu.photo, menu);
         if (mPendingSharePath != null) updateShareURI(mPendingSharePath);