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

Commit 55bd466d authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix build by adding Java 6 API changes that were not in the earlier merge. 

Change-Id: I10425b6932fc69e206da5a2cf9e120c007eec9cd
parent ac7ae9cc

api/9.xml

+1 −1
Original line number Diff line number Diff line
@@ -289751,7 +289751,7 @@ 
 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

api/current.xml

+135 −323
Original line number Diff line number Diff line
@@ -28085,6 +28085,17 @@ 
<parameter name="parcel" type="android.os.Parcel">

</parameter>

</constructor>

<method name="clone"

 return="android.app.Notification"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="describeContents"

 return="int"

 abstract="false"
@@ -214537,6 +214548,17 @@ 
<parameter name="parent" type="android.view.ViewGroup">

</parameter>

</method>

<method name="clone"

 return="android.widget.RemoteViews"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="describeContents"

 return="int"

 abstract="false"
@@ -225207,6 +225229,46 @@ 
 visibility="public"

>

</field>

<field name="KERNING"

 type="java.awt.font.TextAttribute"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KERNING_ON"

 type="java.lang.Integer"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="LIGATURES"

 type="java.awt.font.TextAttribute"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="LIGATURES_ON"

 type="java.lang.Integer"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NUMERIC_SHAPING"

 type="java.awt.font.TextAttribute"

 transient="false"
@@ -225357,6 +225419,36 @@ 
 visibility="public"

>

</field>

<field name="TRACKING"

 type="java.awt.font.TextAttribute"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TRACKING_LOOSE"

 type="java.lang.Float"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TRACKING_TIGHT"

 type="java.lang.Float"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TRANSFORM"

 type="java.awt.font.TextAttribute"

 transient="false"
@@ -270762,7 +270854,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="repl" type="byte[]">

<parameter name="replacement" type="byte[]">

</parameter>

</method>

<method name="malformedInputAction"
@@ -296913,6 +297005,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<implements name="java.lang.Iterable">

</implements>

<implements name="java.io.Serializable">

</implements>

<constructor name="SQLException"
@@ -303916,7 +304010,7 @@ 
 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -304047,7 +304141,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -304058,7 +304152,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -314309,6 +314403,8 @@ 
>

<implements name="java.lang.Cloneable">

</implements>

<implements name="java.util.Deque">

</implements>

<implements name="java.util.List">

</implements>

<implements name="java.util.Queue">
@@ -322637,317 +322733,6 @@ 
</parameter>

</method>

</class>

<class name="ConcurrentLinkedDeque"

 extends="java.util.AbstractCollection"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="java.util.Deque">

</implements>

<implements name="java.io.Serializable">

</implements>

<constructor name="ConcurrentLinkedDeque"

 type="java.util.concurrent.ConcurrentLinkedDeque"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="ConcurrentLinkedDeque"

 type="java.util.concurrent.ConcurrentLinkedDeque"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">

</parameter>

</constructor>

<method name="addFirst"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="addLast"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="descendingIterator"

 return="java.util.Iterator&lt;E&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="element"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFirst"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getLast"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="iterator"

 return="java.util.Iterator&lt;E&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="offer"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="offerFirst"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="offerLast"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="peek"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="peekFirst"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="peekLast"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="poll"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="pollFirst"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="pollLast"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="pop"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="push"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="e" type="E">

</parameter>

</method>

<method name="remove"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="removeFirst"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="removeFirstOccurrence"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="o" type="java.lang.Object">

</parameter>

</method>

<method name="removeLast"

 return="E"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="removeLastOccurrence"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="o" type="java.lang.Object">

</parameter>

</method>

<method name="size"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="ConcurrentLinkedQueue"

 extends="java.util.AbstractQueue"

 abstract="false"
@@ -339138,7 +338923,7 @@ 
 visibility="protected"

>

</field>

<field name="deflater"

<field name="def"

 type="java.util.zip.Deflater"

 transient="false"

 volatile="false"
@@ -339621,7 +339406,7 @@ 
>

<parameter name="is" type="java.io.InputStream">

</parameter>

<parameter name="inf" type="java.util.zip.Inflater">

<parameter name="inflater" type="java.util.zip.Inflater">

</parameter>

</constructor>

<constructor name="InflaterInputStream"
@@ -339633,7 +339418,7 @@ 
>

<parameter name="is" type="java.io.InputStream">

</parameter>

<parameter name="inf" type="java.util.zip.Inflater">

<parameter name="inflater" type="java.util.zip.Inflater">

</parameter>

<parameter name="bsize" type="int">

</parameter>
@@ -339710,7 +339495,7 @@ 
>

<parameter name="out" type="java.io.OutputStream">

</parameter>

<parameter name="inflater" type="java.util.zip.Inflater">

<parameter name="inf" type="java.util.zip.Inflater">

</parameter>

</constructor>

<constructor name="InflaterOutputStream"
@@ -339722,7 +339507,7 @@ 
>

<parameter name="out" type="java.io.OutputStream">

</parameter>

<parameter name="inflater" type="java.util.zip.Inflater">

<parameter name="inf" type="java.util.zip.Inflater">

</parameter>

<parameter name="bufferSize" type="int">

</parameter>
@@ -339751,7 +339536,7 @@ 
 visibility="protected"

>

</field>

<field name="inflater"

<field name="inf"

 type="java.util.zip.Inflater"

 transient="false"

 volatile="false"
@@ -356737,7 +356522,7 @@ 
</method>

<method name="engineGetDefaultSSLParameters"

 return="javax.net.ssl.SSLParameters"

 abstract="true"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"
@@ -356781,7 +356566,7 @@ 
</method>

<method name="engineGetSupportedSSLParameters"

 return="javax.net.ssl.SSLParameters"

 abstract="true"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"
@@ -359858,6 +359643,18 @@ 
<parameter name="name" type="java.lang.String">

</parameter>

</constructor>

<constructor name="X500Principal"

 type="javax.security.auth.x500.X500Principal"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="name" type="java.lang.String">

</parameter>

<parameter name="keywordMap" type="java.util.Map&lt;java.lang.String, java.lang.String&gt;">

</parameter>

</constructor>

<method name="getEncoded"

 return="byte[]"

 abstract="false"
@@ -359893,6 +359690,21 @@ 
<parameter name="format" type="java.lang.String">

</parameter>

</method>

<method name="getName"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="format" type="java.lang.String">

</parameter>

<parameter name="oidMap" type="java.util.Map&lt;java.lang.String, java.lang.String&gt;">

</parameter>

</method>

<field name="CANONICAL"

 type="java.lang.String"

 transient="false"