| commit | 0132ff16271d744c586294b3ab2d5db473e23ef2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 21 15:10:01 2024 -0800 |
| committer | Xin Li <delphij@google.com> | Thu Nov 21 15:10:01 2024 -0800 |
| tree | 4b1174f93ade51c75b6a6a1a77227334fe06c81f | |
| parent | 3e712a1fd1abda96f6ea9c7d30ddd86426c4c18c [diff] | |
| parent | 0d4d67aed58d2b35a2406202654b327be7c10a26 [diff] |
Merge ab/AP4A.240925.013 into aosp-main-future Bug: 370570306 Merged-In: I1403fb64502e5b731ae08a51df8198801314c951 Change-Id: I97c4bbc657da5823aa9fe9d17563a77e06743fba
diff --git a/README b/README new file mode 100644 index 0000000..1372f28 --- /dev/null +++ b/README
@@ -0,0 +1,4 @@ +This app is not actively supported and the source is only available as a +reference. This project will be removed from the source manifest sometime in the +future. +
diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java index 7ad67d1..bd7f33f 100644 --- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java +++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -57,6 +57,7 @@ final ImportVCardDialogFragment dialog = new ImportVCardDialogFragment(); dialog.setArguments(args); + dialog.setCancelable(false); dialog.show(activity.getFragmentManager(), TAG); }