Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f0f1b1e authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 274ad982: Merge "Just disable widgets that come from apps on sd cards,... 

am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread

Merge commit '274ad982' into gingerbread-plus-aosp

* commit '274ad982':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
parents 32982c70 274ad982

services/java/com/android/server/AppWidgetService.java

+7 −1
Original line number Diff line number Diff line
@@ -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);