Merge the 2021-03-05 SPL branch from AOSP-Partner
* security-aosp-pi-release:
Stop returning intent data in QuickContact in onActivityResult
Change-Id: I904e12aa5e9162c1a5bf21d9da366b9cf8293d17
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index e985bbf..bade583 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -928,7 +928,7 @@
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 &&
diff --git a/src/com/android/contacts/util/ImplicitIntentsUtil.java b/src/com/android/contacts/util/ImplicitIntentsUtil.java
index 0d00519..a1ab896 100644
--- a/src/com/android/contacts/util/ImplicitIntentsUtil.java
+++ b/src/com/android/contacts/util/ImplicitIntentsUtil.java
@@ -102,29 +102,10 @@
*/
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);
- }
+ startActivityInApp(activity, intent);
}
/**