diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-04 01:55:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-04 01:55:05 -0700 |
| commit | e8eaa5979abb1af8b9b795a0ce8e1dac1ead1cfe (patch) | |
| tree | f6528854aab65da5689375402990f6706cdffa67 /src/com/android/gallery3d/app | |
| parent | 5e8fbec6930971ea19637870c22cb15554f3b332 (diff) | |
| parent | 5ee170cae1f2625f66d160593383e5b7533f6bb5 (diff) | |
| download | android_packages_apps_Gallery2-e8eaa5979abb1af8b9b795a0ce8e1dac1ead1cfe.tar.gz android_packages_apps_Gallery2-e8eaa5979abb1af8b9b795a0ce8e1dac1ead1cfe.tar.bz2 android_packages_apps_Gallery2-e8eaa5979abb1af8b9b795a0ce8e1dac1ead1cfe.zip | |
Merge "Fix crash when set split screen while muting a video"
Diffstat (limited to 'src/com/android/gallery3d/app')
| -rwxr-xr-x | src/com/android/gallery3d/app/MuteVideo.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/MuteVideo.java b/src/com/android/gallery3d/app/MuteVideo.java index 86bd05db2..bbb9fca7c 100755 --- a/src/com/android/gallery3d/app/MuteVideo.java +++ b/src/com/android/gallery3d/app/MuteVideo.java @@ -94,7 +94,9 @@ public class MuteVideo { Toast.makeText(mActivity, mActivity.getString(R.string.video_mute_err), Toast.LENGTH_SHORT).show(); if (mMuteProgress != null) { - mMuteProgress.dismiss(); + if (isActivityValid(mActivity)) { + mMuteProgress.dismiss(); + } mMuteProgress = null; } } @@ -112,7 +114,9 @@ public class MuteVideo { .show(); if (mMuteProgress != null) { - mMuteProgress.dismiss(); + if (isActivityValid(mActivity)) { + mMuteProgress.dismiss(); + } mMuteProgress = null; // Show the result only when the activity not @@ -134,7 +138,9 @@ public class MuteVideo { mMuteProgress.setMessage(mActivity.getString(R.string.please_wait)); mMuteProgress.setCancelable(false); mMuteProgress.setCanceledOnTouchOutside(false); - mMuteProgress.show(); + if (isActivityValid(mActivity)) { + mMuteProgress.show(); + } } private boolean isValidFileForMute(String mimeType) { if (mimeType != null) { @@ -148,4 +154,8 @@ public class MuteVideo { return false; } } + + private boolean isActivityValid(Activity activity) { + return (!activity.isDestroyed() && !activity.isFinishing()); + } } |