Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1

This commit is contained in:
Kristian Monsen
2011-03-10 09:01:58 -08:00
committed by Android (Google) Code Review

View File

@@ -1127,10 +1127,13 @@ public class WebView extends AbsoluteLayout
protected Set<String> doInBackground(Void... unused) {
Set<String> installedPackages = new HashSet<String>();
PackageManager pm = mContext.getPackageManager();
List<PackageInfo> packages = pm.getInstalledPackages(0);
for (PackageInfo p : packages) {
if (sGoogleApps.contains(p.packageName)) {
installedPackages.add(p.packageName);
for (String name : sGoogleApps) {
try {
PackageInfo pInfo = pm.getPackageInfo(name,
PackageManager.GET_ACTIVITIES | PackageManager.GET_SERVICES);
installedPackages.add(name);
} catch(PackageManager.NameNotFoundException e) {
// package not found
}
}
return installedPackages;