summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Cohen <adamcohen@google.com> 2012-11-15 14:10:07 -0800
committer Adam Cohen <adamcohen@google.com> 2012-11-15 14:53:31 -0800
commit3fcc6b26c3302f47c911730f81cbc3dc9b71484d (patch)
treee1569a4db6383cc0cc0ca9963d22ebfef36592e8
parenta1a2f967e2a0de4c4190a775ac314ad32288727e (diff)
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
-rw-r--r--services/java/com/android/server/AppWidgetServiceImpl.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java
index a8611d14facf..d2354a6485de 100644
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -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));
}
}