Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml

Browse Source 
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
This commit is contained in:
Jason Chen
2010-09-01 19:16:41 -07:00
committed by Android Git Automerger
parent 3e4975a52c b766ab830a
commit 9fadca71e4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/current.xml
View File

@@ -203634,7 +203634,7 @@
synchronized="true" synchronized="true"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="deprecated"
visibility="public" visibility="public"
> >
</method> </method>
@@ -204182,7 +204182,7 @@
synchronized="true" synchronized="true"
static="false" static="false"
final="false" final="false"
deprecated="not deprecated" deprecated="deprecated"
visibility="public" visibility="public"
> >
<parameter name="pluginsPath" type="java.lang.String"> <parameter name="pluginsPath" type="java.lang.String">
@@ -252744,7 +252744,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="lng" type="long"> <parameter name="l" type="long">
</parameter> </parameter>
</method> </method>
<method name="append" <method name="append"
@@ -252822,7 +252822,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="ch" type="char[]"> <parameter name="chars" type="char[]">
</parameter> </parameter>
</method> </method>
<method name="append" <method name="append"
@@ -307393,9 +307393,9 @@
> >
<parameter name="number" type="java.lang.Object"> <parameter name="number" type="java.lang.Object">
</parameter> </parameter>
<parameter name="toAppendTo" type="java.lang.StringBuffer"> <parameter name="buffer" type="java.lang.StringBuffer">
</parameter> </parameter>
<parameter name="pos" type="java.text.FieldPosition"> <parameter name="position" type="java.text.FieldPosition">
</parameter> </parameter>
</method> </method>
<method name="getDecimalFormatSymbols" <method name="getDecimalFormatSymbols"

2
core/java/android/webkit/WebSettings.java
View File

@@ -1054,6 +1054,7 @@ public class WebSettings {
* @deprecated This method is no longer used as plugins are loaded from * @deprecated This method is no longer used as plugins are loaded from
* their own APK via the system's package manager. * their own APK via the system's package manager.
*/ */
@Deprecated
public synchronized void setPluginsPath(String pluginsPath) { 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 * @deprecated This method is no longer used as plugins are loaded from
* their own APK via the system's package manager. * their own APK via the system's package manager.
*/ */
@Deprecated
public synchronized String getPluginsPath() { public synchronized String getPluginsPath() {
return ""; return "";
} }