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

Merge "Address API Review comments" into oc-dev

Browse Source 
am: 974cea8f4c

Change-Id: I5991eeceabe0b7a3488173be330bcf02649d395d
This commit is contained in:
Tony Wickham
2017-04-25 18:25:44 +00:00
committed by android-build-merger
parent 90c60be02f 974cea8f4c
commit e90ece4635
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/appwidget/AppWidgetManager.java
View File

@@ -712,12 +712,13 @@ public class AppWidgetManager {
* *
* @param profile The profile for which to get providers. Passing null is equivalent * @param profile The profile for which to get providers. Passing null is equivalent
* to querying for only the calling user. * to querying for only the calling user.
* @return The installed providers. * @return The installed providers, or an empty list if none are found for the given user.
* *
* @see android.os.Process#myUserHandle() * @see android.os.Process#myUserHandle()
* @see android.os.UserManager#getUserProfiles() * @see android.os.UserManager#getUserProfiles()
*/ */
public List<AppWidgetProviderInfo> getInstalledProvidersForProfile(@Nullable UserHandle profile) { public @NonNull List<AppWidgetProviderInfo> getInstalledProvidersForProfile(
@Nullable UserHandle profile) {
if (mService == null) { if (mService == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
@@ -735,13 +736,20 @@ public class AppWidgetManager {
* equivalent to {@link #getInstalledProvidersForProfile(UserHandle)}. * equivalent to {@link #getInstalledProvidersForProfile(UserHandle)}.
* @param profile The profile for which to get providers. Passing null is equivalent * @param profile The profile for which to get providers. Passing null is equivalent
* to querying for only the calling user. * to querying for only the calling user.
* @return The installed providers. * @return The installed providers, or an empty list if none are found for the given
* package and user.
* @throws NullPointerException if the provided package name is null
* *
* @see android.os.Process#myUserHandle() * @see android.os.Process#myUserHandle()
* @see android.os.UserManager#getUserProfiles() * @see android.os.UserManager#getUserProfiles()
*/ */
public List<AppWidgetProviderInfo> getInstalledProvidersForPackage(@Nullable String packageName, public @NonNull List<AppWidgetProviderInfo> getInstalledProvidersForPackage(
@Nullable UserHandle profile) { @NonNull String packageName, @Nullable UserHandle profile) {
if (packageName == null) {
throw new NullPointerException("A non-null package must be passed to this method. " +
"If you want all widgets regardless of package, see " +
"getInstalledProvidersForProfile(UserHandle)");
}
if (mService == null) { if (mService == null) {
return Collections.emptyList(); return Collections.emptyList();
} }