am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev

* commit '035352b4d62e259c86576dd3d1495b21bed172ff':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
This commit is contained in:
Adam Cohen
2012-11-28 18:18:32 -08:00
committed by Android Git Automerger
4 changed files with 17 additions and 9 deletions

View File

@@ -281,8 +281,9 @@ class AppWidgetService extends IAppWidgetService.Stub
}
@Override
public List<AppWidgetProviderInfo> getInstalledProviders() throws RemoteException {
return getImplForUser(getCallingOrCurrentUserId()).getInstalledProviders();
public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter)
throws RemoteException {
return getImplForUser(getCallingOrCurrentUserId()).getInstalledProviders(categoryFilter);
}
@Override

View File

@@ -859,11 +859,7 @@ class AppWidgetServiceImpl {
}
}
public List<AppWidgetProviderInfo> getInstalledProviders() {
return getInstalledProviders(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
}
private List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {
public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {
synchronized (mAppWidgetIds) {
ensureStateLoadedLocked();
final int N = mInstalledProviders.size();