commit f8d7fb030ab4e002ea0613347f9abaab335ce04b
author Yao Lu <yaolu@google.com> Thu Nov 10 02:45:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 02:45:28 2016 +0000
tree 0e2fcc26d88de0e9bc1935700ea378ecaf39de72
parent 0440965cad1ca70a7ec401034a5fdaa617a1d6e4
parent f83db43ccf5250574ac521bbcc642ea3c4b8278c

Merge "Fix QuickContact is finished when cancelling link action" into ub-contactsdialer-h-dev

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 52c66d5..f8d7436 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -908,7 +908,7 @@
         } else if (requestCode == REQUEST_CODE_JOIN) {
             // Ignore failed requests
             if (resultCode != Activity.RESULT_OK) {
-                processIntent(data);
+                return;
             }
             if (data != null) {
                 joinAggregate(ContentUris.parseId(data.getData()));