summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-09 11:02:38 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-09 11:26:48 -0700
commite1060376749a38dfffcdc9175553097fe13aa027 (patch)
tree97289082ff19368d7f4df8750d57935109088a37 /src/com
parentd69035a67e0c650e2aa076ee678a6f9a82dffa77 (diff)
downloadandroid_packages_apps_Snap-e1060376749a38dfffcdc9175553097fe13aa027.tar.gz
android_packages_apps_Snap-e1060376749a38dfffcdc9175553097fe13aa027.tar.bz2
android_packages_apps_Snap-e1060376749a38dfffcdc9175553097fe13aa027.zip
Fix share crash after closing photo editor
Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 80849b174..f2fb3da9d 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -331,6 +331,22 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
}
@Override
+ public void onPause() {
+ super.onPause();
+ if (mShareActionProvider != null) {
+ mShareActionProvider.setOnShareTargetSelectedListener(null);
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (mShareActionProvider != null) {
+ mShareActionProvider.setOnShareTargetSelectedListener(this);
+ }
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.undoButton: {