From 16b3bfbbd2a6447684ac406554f862b29c873751 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 18 Oct 2012 14:20:39 -0700
Subject: Remove panorama checks from supported operations.

 Bug 7351383
 Bug 7349438
 Move panorama support checks from getSupportedOperations so
 that calls to getSupportedOperations are consistent. Panorama
 checks are moved to only based on callbacks.

Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
---
 src_pd/com/android/gallery3d/util/LightCycleHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src_pd')

diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index 6ebd9eca2..68c019567 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -61,6 +61,8 @@ public class LightCycleHelper {
         }
     }
 
+    private static final PanoramaMetadata NOT_PANORAMA = new PanoramaMetadata(false, false);
+
     public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
         /* Do nothing */
     }
@@ -70,7 +72,7 @@ public class LightCycleHelper {
     }
 
     public static PanoramaMetadata getPanoramaMetadata(Context context, Uri uri) {
-        return null;
+        return NOT_PANORAMA;
     }
 
     public static CameraModule createPanoramaModule() {
-- 
cgit v1.2.3