diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-11 00:20:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 00:20:53 -0700 |
| commit | 032a5a866ab99c5429f6d6537107bfd9700f1bf5 (patch) | |
| tree | 8b907a346fc000c6cdac86753d518297f0a412b9 /src | |
| parent | f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651 (diff) | |
| parent | 4d302b8a826ece492c2abefd56b780a65899663e (diff) | |
| download | android_packages_apps_Gallery2-032a5a866ab99c5429f6d6537107bfd9700f1bf5.tar.gz android_packages_apps_Gallery2-032a5a866ab99c5429f6d6537107bfd9700f1bf5.tar.bz2 android_packages_apps_Gallery2-032a5a866ab99c5429f6d6537107bfd9700f1bf5.zip | |
am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
* commit '4d302b8a826ece492c2abefd56b780a65899663e':
Fix NPE in PhotoPage.updateMenuOperations
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 16 |
1 files changed, 10 insertions, 6 deletions
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)); + } } } |