Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches (7d7f91e1) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/PanoramaMetadataSupport.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -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,9 +78,12 @@ 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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */