summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-22 11:39:25 -0700
committerGeorge Mount <mount@google.com>2012-10-22 11:39:25 -0700
commit3d7829c71c27a14e671017b46228c5d684bd349e (patch)
tree664c4e085e4d60ee3ef33e0523f6c0e5865f20fc
parent7ccf0111d388bbaf963ace2ea9eeb37903bffb0a (diff)
downloadandroid_packages_apps_Snap-3d7829c71c27a14e671017b46228c5d684bd349e.tar.gz
android_packages_apps_Snap-3d7829c71c27a14e671017b46228c5d684bd349e.tar.bz2
android_packages_apps_Snap-3d7829c71c27a14e671017b46228c5d684bd349e.zip
Add null-check for StitchingServiceProvider.
Bug 7386827 Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
-rw-r--r--src/com/android/gallery3d/app/GalleryAppImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java
index 443bc47ee..7b37f6f34 100644
--- a/src/com/android/gallery3d/app/GalleryAppImpl.java
+++ b/src/com/android/gallery3d/app/GalleryAppImpl.java
@@ -63,7 +63,9 @@ public class GalleryAppImpl extends Application implements GalleryApp {
state, PackageManager.DONT_KILL_APP);
mStitchingProgressManager = LightCycleHelper.createStitchingManagerInstance(this);
- mStitchingProgressManager.addChangeListener(getDataManager());
+ if (mStitchingProgressManager != null) {
+ mStitchingProgressManager.addChangeListener(getDataManager());
+ }
}
@Override