diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-02-18 20:11:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-18 20:11:51 -0800 |
| commit | c0784c749bb36c9746acd8fe5fe26b3205104d22 (patch) | |
| tree | 406dce794cef24f418a94d38a39bb85e6d0a8a79 /core/java/android | |
| parent | 8378bb39473c14b41bb7e1eec499f7b6be119d01 (diff) | |
| parent | bd3f527ea0fcca2be0f773e5d6832a80a884699f (diff) | |
| download | frameworks_base-c0784c749bb36c9746acd8fe5fe26b3205104d22.zip frameworks_base-c0784c749bb36c9746acd8fe5fe26b3205104d22.tar.gz frameworks_base-c0784c749bb36c9746acd8fe5fe26b3205104d22.tar.bz2 | |
Merge "Elaborate a little on the documentation for PackageManager's resolveActivity."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index ff2ed3d..8576de2 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1153,7 +1153,9 @@ public abstract class PackageManager { * * @return Returns a ResolveInfo containing the final activity intent that * was determined to be the best action. Returns null if no - * matching activity was found. + * matching activity was found. If multiple matching activities are + * found and there is no default set, returns a ResolveInfo + * containing something else, such as the activity resolver. * * @see #MATCH_DEFAULT_ONLY * @see #GET_INTENT_FILTERS |