summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/webkit/JWebCoreJavaBridge.java4
-rw-r--r--core/java/android/webkit/PluginManager.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index 21bcdf177217..ddc2da1f3938 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -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();
}
/**
diff --git a/core/java/android/webkit/PluginManager.java b/core/java/android/webkit/PluginManager.java
index cd341928bfcf..32eea5fcc95a 100644
--- a/core/java/android/webkit/PluginManager.java
+++ b/core/java/android/webkit/PluginManager.java
@@ -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()]);
}