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

Commit 0d531f5b authored by Doug Zongker's avatar Doug Zongker Committed by Android Git Automerger
Browse files

am ab69e29c: relocate android.util.base64.* -> android.util.* 

Merge commit 'ab69e29c' into froyo-plus-aosp

* commit 'ab69e29c':
  relocate android.util.base64.* -> android.util.*
parents e16741b2 ab69e29c

api/current.xml

+234 −237
Original line number Diff line number Diff line
@@ -163523,6 +163523,240 @@ 
>

</method>

</interface>

<class name="Base64"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="encode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="encode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="encodeToString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="encodeToString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<field name="CRLF"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DEFAULT"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_CLOSE"

 type="int"

 transient="false"

 volatile="false"

 value="16"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_PADDING"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_WRAP"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="URL_SAFE"

 type="int"

 transient="false"

 volatile="false"

 value="8"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Base64InputStream"

 extends="java.io.FilterInputStream"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64InputStream"

 type="android.util.Base64InputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</constructor>

</class>

<class name="Base64OutputStream"

 extends="java.io.FilterOutputStream"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64OutputStream"

 type="android.util.Base64OutputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</constructor>

</class>

<class name="Config"

 extends="java.lang.Object"

 abstract="false"
@@ -166640,243 +166874,6 @@ 
</method>

</class>

</package>

<package name="android.util.base64"

>

<class name="Base64"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="decode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="encode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="encode"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="encodeToString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="encodeToString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<field name="CRLF"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DEFAULT"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_CLOSE"

 type="int"

 transient="false"

 volatile="false"

 value="16"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_PADDING"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NO_WRAP"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="URL_SAFE"

 type="int"

 transient="false"

 volatile="false"

 value="8"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Base64InputStream"

 extends="java.io.FilterInputStream"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64InputStream"

 type="android.util.base64.Base64InputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</constructor>

</class>

<class name="Base64OutputStream"

 extends="java.io.FilterOutputStream"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64OutputStream"

 type="android.util.base64.Base64OutputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</constructor>

</class>

</package>

<package name="android.view"

>

<class name="AbsSavedState"

core/java/android/util/base64/Base64.java→core/java/android/util/Base64.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util.base64;

package android.util;



import java.io.UnsupportedEncodingException;

core/java/android/util/base64/Base64InputStream.java→core/java/android/util/Base64InputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util.base64;

package android.util;



import java.io.FilterInputStream;

import java.io.IOException;

core/java/android/util/base64/Base64OutputStream.java→core/java/android/util/Base64OutputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util.base64;

package android.util;



import java.io.FilterOutputStream;

import java.io.IOException;

core/tests/coretests/src/android/util/base64/Base64Test.java→core/tests/coretests/src/android/util/Base64Test.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.util.base64;

package android.util;



import junit.framework.TestCase;