diff options
| author | Joe Onorato <joeo@google.com> | 2010-08-26 11:55:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 11:55:10 -0700 |
| commit | 8f0f1b1e9defc61c2831e8856b18f2e00cfd789d (patch) | |
| tree | 630c41efa5fc13241036d7d1b4642ab1b670bf8a /services | |
| parent | 32982c701cee6f73262200468419b80343a0bea7 (diff) | |
| parent | 274ad9824a20b61dfbb785621567fd0414a965a4 (diff) | |
| download | frameworks_base-8f0f1b1e9defc61c2831e8856b18f2e00cfd789d.zip frameworks_base-8f0f1b1e9defc61c2831e8856b18f2e00cfd789d.tar.gz frameworks_base-8f0f1b1e9defc61c2831e8856b18f2e00cfd789d.tar.bz2 | |
am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp
* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
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.java | 8 |
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 8ff3545..731fb22 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; @@ -1160,7 +1161,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); } @@ -1179,6 +1182,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); |
