Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo (88c4ec32) · Commits · e / os / android_packages_apps_Contacts

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -955,7 +955,7 @@ public class QuickContactActivity extends ContactsActivity {
		final boolean deletedOrSplit = requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&
		(resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED \|\|
		resultCode == ContactEditorActivity.RESULT_CODE_SPLIT);
		setResult(resultCode, data);
		setResult(resultCode);
		if (deletedOrSplit) {
		finish();
		} else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

+1 −20

Original line number	Diff line number	Diff line
		@@ -102,30 +102,11 @@ public class ImplicitIntentsUtil {
		*/
		public static void startQuickContact(Activity activity, Uri contactLookupUri,
		int previousScreenType) {
		startQuickContact(activity, contactLookupUri, previousScreenType, /* requestCode */ -1);
		}

		/**
		* Starts QuickContact for result with the default mode and specified previous screen type.
		*/
		public static void startQuickContactForResult(Activity activity, Uri contactLookupUri,
		int previousScreenType, int requestCode) {
		startQuickContact(activity, contactLookupUri, previousScreenType, requestCode);
		}

		private static void startQuickContact(Activity activity, Uri contactLookupUri,
		int previousScreenType, int requestCode) {
		final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(
		activity, contactLookupUri, previousScreenType);

		// We only start "for result" if specifically requested.
		if (requestCode >= 0) {
		intent.setPackage(activity.getPackageName());
		activity.startActivityForResult(intent, requestCode);
		} else {
		startActivityInApp(activity, intent);
		}
		}

		/**
		* Returns an implicit intent for opening QuickContacts with the default mode and specified