From 4d302b8a826ece492c2abefd56b780a65899663e Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Wed, 10 Oct 2012 22:04:54 -0700 Subject: Fix NPE in PhotoPage.updateMenuOperations Bug: 7324012 Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b --- src/com/android/gallery3d/app/PhotoPage.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index f6e3fb745..792ac0c64 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -726,14 +726,18 @@ public class PhotoPage extends ActivityState implements if ((supportedOperations & MediaObject.SUPPORT_PANORAMA360) != 0) { mActivity.invalidateOptionsMenu(); item = menu.findItem(R.id.action_share); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); - item.setTitle( - mActivity.getResources().getString(R.string.share_as_photo)); + if (item != null) { + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + item.setTitle( + mActivity.getResources().getString(R.string.share_as_photo)); + } } else if ((supportedOperations & MediaObject.SUPPORT_SHARE) != 0) { item = menu.findItem(R.id.action_share); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - item.setTitle( - mActivity.getResources().getString(R.string.share)); + if (item != null) { + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + item.setTitle( + mActivity.getResources().getString(R.string.share)); + } } } -- cgit v1.2.3