diff options
| author | George Mount <mount@google.com> | 2012-10-23 15:06:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 15:06:38 -0700 |
| commit | 80e4d5e36d3d3c8da550b7200a5359c9ff468809 (patch) | |
| tree | aaad8ea0ec2bd358adf5bfd34f9db0fb170c2d5f | |
| parent | e77c489a1922e52b115e0901bce0cb069c7b46d3 (diff) | |
| parent | 52863a17f1e0aab3d47a6b98b72812187620ee84 (diff) | |
| download | android_packages_apps_Snap-80e4d5e36d3d3c8da550b7200a5359c9ff468809.tar.gz android_packages_apps_Snap-80e4d5e36d3d3c8da550b7200a5359c9ff468809.tar.bz2 android_packages_apps_Snap-80e4d5e36d3d3c8da550b7200a5359c9ff468809.zip | |
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
* commit '7d7f91e1771e67af1fca5f2b3f221968df3de077':
Fix NPE in detecting panoramas.
| -rw-r--r-- | src/com/android/gallery3d/app/PanoramaMetadataSupport.java | 10 | ||||
| -rw-r--r-- | src_pd/com/android/gallery3d/util/LightCycleHelper.java | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/PanoramaMetadataSupport.java b/src/com/android/gallery3d/app/PanoramaMetadataSupport.java index d40422582..ba0c9e71a 100644 --- a/src/com/android/gallery3d/app/PanoramaMetadataSupport.java +++ b/src/com/android/gallery3d/app/PanoramaMetadataSupport.java @@ -20,6 +20,7 @@ import com.android.gallery3d.data.MediaObject.PanoramaSupportCallback; import com.android.gallery3d.data.PanoramaMetadataJob; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.FutureListener; +import com.android.gallery3d.util.LightCycleHelper; import com.android.gallery3d.util.LightCycleHelper.PanoramaMetadata; import java.util.ArrayList; @@ -77,13 +78,16 @@ public class PanoramaMetadataSupport implements FutureListener<PanoramaMetadata> public void onFutureDone(Future<PanoramaMetadata> future) { synchronized (mLock) { mPanoramaMetadata = future.get(); + if (mPanoramaMetadata == null) { + // Error getting panorama data from file. Treat as not panorama. + mPanoramaMetadata = LightCycleHelper.NOT_PANORAMA; + } for (PanoramaSupportCallback cb : mCallbacksWaiting) { - cb.panoramaInfoAvailable(mMediaObject, - mPanoramaMetadata.mUsePanoramaViewer, + cb.panoramaInfoAvailable(mMediaObject, mPanoramaMetadata.mUsePanoramaViewer, mPanoramaMetadata.mIsPanorama360); } mGetPanoMetadataTask = null; mCallbacksWaiting = null; } - } + } } diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java index 68c019567..bceeea6b4 100644 --- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java +++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java @@ -61,7 +61,7 @@ public class LightCycleHelper { } } - private static final PanoramaMetadata NOT_PANORAMA = new PanoramaMetadata(false, false); + public static final PanoramaMetadata NOT_PANORAMA = new PanoramaMetadata(false, false); public static void setupCaptureIntent(Context context, Intent it, String outputDir) { /* Do nothing */ |