am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread

Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'

* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
  Fix invalid comment in WebSettings.

1 files changed, 10 insertions, 2 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 38b3e88..7519b0d 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1102,7 +1102,11 @@ public class WebSettings {
     }
 
     /**
-     * TODO: need to add @Deprecated
+     * Set a custom path to plugins used by the WebView. This method is
+     * obsolete since each plugin is now loaded from its own package.
+     * @param pluginsPath String path to the directory containing plugins.
+     * @deprecated This method is no longer used as plugins are loaded from
+     * their own APK via the system's package manager.
      */
     public synchronized void setPluginsPath(String pluginsPath) {
     }
@@ -1286,7 +1290,11 @@ public class WebSettings {
     }
 
     /**
-     * TODO: need to add @Deprecated
+     * Returns the directory that contains the plugin libraries. This method is
+     * obsolete since each plugin is now loaded from its own package.
+     * @return An empty string.
+     * @deprecated This method is no longer used as plugins are loaded from
+     * their own APK via the system's package manager.
      */
     public synchronized String getPluginsPath() {
         return "";