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();
+            }
         }
     }