summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-07-09 14:07:55 -0700
committerGrace Kloba <klobag@google.com>2009-07-09 14:07:55 -0700
commitec696c0115bbc915417bd76af6432bc603b680d2 (patch)
tree7f339772111c70d2283283b583e235cb9fcfbd99 /core/java/android/webkit
parent1a3ef96b34e3a34d718ed80a107b70bbc3cbfb66 (diff)
downloadframeworks_base-ec696c0115bbc915417bd76af6432bc603b680d2.zip
frameworks_base-ec696c0115bbc915417bd76af6432bc603b680d2.tar.gz
frameworks_base-ec696c0115bbc915417bd76af6432bc603b680d2.tar.bz2
Fix the build. Remove mPluginsPath as it is not used in the master any more.
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/WebSettings.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 1516eda..f02d43c 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1336,12 +1336,7 @@ public class WebSettings {
if (!BROWSER_PACKAGE_NAME.equals(mContext.getPackageName())) {
return;
}
- // Is the pluginsPath sane?
- if (mPluginsPath == null || mPluginsPath.length() == 0) {
- // We don't yet have a meaningful plugin path, so
- // we can't do anything about the Gears permissions.
- return;
- }
+
// Remember we checked the Gears permissions.
mCheckedGearsPermissions = true;
// Get the current system settings.
@@ -1372,10 +1367,12 @@ public class WebSettings {
int gearsPermission = (systemPermission == 1 ? 1 : 2);
// Build the path to the Gears library.
- File file = new File(mPluginsPath).getParentFile();
+ // hack for now
+ File file = mContext.getDir("plugins", 0);
if (file == null) {
return;
}
+ file = file.getParentFile();
// Build the Gears database file name.
file = new File(file.getAbsolutePath() + File.separator
+ GEARS_DATABASE_DIR + File.separator + GEARS_DATABASE_FILE);