Commit f83db43c authored Nov 09, 2016 by yaolu

Fix QuickContact is finished when cancelling link action

If no contact to be linked selected, null intent is returned to
QuickContact Activity. Should just return instead of processing the
intent.

Bug: 32024874

Test: Manually tested when opening QuickContact from main contacts
list, label view, and account view, following repro steps previous
QuickContact view shows.

Change-Id: Id89413ade3f7dac227c160ae5ab8e96bc1e48960

parent 5834df9b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -908,7 +908,7 @@ public class QuickContactActivity extends ContactsActivity implements
		} 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()));