summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-18 08:44:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-18 08:44:18 -0700
commit9befde04c3efe82317bf06cb0d841752a71de62c (patch)
treedb2124c3bfb314d6a438a97b2625ca17299ac63e /core
parentbd022f423a33f0794bb53e5b0720da2d67e4631c (diff)
parent325eabdc8518984e3ab44b2e5f94d4f4ed52d8e0 (diff)
downloadframeworks_base-9befde04c3efe82317bf06cb0d841752a71de62c.zip
frameworks_base-9befde04c3efe82317bf06cb0d841752a71de62c.tar.gz
frameworks_base-9befde04c3efe82317bf06cb0d841752a71de62c.tar.bz2
Merge change 21648 into eclair
* changes: Remove the hack to include Gears as it is gone now.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/PluginManager.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/webkit/PluginManager.java b/core/java/android/webkit/PluginManager.java
index 370d3d2..cd34192 100644
--- a/core/java/android/webkit/PluginManager.java
+++ b/core/java/android/webkit/PluginManager.java
@@ -147,11 +147,6 @@ public class PluginManager {
}
directories.add(directory);
}
- // hack for gears for now
- String gears = mContext.getDir("plugins", 0).getPath();
- if (!directories.contains(gears)) {
- directories.add(gears);
- }
return directories.toArray(new String[directories.size()]);
}