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

Commit 3f648af2 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21728 into eclair 

* changes:
  removing old gears code and correcting simple method typo
parents 4a6679b9 37eb3c35

core/java/android/webkit/JWebCoreJavaBridge.java

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ final class JWebCoreJavaBridge extends Handler { 
                break;

            case REFRESH_PLUGINS:

                nativeUpdatePluginDirectories(PluginManager.getInstance(null)

                        .getPluginDirecoties(), ((Boolean) msg.obj)

                        .getPluginDirectories(), ((Boolean) msg.obj)

                        .booleanValue());

                break;

        }
@@ -182,7 +182,7 @@ final class JWebCoreJavaBridge extends Handler { 
     * Returns an array of plugin directoies

     */

    private String[] getPluginDirectories() {

        return PluginManager.getInstance(null).getPluginDirecoties();

        return PluginManager.getInstance(null).getPluginDirectories();

    }



    /**

core/java/android/webkit/PluginManager.java

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class PluginManager { 
                .sendToTarget();

    }



    String[] getPluginDirecoties() {

    String[] getPluginDirectories() {

        ArrayList<String> directories = new ArrayList<String>();

        PackageManager pm = mContext.getPackageManager();

        List<ResolveInfo> plugins = pm.queryIntentServices(new Intent(
@@ -147,6 +147,7 @@ public class PluginManager { 
            }

            directories.add(directory);

        }



        return directories.toArray(new String[directories.size()]);

    }