commit af61b9bdc7291f817e00185e493107f84b76dee7
author Jay Shrauner <shrauner@google.com> Wed Sep 16 22:11:41 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 16 22:11:41 2015 +0000
tree e894eb581173fcb48f4438d88d5432114608e2da
parent 386bd69d3c2af6e1ffd6b49d17408c8e47c7c538
parent 5dcf5c391ff6bd382e03987bc01abc2e5e613db3

Merge "Fix IllegalStateException in start" into ub-contactsdialer-a-dev

src/com/android/contacts/interactions/ContactDeletionInteraction.java

diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index b05cbab..a626ad0 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -114,7 +114,7 @@
     static ContactDeletionInteraction startWithTestLoaderManager(
             Activity activity, Uri contactUri, boolean finishActivityWhenDone,
             TestLoaderManagerBase testLoaderManager) {
-        if (contactUri == null) {
+        if (contactUri == null || activity.isDestroyed()) {
             return null;
         }