diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-09 11:47:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 11:47:22 -0700 |
| commit | 8c521cd949f730d05d7e85ce8032a62e710c0145 (patch) | |
| tree | daeb603dde4bb6077269fc98e8b4dd9ad83882f3 | |
| parent | 1ee4521cae87c79a3ff8711591f317203ca82c66 (diff) | |
| parent | e1060376749a38dfffcdc9175553097fe13aa027 (diff) | |
| download | android_packages_apps_Snap-8c521cd949f730d05d7e85ce8032a62e710c0145.tar.gz android_packages_apps_Snap-8c521cd949f730d05d7e85ce8032a62e710c0145.tar.bz2 android_packages_apps_Snap-8c521cd949f730d05d7e85ce8032a62e710c0145.zip | |
am 6e733b74: Fix share crash after closing photo editor
* commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3':
Fix share crash after closing photo editor
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 16 |
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: { |