diff options
| author | 2023-05-12 17:39:26 +0000 | |
|---|---|---|
| committer | 2023-05-12 17:39:26 +0000 | |
| commit | 3753f03f4594a632951b579d512bffe190be57c1 (patch) | |
| tree | 9c1269aab3fd65bc50e5688ddaadbc889c8e91f7 /java/src | |
| parent | 1fa7a57dcb12302c1813b96edbf94f1085a040eb (diff) | |
| parent | 0a2fca3d061254321fcaedb1c164d16a9068866d (diff) | |
Merge "Document that this ResolverActivity isn't directly used." into udc-dev am: 45246ffd7d am: 0a2fca3d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23209030
Change-Id: Icd20d710c8af48b1f1787484f4edc6f563ebb95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ResolverActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/intentresolver/ResolverActivity.java b/java/src/com/android/intentresolver/ResolverActivity.java index 5205f9b6..ac3b9a61 100644 --- a/java/src/com/android/intentresolver/ResolverActivity.java +++ b/java/src/com/android/intentresolver/ResolverActivity.java @@ -125,9 +125,10 @@ import java.util.Set; import java.util.function.Supplier; /** - * This activity is displayed when the system attempts to start an Intent for - * which there is more than one matching activity, allowing the user to decide - * which to go to. It is not normally used directly by application developers. + * This is a copy of ResolverActivity to support IntentResolver's ChooserActivity. This code is + * *not* the resolver that is actually triggered by the system right now (you want + * frameworks/base/core/java/com/android/internal/app/ResolverActivity.java for that), the full + * migration is not complete. */ @UiThread public class ResolverActivity extends FragmentActivity implements |