Merge "Fix invalid comment in WebSettings." into gingerbread (1614843e) · Commits · e / os / android_frameworks_base

api/current.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -203553,7 +203553,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -204101,7 +204101,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="pluginsPath" type="java.lang.String">

+10 −2

Original line number	Diff line number	Diff line
		@@ -1048,7 +1048,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) {
		}
		@@ -1219,7 +1223,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 "";