diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-11-10 02:31:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-10 02:31:55 +0000 |
| commit | 9e712cb5c511c21e2b962c7b67c099254e5ff843 (patch) | |
| tree | 1976fb6e265981b1ce576381ad1d8be6caa8072d /src/com/android | |
| parent | 5ea7d99b8af4d4bb4b943a1222a222f996dae533 (diff) | |
| parent | bae2b676e47548f9b8f0cf7ca1aae22ff806bfbb (diff) | |
| download | android_packages_apps_PackageInstaller-9e712cb5c511c21e2b962c7b67c099254e5ff843.tar.gz android_packages_apps_PackageInstaller-9e712cb5c511c21e2b962c7b67c099254e5ff843.tar.bz2 android_packages_apps_PackageInstaller-9e712cb5c511c21e2b962c7b67c099254e5ff843.zip | |
Merge "Fix crash in OnDismiss"
am: bae2b676e4
* commit 'bae2b676e47548f9b8f0cf7ca1aae22ff806bfbb':
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(); + } } } |