summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-08-26 15:52:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-26 15:52:07 -0700
commit267f4d6a22aade4f63831e166312647212816a3d (patch)
treed2772e11497266e7246401198ff85b08000c29e1 /services
parent0add80b454c5fe99a158a9537666a4c8ab999359 (diff)
parent8f0f1b1e9defc61c2831e8856b18f2e00cfd789d (diff)
downloadframeworks_base-267f4d6a22aade4f63831e166312647212816a3d.zip
frameworks_base-267f4d6a22aade4f63831e166312647212816a3d.tar.gz
frameworks_base-267f4d6a22aade4f63831e166312647212816a3d.tar.bz2
am 8f0f1b1e: am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d' * commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d': Just disable widgets that come from apps on sd cards, because they don't work anyway.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/AppWidgetService.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index c181107..5ef3d35 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -26,6 +26,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo;
@@ -1222,7 +1223,9 @@ class AppWidgetService extends IAppWidgetService.Stub
for (int i=0; i<N; i++) {
ResolveInfo ri = broadcastReceivers.get(i);
ActivityInfo ai = ri.activityInfo;
-
+ if ((ai.applicationInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ continue;
+ }
if (pkgName.equals(ai.packageName)) {
addProviderLocked(ri);
}
@@ -1241,6 +1244,9 @@ class AppWidgetService extends IAppWidgetService.Stub
for (int i=0; i<N; i++) {
ResolveInfo ri = broadcastReceivers.get(i);
ActivityInfo ai = ri.activityInfo;
+ if ((ai.applicationInfo.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ continue;
+ }
if (pkgName.equals(ai.packageName)) {
ComponentName component = new ComponentName(ai.packageName, ai.name);
Provider p = lookupProviderLocked(component);