Merge "Add AppWidgetManager#getInstalledProvidersForPackage()" into oc-dev (dfa3edb2) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7044,6 +7044,7 @@ package android.appwidget {
		method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo(int);
		method public android.os.Bundle getAppWidgetOptions(int);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProviders();
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForPackage(java.lang.String, android.os.UserHandle);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForProfile(android.os.UserHandle);
		method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);
		method public boolean isRequestPinAppWidgetSupported();

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7504,6 +7504,7 @@ package android.appwidget {
		method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo(int);
		method public android.os.Bundle getAppWidgetOptions(int);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProviders();
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForPackage(java.lang.String, android.os.UserHandle);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForProfile(android.os.UserHandle);
		method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);
		method public boolean isRequestPinAppWidgetSupported();

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7074,6 +7074,7 @@ package android.appwidget {
		method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo(int);
		method public android.os.Bundle getAppWidgetOptions(int);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProviders();
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForPackage(java.lang.String, android.os.UserHandle);
		method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForProfile(android.os.UserHandle);
		method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);
		method public boolean isRequestPinAppWidgetSupported();

core/java/android/appwidget/AppWidgetManager.java

+33 −8

Original line number	Diff line number	Diff line
		@@ -710,9 +710,9 @@ public class AppWidgetManager {
		* user may have a corporate profile. In this case the parent user profile has a
		* child profile, the corporate one.
		*
		* @param profile The profile for which to get providers. Passing null is equivaled
		* to passing only the current user handle.
		* @return The intalled providers.
		* @param profile The profile for which to get providers. Passing null is equivalent
		* to querying for only the calling user.
		* @return The installed providers.
		*
		* @see android.os.Process#myUserHandle()
		* @see android.os.UserManager#getUserProfiles()
		@@ -722,7 +722,31 @@ public class AppWidgetManager {
		return Collections.emptyList();
		}
		return getInstalledProvidersForProfile(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN,
		profile);
		profile, null);
		}

		/**
		* Gets the AppWidget providers for the given package and user profile. User
		* profile can only be the current user or a profile of the current user. For
		* example, the current user may have a corporate profile. In this case the
		* parent user profile has a child profile, the corporate one.
		*
		* @param packageName The package for which to get providers. If null, this method is
		* equivalent to {@link #getInstalledProvidersForProfile(UserHandle)}.
		* @param profile The profile for which to get providers. Passing null is equivalent
		* to querying for only the calling user.
		* @return The installed providers.
		*
		* @see android.os.Process#myUserHandle()
		* @see android.os.UserManager#getUserProfiles()
		*/
		public List<AppWidgetProviderInfo> getInstalledProvidersForPackage(@Nullable String packageName,
		@Nullable UserHandle profile) {
		if (mService == null) {
		return Collections.emptyList();
		}
		return getInstalledProvidersForProfile(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN,
		profile, packageName);
		}

		/**
		@@ -733,7 +757,7 @@ public class AppWidgetManager {
		return Collections.emptyList();
		}
		return getInstalledProvidersForProfile(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN,
		null);
		null, null);
		}

		/**
		@@ -752,7 +776,7 @@ public class AppWidgetManager {
		if (mService == null) {
		return Collections.emptyList();
		}
		return getInstalledProvidersForProfile(categoryFilter, null);
		return getInstalledProvidersForProfile(categoryFilter, null, null);
		}

		/**
		@@ -766,6 +790,7 @@ public class AppWidgetManager {
		* @param profile A profile of the current user which to be queried. The user
		* is itself also a profile. If null, the providers only for the current user
		* are returned.
		* @param packageName If specified, will only return providers from the given package.
		* @return The intalled providers.
		*
		* @see android.os.Process#myUserHandle()
		@@ -774,7 +799,7 @@ public class AppWidgetManager {
		* @hide
		*/
		public List<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter,
		UserHandle profile) {
		@Nullable UserHandle profile, @Nullable String packageName) {
		if (mService == null) {
		return Collections.emptyList();
		}
		@@ -785,7 +810,7 @@ public class AppWidgetManager {

		try {
		ParceledListSlice<AppWidgetProviderInfo> providers = mService.getInstalledProvidersForProfile(
		categoryFilter, profile.getIdentifier());
		categoryFilter, profile.getIdentifier(), packageName);
		if (providers == null) {
		return Collections.emptyList();
		}

core/java/com/android/internal/appwidget/IAppWidgetService.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,8 +55,8 @@ interface IAppWidgetService {
		in RemoteViews views);
		void updateAppWidgetProvider(in ComponentName provider, in RemoteViews views);
		void notifyAppWidgetViewDataChanged(String packageName, in int[] appWidgetIds, int viewId);
		ParceledListSlice getInstalledProvidersForProfile(int categoryFilter,
		int profileId);
		ParceledListSlice getInstalledProvidersForProfile(int categoryFilter, int profileId,
		String packageName);
		AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId);
		boolean hasBindAppWidgetPermission(in String packageName, int userId);
		void setBindAppWidgetPermission(in String packageName, int userId, in boolean permission);