diff options
| author | 2023-05-12 16:55:39 +0000 | |
|---|---|---|
| committer | 2023-05-12 16:55:39 +0000 | |
| commit | 4b19dbc551e361d6407aca7e146bda0b6a3a30fb (patch) | |
| tree | 944efe5820ca401f4fafb41e41fc6e5957506ff3 /java/src | |
| parent | 2bf2724e63a34540f0d3f802c984c995cd7cb746 (diff) | |
| parent | 45246ffd7da029d0a875f5f6950d8e730e1c2fc2 (diff) | |
Merge "Document that this ResolverActivity isn't directly used." into udc-dev am: 45246ffd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23209030
Change-Id: I8b79cfa07c5e541f9f09216eb1ab7967a4790e75
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 |