Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fadca71 authored by Jason Chen's avatar Jason Chen Committed by Android Git Automerger
Browse files

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

Merge commit 'b766ab83' into gingerbread-plus-aosp

* commit 'b766ab83':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
parents 3e4975a5 b766ab83

api/current.xml

+6 −6
Original line number Diff line number Diff line
@@ -203634,7 +203634,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -204182,7 +204182,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="pluginsPath" type="java.lang.String">
@@ -252744,7 +252744,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="lng" type="long">

<parameter name="l" type="long">

</parameter>

</method>

<method name="append"
@@ -252822,7 +252822,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="ch" type="char[]">

<parameter name="chars" type="char[]">

</parameter>

</method>

<method name="append"
@@ -307393,9 +307393,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"

core/java/android/webkit/WebSettings.java

+2 −0
Original line number Diff line number Diff line
@@ -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 "";

    }