Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21728 into eclair

Browse Source 
* changes:
  removing old gears code and correcting simple method typo
This commit is contained in:
Android (Google) Code Review
2009-08-18 11:24:04 -07:00
parent 4a6679b97e 37eb3c3515
commit 3f648af208
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/JWebCoreJavaBridge.java
View File

@@ -90,7 +90,7 @@ final class JWebCoreJavaBridge extends Handler {
break; break;
case REFRESH_PLUGINS: case REFRESH_PLUGINS:
nativeUpdatePluginDirectories(PluginManager.getInstance(null) nativeUpdatePluginDirectories(PluginManager.getInstance(null)
.getPluginDirecoties(), ((Boolean) msg.obj) .getPluginDirectories(), ((Boolean) msg.obj)
.booleanValue()); .booleanValue());
break; break;
} }
@@ -182,7 +182,7 @@ final class JWebCoreJavaBridge extends Handler {
* Returns an array of plugin directoies * Returns an array of plugin directoies
*/ */
private String[] getPluginDirectories() { private String[] getPluginDirectories() {
return PluginManager.getInstance(null).getPluginDirecoties(); return PluginManager.getInstance(null).getPluginDirectories();
} }
/** /**

3
core/java/android/webkit/PluginManager.java
View File

@@ -91,7 +91,7 @@ public class PluginManager {
.sendToTarget(); .sendToTarget();
} }
String[] getPluginDirecoties() { String[] getPluginDirectories() {
ArrayList<String> directories = new ArrayList<String>(); ArrayList<String> directories = new ArrayList<String>();
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
List<ResolveInfo> plugins = pm.queryIntentServices(new Intent( List<ResolveInfo> plugins = pm.queryIntentServices(new Intent(
@@ -147,6 +147,7 @@ public class PluginManager {
} }
directories.add(directory); directories.add(directory);
} }
return directories.toArray(new String[directories.size()]); return directories.toArray(new String[directories.size()]);
} }