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

Commit 9610d3e9 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses... 

am 4543b8d4: am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1

* commit '4543b8d4':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
parents 26d7eef6 4543b8d4

core/java/android/webkit/WebView.java

+7 −4
Original line number Diff line number Diff line
@@ -1124,10 +1124,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;