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

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

Browse Source 
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*
This commit is contained in:
Doug Zongker
2010-03-29 14:00:58 -07:00
committed by Android Git Automerger
parent e16741b22a ab69e29c19
commit 0d531f5b59
6 changed files with 239 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

471
api/current.xml
View File

@@ -163523,6 +163523,240 @@
> >
</method> </method>
</interface> </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" <class name="Config"
extends="java.lang.Object" extends="java.lang.Object"
abstract="false" abstract="false"
@@ -166640,243 +166874,6 @@
</method> </method>
</class> </class>
</package> </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" <package name="android.view"
> >
<class name="AbsSavedState" <class name="AbsSavedState"

2
core/java/android/util/base64/Base64.java → core/java/android/util/Base64.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.util.base64; package android.util;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;

2
core/java/android/util/base64/Base64InputStream.java → core/java/android/util/Base64InputStream.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.util.base64; package android.util;
import java.io.FilterInputStream; import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;

2
core/java/android/util/base64/Base64OutputStream.java → core/java/android/util/Base64OutputStream.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.util.base64; package android.util;
import java.io.FilterOutputStream; import java.io.FilterOutputStream;
import java.io.IOException; import java.io.IOException;

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

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.util.base64; package android.util;
import junit.framework.TestCase; import junit.framework.TestCase;

2
preloaded-classes
View File

@@ -468,6 +468,7 @@ android.text.style.StyleSpan
android.text.style.TextAppearanceSpan android.text.style.TextAppearanceSpan
android.text.util.Linkify android.text.util.Linkify
android.util.AttributeSet android.util.AttributeSet
android.util.Base64$Encoder
android.util.DisplayMetrics android.util.DisplayMetrics
android.util.EventLog android.util.EventLog
android.util.EventLog$Event android.util.EventLog$Event
@@ -481,7 +482,6 @@ android.util.StateSet
android.util.TypedValue android.util.TypedValue
android.util.Xml android.util.Xml
android.util.Xml$Encoding android.util.Xml$Encoding
android.util.base64.Base64$Encoder
android.view.AbsSavedState android.view.AbsSavedState
android.view.ContextThemeWrapper android.view.ContextThemeWrapper
android.view.Display android.view.Display