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.
This commit is contained in:
Joe Onorato
2010-08-26 15:52:07 -07:00
committed by Android Git Automerger

View File

@@ -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);