diff options
| author | George Mount <mount@google.com> | 2012-10-22 14:37:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-22 14:37:12 -0700 |
| commit | d41414cc34d6800b3926a83be267160c481802a0 (patch) | |
| tree | 974b8b915d359030aec6248273859e7f96b76a9d | |
| parent | 9ff582c0df1212d1e616ddffbc109759a921f7d9 (diff) | |
| parent | 3651c39f614e37cbf35896838bf56bacd6423266 (diff) | |
| download | android_packages_apps_Snap-d41414cc34d6800b3926a83be267160c481802a0.tar.gz android_packages_apps_Snap-d41414cc34d6800b3926a83be267160c481802a0.tar.bz2 android_packages_apps_Snap-d41414cc34d6800b3926a83be267160c481802a0.zip | |
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '58d326ea368ae275f03ec158a9ec5f9d2965593a':
Add null-check for StitchingServiceProvider.
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryAppImpl.java | 4 |
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 |