Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches (2cb4269e) · Commits · e / os / android_packages_apps_Gallery2

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -661,8 +661,9 @@ public class PhotoPage extends ActivityState implements
		&& (photo.getSupportedOperations() & MediaItem.SUPPORT_SHARE) != 0) {
		updateShareURI(photo.getPath());
		}
		StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
		if (mProgressBar != null) {
		mProgressBar.hideProgress();
		StitchingProgressManager progressManager = mApplication.getStitchingProgressManager();
		if (progressManager != null && mCurrentPhoto instanceof LocalImage) {
		Integer progress = progressManager.getProgress(photo.getContentUri());
		if (progress != null) {
		@@ -670,6 +671,7 @@ public class PhotoPage extends ActivityState implements
		}
		}
		}
		}

		private void updateMenuOperations() {
		Menu menu = mActionBar.getMenu();