diff options
| author | George Mount <mount@google.com> | 2012-10-22 11:39:25 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2012-10-22 11:39:25 -0700 |
| commit | cb3a3da9a11dbebbdc77ff91ea5b18358295a43e (patch) | |
| tree | 0058f3197490509bec1335f0013f72a240edc104 /src | |
| parent | 0a32b7afc5286a5c7aa334b9338591d61a49731f (diff) | |
| download | android_packages_apps_Gallery2-cb3a3da9a11dbebbdc77ff91ea5b18358295a43e.tar.gz android_packages_apps_Gallery2-cb3a3da9a11dbebbdc77ff91ea5b18358295a43e.tar.bz2 android_packages_apps_Gallery2-cb3a3da9a11dbebbdc77ff91ea5b18358295a43e.zip | |
Add null-check for StitchingServiceProvider.
Bug 7386827
Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
Diffstat (limited to 'src')
| -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 |