diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-11-10 02:37:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-10 02:37:48 +0000 |
| commit | 77a550c7ffb4dfe44493b4bbdcf368079f0fcaa6 (patch) | |
| tree | 8c8d12eef620cb50fb4a1a99b69ce7d678146cf8 /src/com/android | |
| parent | 08457a37c2c2557a84cddb33f98a2c401be428ea (diff) | |
| parent | c43a0f9310ad9941c5a0150b3deb4959f2e6250d (diff) | |
| download | android_packages_apps_PackageInstaller-77a550c7ffb4dfe44493b4bbdcf368079f0fcaa6.tar.gz android_packages_apps_PackageInstaller-77a550c7ffb4dfe44493b4bbdcf368079f0fcaa6.tar.bz2 android_packages_apps_PackageInstaller-77a550c7ffb4dfe44493b4bbdcf368079f0fcaa6.zip | |
Merge "Fix crash in OnDismiss" am: bae2b676e4 am: 9e712cb5c5
am: c43a0f9310
* commit 'c43a0f9310ad9941c5a0150b3deb4959f2e6250d':
Fix crash in OnDismiss
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/packageinstaller/UninstallerActivity.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java index e277d48f..f1afe424 100755 --- a/src/com/android/packageinstaller/UninstallerActivity.java +++ b/src/com/android/packageinstaller/UninstallerActivity.java @@ -109,7 +109,9 @@ public class UninstallerActivity extends Activity { @Override public void onDismiss(DialogInterface dialog) { super.onDismiss(dialog); - getActivity().finish(); + if (isAdded()) { + getActivity().finish(); + } } } @@ -127,9 +129,11 @@ public class UninstallerActivity extends Activity { @Override public void onDismiss(DialogInterface dialog) { super.onDismiss(dialog); - ((UninstallerActivity) getActivity()).dispatchAborted(); - getActivity().setResult(Activity.RESULT_FIRST_USER); - getActivity().finish(); + if (isAdded()) { + ((UninstallerActivity) getActivity()).dispatchAborted(); + getActivity().setResult(Activity.RESULT_FIRST_USER); + getActivity().finish(); + } } } |