am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev

* commit '6189888a2565b6362b0dd022850b748f628500d0':
  Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
This commit is contained in:
Adam Cohen
2012-11-15 14:59:33 -08:00
committed by Android Git Automerger

View File

@@ -855,13 +855,17 @@ class AppWidgetServiceImpl {
}
public List<AppWidgetProviderInfo> getInstalledProviders() {
return getInstalledProviders(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
}
private List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {
synchronized (mAppWidgetIds) {
ensureStateLoadedLocked();
final int N = mInstalledProviders.size();
ArrayList<AppWidgetProviderInfo> result = new ArrayList<AppWidgetProviderInfo>(N);
for (int i = 0; i < N; i++) {
Provider p = mInstalledProviders.get(i);
if (!p.zombie) {
if (!p.zombie && (p.info.widgetCategory & categoryFilter) != 0) {
result.add(cloneIfLocalBinder(p.info));
}
}