summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.xml12
-rw-r--r--core/java/android/webkit/WebSettings.java2
2 files changed, 8 insertions, 6 deletions
diff --git a/api/current.xml b/api/current.xml
index 3c0854956932..10bdbce9111c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -203586,7 +203586,7 @@
synchronized="true"
static="false"
final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
</method>
@@ -204134,7 +204134,7 @@
synchronized="true"
static="false"
final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
visibility="public"
>
<parameter name="pluginsPath" type="java.lang.String">
@@ -252670,7 +252670,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="lng" type="long">
+<parameter name="l" type="long">
</parameter>
</method>
<method name="append"
@@ -252748,7 +252748,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="ch" type="char[]">
+<parameter name="chars" type="char[]">
</parameter>
</method>
<method name="append"
@@ -307319,9 +307319,9 @@
>
<parameter name="number" type="java.lang.Object">
</parameter>
-<parameter name="toAppendTo" type="java.lang.StringBuffer">
+<parameter name="buffer" type="java.lang.StringBuffer">
</parameter>
-<parameter name="pos" type="java.text.FieldPosition">
+<parameter name="position" type="java.text.FieldPosition">
</parameter>
</method>
<method name="getDecimalFormatSymbols"
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 4e57a8ab911d..da0c61b2dc51 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1054,6 +1054,7 @@ public class WebSettings {
* @deprecated This method is no longer used as plugins are loaded from
* their own APK via the system's package manager.
*/
+ @Deprecated
public synchronized void setPluginsPath(String pluginsPath) {
}
@@ -1229,6 +1230,7 @@ public class WebSettings {
* @deprecated This method is no longer used as plugins are loaded from
* their own APK via the system's package manager.
*/
+ @Deprecated
public synchronized String getPluginsPath() {
return "";
}