Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev

Browse Source 
* commit '728b7500b3d34cd89f7aff0bad1bb7fe3e097f11':
  Document possible null returns in PackageManager
This commit is contained in:
Christopher Tate
2015-06-18 21:02:18 +00:00
committed by Android Git Automerger
parent df1745a12b 728b7500b3
commit 528e9abeef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/PackageManager.java
View File

@@ -2900,7 +2900,7 @@ public abstract class PackageManager {
* *
* @return A List<ResolveInfo> containing one entry for each matching * @return A List<ResolveInfo> containing one entry for each matching
* Receiver. These are ordered from first to last in priority. If * Receiver. These are ordered from first to last in priority. If
* there are no matching receivers, an empty list is returned. * there are no matching receivers, an empty list or {@code null} is returned.
* *
* @see #MATCH_DEFAULT_ONLY * @see #MATCH_DEFAULT_ONLY
* @see #GET_INTENT_FILTERS * @see #GET_INTENT_FILTERS
@@ -2936,7 +2936,7 @@ public abstract class PackageManager {
* ServiceInfo. These are ordered from best to worst match -- that * ServiceInfo. These are ordered from best to worst match -- that
* is, the first item in the list is what is returned by * is, the first item in the list is what is returned by
* resolveService(). If there are no matching services, an empty * resolveService(). If there are no matching services, an empty
* list is returned. * list or {@code null} is returned.
* *
* @see #GET_INTENT_FILTERS * @see #GET_INTENT_FILTERS
* @see #GET_RESOLVED_FILTER * @see #GET_RESOLVED_FILTER
@@ -2955,7 +2955,7 @@ public abstract class PackageManager {
* ServiceInfo. These are ordered from best to worst match -- that * ServiceInfo. These are ordered from best to worst match -- that
* is, the first item in the list is what is returned by * is, the first item in the list is what is returned by
* resolveService(). If there are no matching services, an empty * resolveService(). If there are no matching services, an empty
* list is returned. * list or {@code null} is returned.
* *
* @see #GET_INTENT_FILTERS * @see #GET_INTENT_FILTERS
* @see #GET_RESOLVED_FILTER * @see #GET_RESOLVED_FILTER
@@ -2977,7 +2977,7 @@ public abstract class PackageManager {
* @param flags Additional option flags. * @param flags Additional option flags.
* @return A List<ResolveInfo> containing one entry for each matching * @return A List<ResolveInfo> containing one entry for each matching
* ProviderInfo. These are ordered from best to worst match. If * ProviderInfo. These are ordered from best to worst match. If
* there are no matching providers, an empty list is returned. * there are no matching providers, an empty list or {@code null} is returned.
* @see #GET_INTENT_FILTERS * @see #GET_INTENT_FILTERS
* @see #GET_RESOLVED_FILTER * @see #GET_RESOLVED_FILTER
*/ */