diff options
91 files changed, 71 insertions, 677 deletions
diff --git a/annotation/src/main/java/java/lang/annotation/package.html b/annotation/src/main/java/java/lang/annotation/package.html index 99c98cc..5a150b3 100644 --- a/annotation/src/main/java/java/lang/annotation/package.html +++ b/annotation/src/main/java/java/lang/annotation/package.html @@ -5,6 +5,5 @@ provides some predefined annotations that are used throughout the Android libraries. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/archive/src/main/java/java/util/jar/package.html b/archive/src/main/java/java/util/jar/package.html index 35eabe7..21103cc 100644 --- a/archive/src/main/java/java/util/jar/package.html +++ b/archive/src/main/java/java/util/jar/package.html @@ -7,6 +7,5 @@ form of a MANIFEST file. This manifest can also be used to sign a JAR file. </p> - @since Android 1.0 </body> </html> diff --git a/archive/src/main/java/java/util/zip/package.html b/archive/src/main/java/java/util/zip/package.html index 2a09bf1..8b4f91b 100644 --- a/archive/src/main/java/java/util/zip/package.html +++ b/archive/src/main/java/java/util/zip/package.html @@ -4,6 +4,5 @@ This package contains classes for compressing and decompressing data in ZIP and GZIP file formats. </p> - @since Android 1.0 </body> </html> diff --git a/auth/src/main/java/javax/security/auth/callback/package.html b/auth/src/main/java/javax/security/auth/callback/package.html index 5446ab8..c102954 100644 --- a/auth/src/main/java/javax/security/auth/callback/package.html +++ b/auth/src/main/java/javax/security/auth/callback/package.html @@ -6,9 +6,9 @@ <body> <p> This package provides classes and interfaces needed to interact with the -application in order to execute the authentification and authorization +application in order to execute the authentication and authorization processes. It is a classical callback mechanism: one retrieves information (i.e. -for authentification purposes) and one display some messages (for example error +for authentication purposes) and one display some messages (for example error messages). </p> <p> @@ -17,6 +17,5 @@ not compatible with desktop implementations of the Java programming language. It contains only what was needed to make the compiler happy, that is, classes required by other packages. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/auth/src/main/java/javax/security/auth/login/package.html b/auth/src/main/java/javax/security/auth/login/package.html index 382b487..e270980 100644 --- a/auth/src/main/java/javax/security/auth/login/package.html +++ b/auth/src/main/java/javax/security/auth/login/package.html @@ -15,6 +15,5 @@ not compatible with desktop implementations of the Java programming language. It contains only what was needed to make the compiler happy, that is, classes required by other packages. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/auth/src/main/java/javax/security/auth/package.html b/auth/src/main/java/javax/security/auth/package.html index 2bca2db..aeaa6cc 100644 --- a/auth/src/main/java/javax/security/auth/package.html +++ b/auth/src/main/java/javax/security/auth/package.html @@ -5,14 +5,13 @@ <html> <body> <p> -This package provides the classes and interfaces needed to implemenet and program -different methods of users' authentification and role based users' authorization. +This package provides the classes and interfaces needed to implement and program +different methods of users' authentication and role based users' authorization. -All subjects' authentification and role based authorization are strongly coupled with +All subjects' authentication and role based authorization are strongly coupled with the java.security file that, as always, is the ultimate arbiter of all matters secure in Android. For example the class <i>javax.security.auth.SubjectDomainCombiner</i> updates the ProtectionDomains associated with the actual class with the subjects defined therein. </p> -@since Android 1.0 </body> </html> diff --git a/auth/src/main/java/javax/security/auth/x500/package.html b/auth/src/main/java/javax/security/auth/x500/package.html index 58d27ac..f7c484e 100644 --- a/auth/src/main/java/javax/security/auth/x500/package.html +++ b/auth/src/main/java/javax/security/auth/x500/package.html @@ -13,6 +13,5 @@ not compatible with desktop implementations of the Java programming language. It contains only what was needed to make the compiler happy, that is, classes required by other packages. </p> -@since Android 1.0 </body> </html> diff --git a/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java b/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java index 5bd4b2e..f52d6e6 100644 --- a/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java +++ b/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java @@ -20,8 +20,6 @@ package java.beans; /** * A type of {@link PropertyChangeEvent} that indicates that an indexed property * has changed. - * - * @since Android 1.0 */ public class IndexedPropertyChangeEvent extends PropertyChangeEvent { diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java b/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java index 04caed8..d614be3 100644 --- a/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java +++ b/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java @@ -22,8 +22,6 @@ import java.util.EventObject; /** * An event that indicates that a constraint or a boundary of a property has * changed. - * - * @since Android 1.0 */ public class PropertyChangeEvent extends EventObject { diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java b/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java index 2515792..a0a4201 100644 --- a/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java +++ b/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java @@ -22,8 +22,6 @@ import java.util.EventListener; /** * A PropertyChangeListener can subscribe with a event source. Whenever that * source raises a PropertyChangeEvent this listener will get notified. - * - * @since Android 1.0 */ public interface PropertyChangeListener extends EventListener { diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java b/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java index d27e4eb..4841b72 100644 --- a/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java +++ b/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java @@ -22,8 +22,6 @@ import java.util.EventListenerProxy; /** * The implementation of this listener proxy just delegates the received events * to its listener. - * - * @since Android 1.0 */ public class PropertyChangeListenerProxy extends EventListenerProxy implements PropertyChangeListener { diff --git a/crypto/src/main/java/javax/crypto/interfaces/package.html b/crypto/src/main/java/javax/crypto/interfaces/package.html index 04a7c0b..d278318 100644 --- a/crypto/src/main/java/javax/crypto/interfaces/package.html +++ b/crypto/src/main/java/javax/crypto/interfaces/package.html @@ -7,6 +7,5 @@ The parameters for the DH algorithm must be accessed without unduly restriction as for example hardware repository for the parameters material. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/crypto/src/main/java/javax/crypto/package.html b/crypto/src/main/java/javax/crypto/package.html index 3f3bb47..3239b72 100644 --- a/crypto/src/main/java/javax/crypto/package.html +++ b/crypto/src/main/java/javax/crypto/package.html @@ -8,12 +8,11 @@ This package provides the classes and interfaces for cryptographic applications implementing algorithms for encryption, decryption, or key agreement. </p><p> -Stream ciphers are supported as well as asymmetric, symmetric and block ciphers. Cipher implementations from different providers are easily integratable thanks -to the SPI (Security Provider Interface) abstract classes. With class {@link javax.crypto.SealedObject} a programmer can secure an object by +Stream ciphers are supported as well as asymmetric, symmetric and block ciphers. Cipher implementations from different providers can be integrated using +the SPI (Service Provider Interface) abstract classes. With class {@link javax.crypto.SealedObject} a programmer can secure an object by encrypting it with a cipher. </p><p> Authentication may be based on MAC (Message Authentication Code) such as HMAC (Hash MAC, i.e. with a SHA-1 hash function). </p> -@since Android 1.0 </body> </html> diff --git a/crypto/src/main/java/javax/crypto/spec/package.html b/crypto/src/main/java/javax/crypto/spec/package.html index f647f75..177ac3d 100644 --- a/crypto/src/main/java/javax/crypto/spec/package.html +++ b/crypto/src/main/java/javax/crypto/spec/package.html @@ -2,16 +2,24 @@ <body> <p> This package provides the classes and interfaces needed to specify keys - and parameter for encryption. Following standards are supported: - (1) PKCS#3 Diffie-Hellman ekey agreement's standard; - (2) FIPS-46-2 Data Encryption Standard (DES); - (3) PKCS#5 Password Based Encryption (PBE) standard. - Keys may be specified via algorithm or in a more abstract and general way + and parameter for encryption. The following standards are supported: + <ul> + <li>PKCS#3 Diffie-Hellman Key Agreement standard; + <li>FIPS-46-2 Data Encryption Standard (DES); + <li>PKCS#5 Password-Based Cryptography standard. + </ul> + <p>Keys may be specified via algorithm or in a more abstract and general way with ASN.1. - Keys and algorithm parameters are specified for the following procedures: - (i) DH, (ii) DES, (iii) TripleDES, (iv) PBE, (v) RC2 and (vi) RC5. + <p>Keys and algorithm parameters are specified for the following procedures: + <ul> + <li>DH + <li>DES + <li>TripleDES + <li>PBE + <li>RC2 + <li>RC5 + </li> </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/dalvik/src/main/java/dalvik/annotation/HostController.java b/dalvik/src/main/java/dalvik/annotation/HostController.java index 2ccc292..c6e0bff 100644 --- a/dalvik/src/main/java/dalvik/annotation/HostController.java +++ b/dalvik/src/main/java/dalvik/annotation/HostController.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; * Record the host side controller information for a test method, * so that the CTS host can locate correspond host side unit while running it. * {@hide pending API Council approval} - * - * @since Android 1.0 */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) diff --git a/dalvik/src/main/java/dalvik/annotation/TestLevel.java b/dalvik/src/main/java/dalvik/annotation/TestLevel.java index ff9ddb3..9d2c6e7 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestLevel.java +++ b/dalvik/src/main/java/dalvik/annotation/TestLevel.java @@ -19,7 +19,6 @@ package dalvik.annotation; /** * Defines an enumeration of possible states a test case can be in. * - * @since Android 1.0 * @hide */ public enum TestLevel { diff --git a/dalvik/src/main/java/dalvik/annotation/TestTarget.java b/dalvik/src/main/java/dalvik/annotation/TestTarget.java index 7cbddca..9912312 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTarget.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTarget.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; * Defines an annotation used be used within the TestInfo annotation. It * specifies a single method target for the test (but can be used multiple * times). - * - * @since Android 1.0 */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.ANNOTATION_TYPE }) diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java index acbc1f1..c79b0f1 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java @@ -28,8 +28,6 @@ import dalvik.annotation.TestTargetNew; * that is being tested. The current assumption is that the test are somewhat * organized according to the API classes they test. Might be too strict for * some cases. - * - * @since Android 1.0 */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) @@ -45,4 +43,4 @@ public @interface TestTargetClass { * @hide */ TestTargetNew[] untestedMethods() default {}; -}
\ No newline at end of file +} diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java b/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java index c00e37b..507c041 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; * Defines an annotation used be used within the TestInfo annotation. It * specifies a single method target for the test (but can be used multiple * times). - * - * @since Android 1.0 * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargets.java b/dalvik/src/main/java/dalvik/annotation/TestTargets.java index ead6149..8552717 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargets.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargets.java @@ -28,8 +28,6 @@ import dalvik.annotation.TestTargetNew; * that is being tested. The current assumption is that the test are somewhat * organized according to the API classes they test. Might be too strict for * some cases. - * - * @since Android 1.0 * @hide */ @Retention(RetentionPolicy.RUNTIME) @@ -40,4 +38,4 @@ public @interface TestTargets { * Specifies the API methods that are tested by the annotated test method. */ TestTargetNew[] value(); -}
\ No newline at end of file +} diff --git a/dalvik/src/main/java/dalvik/annotation/ToBeFixed.java b/dalvik/src/main/java/dalvik/annotation/ToBeFixed.java index 6985929..751a038 100644 --- a/dalvik/src/main/java/dalvik/annotation/ToBeFixed.java +++ b/dalvik/src/main/java/dalvik/annotation/ToBeFixed.java @@ -25,8 +25,6 @@ import java.lang.annotation.Target; * Defines an annotation for test methods that indicate the test method * need to be fixed in future. * {@hide pending API Council approval} - * - * @since Android 1.0 */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) diff --git a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java b/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java index 019e4b0..ff9cf35 100644 --- a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java +++ b/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java @@ -44,8 +44,6 @@ import java.lang.annotation.Target; * annotating them with {@code @VirtualTestTarget}. This class can then be * used in the {@code @TestTargetClass} annotation with which we annotate * {@code TestCase} subclasses. - * - * @since Android 1.0 * @hide */ @Retention(RetentionPolicy.RUNTIME) @@ -56,4 +54,4 @@ public @interface VirtualTestTarget { * Field for comments. */ String value() default ""; -}
\ No newline at end of file +} diff --git a/dalvik/src/main/java/dalvik/annotation/package.html b/dalvik/src/main/java/dalvik/annotation/package.html index fc7cf07..2a67dc0 100644 --- a/dalvik/src/main/java/dalvik/annotation/package.html +++ b/dalvik/src/main/java/dalvik/annotation/package.html @@ -4,6 +4,5 @@ Defines some annotations that are used within the Android system, either for the core libraries or for testing purposes. </p> - @since Android 1.0 </body> </html> diff --git a/dalvik/src/main/java/dalvik/bytecode/package.html b/dalvik/src/main/java/dalvik/bytecode/package.html index 1a6d7c4..92b0e92 100644 --- a/dalvik/src/main/java/dalvik/bytecode/package.html +++ b/dalvik/src/main/java/dalvik/bytecode/package.html @@ -1,8 +1,7 @@ <html> <body> <p> - Provides classes surrounding the Dalvik bytecode. + Provides classes related to Dalvik bytecode. </p> - @since Android 1.0 </body> </html> diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java index 00de314..7beddbb 100644 --- a/dalvik/src/main/java/dalvik/system/DexFile.java +++ b/dalvik/src/main/java/dalvik/system/DexFile.java @@ -29,8 +29,6 @@ import java.util.Enumeration; * <p> * Note we don't directly open and read the DEX file here. They're memory-mapped * read-only by the VM. - * - * @since Android 1.0 */ public final class DexFile { private final int mCookie; @@ -40,7 +38,7 @@ public final class DexFile { * Opens a DEX file from a given File object. This will usually be a ZIP/JAR * file with a "classes.dex" inside. * - * The VM will generate the name of the coresponding file in + * The VM will generate the name of the corresponding file in * /data/dalvik-cache and open it, possibly creating or updating * it first if system permissions allow. Don't pass in the name of * a file in /data/dalvik-cache, as the named file is expected to be @@ -61,7 +59,7 @@ public final class DexFile { * Opens a DEX file from a given filename. This will usually be a ZIP/JAR * file with a "classes.dex" inside. * - * The VM will generate the name of the coresponding file in + * The VM will generate the name of the corresponding file in * /data/dalvik-cache and open it, possibly creating or updating * it first if system permissions allow. Don't pass in the name of * a file in /data/dalvik-cache, as the named file is expected to be @@ -288,4 +286,3 @@ public final class DexFile { native public static boolean isDexOptNeeded(String fileName) throws FileNotFoundException, IOException; } - diff --git a/dalvik/src/main/java/dalvik/system/PathClassLoader.java b/dalvik/src/main/java/dalvik/system/PathClassLoader.java index 5d7333e..5bb18de 100644 --- a/dalvik/src/main/java/dalvik/system/PathClassLoader.java +++ b/dalvik/src/main/java/dalvik/system/PathClassLoader.java @@ -37,8 +37,6 @@ import dalvik.system.DexFile; * of files and directories in the local file system, but does not attempt to * load classes from the network. Android uses this class for its system class * loader and for its application class loader(s). - * - * @since Android 1.0 */ public class PathClassLoader extends ClassLoader { @@ -277,7 +275,6 @@ public class PathClassLoader extends ClassLoader { * @param resName * the name of the resource to find. * @return an enumeration of {@code URL} objects for the requested resource. - * @since Android 1.0 */ @Override protected Enumeration<URL> findResources(String resName) { diff --git a/dalvik/src/main/java/dalvik/system/VMRuntime.java b/dalvik/src/main/java/dalvik/system/VMRuntime.java index e05e489..ddb7128 100644 --- a/dalvik/src/main/java/dalvik/system/VMRuntime.java +++ b/dalvik/src/main/java/dalvik/system/VMRuntime.java @@ -23,8 +23,6 @@ package dalvik.system; * * @deprecated this is an internal Dalvik class that is not appropriate for * general use. It will be removed from the public API in a future release. - * - * @since Android 1.0 */ public final class VMRuntime { diff --git a/dalvik/src/main/java/dalvik/system/package.html b/dalvik/src/main/java/dalvik/system/package.html index 215671c..01d0d30 100644 --- a/dalvik/src/main/java/dalvik/system/package.html +++ b/dalvik/src/main/java/dalvik/system/package.html @@ -3,6 +3,5 @@ <p> Provides utility and system information classes specific to the Dalvik VM. </p> - @since Android 1.0 </body> </html> diff --git a/logging/src/main/java/java/util/logging/package.html b/logging/src/main/java/java/util/logging/package.html index c523c7a..d7ed252 100644 --- a/logging/src/main/java/java/util/logging/package.html +++ b/logging/src/main/java/java/util/logging/package.html @@ -5,6 +5,5 @@ supports different levels of importance of a message that needs to be logged. The output written to the target can be filtered by this level. </p> - @since Android 1.0 </body> </html> diff --git a/luni-kernel/src/main/java/java/lang/ClassLoader.java b/luni-kernel/src/main/java/java/lang/ClassLoader.java index 17206aa..aae807e 100644 --- a/luni-kernel/src/main/java/java/lang/ClassLoader.java +++ b/luni-kernel/src/main/java/java/lang/ClassLoader.java @@ -60,8 +60,6 @@ import dalvik.system.VMStack; * applications may implement subclasses of {@code ClassLoader} to provide * special ways for loading classes. * </p> - * - * @since Android 1.0 * @see Class */ public abstract class ClassLoader { @@ -135,7 +133,6 @@ public abstract class ClassLoader { * @throws SecurityException * if a security manager exists and it does not allow access to * the system class loader. - * @since Android 1.0 */ public static ClassLoader getSystemClassLoader() { SecurityManager smgr = System.getSecurityManager(); @@ -158,7 +155,6 @@ public abstract class ClassLoader { * @param resName * the name of the resource to find. * @see Class#getResource - * @since Android 1.0 */ public static URL getSystemResource(String resName) { return SystemClassLoader.loader.getResource(resName); @@ -175,7 +171,6 @@ public abstract class ClassLoader { * the name of the resource to find. * @throws IOException * if an I/O error occurs. - * @since Android 1.0 */ public static Enumeration<URL> getSystemResources(String resName) throws IOException { return SystemClassLoader.loader.getResources(resName); @@ -191,7 +186,6 @@ public abstract class ClassLoader { * @param resName * the name of the resource to find. * @see Class#getResourceAsStream - * @since Android 1.0 */ public static InputStream getSystemResourceAsStream(String resName) { return SystemClassLoader.loader.getResourceAsStream(resName); @@ -204,7 +198,6 @@ public abstract class ClassLoader { * @throws SecurityException * if a security manager exists and it does not allow the * creation of a new {@code ClassLoader}. - * @since Android 1.0 */ protected ClassLoader() { this(getSystemClassLoader(), false); @@ -220,7 +213,6 @@ public abstract class ClassLoader { * @throws SecurityException * if a security manager exists and it does not allow the * creation of new a new {@code ClassLoader}. - * @since Android 1.0 */ protected ClassLoader(ClassLoader parentLoader) { this(parentLoader, false); @@ -262,7 +254,6 @@ public abstract class ClassLoader { * {@code offset + length} is greater than the length of * {@code classRep}. * @deprecated Use {@link #defineClass(String, byte[], int, int)} - * @since Android 1.0 */ @Deprecated protected final Class<?> defineClass(byte[] classRep, int offset, int length) @@ -292,7 +283,6 @@ public abstract class ClassLoader { * if {@code offset < 0}, {@code length < 0} or if * {@code offset + length} is greater than the length of * {@code classRep}. - * @since Android 1.0 */ protected final Class<?> defineClass(String className, byte[] classRep, int offset, int length) throws ClassFormatError { @@ -330,7 +320,6 @@ public abstract class ClassLoader { * @throws NoClassDefFoundError * if {@code className} is not equal to the name of the class * contained in {@code classRep}. - * @since Android 1.0 */ protected final Class<?> defineClass(String className, byte[] classRep, int offset, int length, ProtectionDomain protectionDomain) throws java.lang.ClassFormatError { @@ -359,7 +348,6 @@ public abstract class ClassLoader { * @throws NoClassDefFoundError * if {@code className} is not equal to the name of the class * contained in {@code b}. - * @since Android 1.0 */ protected final Class<?> defineClass(String name, ByteBuffer b, ProtectionDomain protectionDomain) throws ClassFormatError { @@ -379,7 +367,6 @@ public abstract class ClassLoader { * @return the {@code Class} object that is found. * @throws ClassNotFoundException * if the class cannot be found. - * @since Android 1.0 */ protected Class<?> findClass(String className) throws ClassNotFoundException { throw new ClassNotFoundException(className); @@ -393,7 +380,6 @@ public abstract class ClassLoader { * the name of the class to look for. * @return the {@code Class} object or {@code null} if the requested class * has not been loaded. - * @since Android 1.0 */ protected final Class<?> findLoadedClass(String className) { ClassLoader loader; @@ -413,7 +399,6 @@ public abstract class ClassLoader { * @return the {@code Class} object with the requested {@code className}. * @throws ClassNotFoundException * if the class can not be found. - * @since Android 1.0 */ protected final Class<?> findSystemClass(String className) throws ClassNotFoundException { return Class.forName(className, false, getSystemClassLoader()); @@ -426,7 +411,6 @@ public abstract class ClassLoader { * @throws SecurityException * if a security manager exists and it does not allow to * retrieve the parent class loader. - * @since Android 1.0 */ public final ClassLoader getParent() { SecurityManager smgr = System.getSecurityManager(); @@ -449,7 +433,6 @@ public abstract class ClassLoader { * if either the resource can not be found or a security manager * does not allow to access the resource. * @see Class#getResource - * @since Android 1.0 */ public URL getResource(String resName) { URL resource = null; @@ -475,7 +458,6 @@ public abstract class ClassLoader { * the name of the resource to find. * @throws IOException * if an I/O error occurs. - * @since Android 1.0 */ @SuppressWarnings("unchecked") public Enumeration<URL> getResources(String resName) throws IOException { @@ -497,7 +479,6 @@ public abstract class ClassLoader { * @param resName * the name of the resource to find. * @see Class#getResourceAsStream - * @since Android 1.0 */ public InputStream getResourceAsStream(String resName) { try { @@ -526,7 +507,6 @@ public abstract class ClassLoader { * the name of the class to look for. * @throws ClassNotFoundException * if the class can not be found. - * @since Android 1.0 */ public Class<?> loadClass(String className) throws ClassNotFoundException { return loadClass(className, false); @@ -557,7 +537,6 @@ public abstract class ClassLoader { * classes are not resolved. * @throws ClassNotFoundException * if the class can not be found. - * @since Android 1.0 */ protected Class<?> loadClass(String className, boolean resolve) throws ClassNotFoundException { Class<?> clazz = findLoadedClass(className); @@ -587,7 +566,6 @@ public abstract class ClassLoader { * * @param clazz * the class to link. - * @since Android 1.0 */ protected final void resolveClass(Class<?> clazz) { // no-op, doesn't make sense on android. @@ -650,7 +628,6 @@ public abstract class ClassLoader { * @param resName * the name of the resource to find. * @return the {@code URL} object for the requested resource. - * @since Android 1.0 */ protected URL findResource(String resName) { return null; @@ -666,7 +643,6 @@ public abstract class ClassLoader { * @return an enumeration of {@code URL} objects for the requested resource. * @throws IOException * if an I/O error occurs. - * @since Android 1.0 */ @SuppressWarnings( { "unchecked", "unused" @@ -687,7 +663,6 @@ public abstract class ClassLoader { * @param libName * the name of the library to find. * @return the absolute path of the library. - * @since Android 1.0 */ protected String findLibrary(String libName) { return null; @@ -701,7 +676,6 @@ public abstract class ClassLoader { * the name of the package to find. * @return the package with the requested name; {@code null} if the package * can not be found. - * @since Android 1.0 */ protected Package getPackage(String name) { synchronized (packages) { @@ -720,7 +694,6 @@ public abstract class ClassLoader { * the name of the package to find. * @return the package with the requested name; {@code null} if the package * can not be found. - * @since Android 1.0 */ static Package getPackage(ClassLoader loader, String name) { return loader.getPackage(name); @@ -730,7 +703,6 @@ public abstract class ClassLoader { * Returns all the packages known to this class loader. * * @return an array with all packages known to this class loader. - * @since Android 1.0 */ protected Package[] getPackages() { synchronized (packages) { @@ -766,7 +738,6 @@ public abstract class ClassLoader { * @return the {@code Package} object that has been created. * @throws IllegalArgumentException * if a package with the specified name already exists. - * @since Android 1.0 */ protected Package definePackage(String name, String specTitle, String specVersion, String specVendor, String implTitle, String implVersion, String implVendor, URL sealBase) @@ -793,7 +764,6 @@ public abstract class ClassLoader { * @param c * the {@code Class} object for which to get the signers. * @return signers the signers of {@code c}. - * @since Android 1.0 */ final Object[] getSigners(Class<?> c) { return null; @@ -807,7 +777,6 @@ public abstract class ClassLoader { * the {@code Class} object for which to set the signers. * @param signers * the signers for {@code c}. - * @since Android 1.0 */ protected final void setSigners(Class<?> c, Object[] signers) { return; @@ -910,7 +879,6 @@ public abstract class ClassLoader { * the name of the class for which to set the assertion status. * @param enable * the new assertion status. - * @since Android 1.0 */ public void setClassAssertionStatus(String cname, boolean enable) { return; @@ -927,7 +895,6 @@ public abstract class ClassLoader { * the name of the package for which to set the assertion status. * @param enable * the new assertion status. - * @since Android 1.0 */ public void setPackageAssertionStatus(String pname, boolean enable) { return; @@ -942,7 +909,6 @@ public abstract class ClassLoader { * * @param enable * the new assertion status. - * @since Android 1.0 */ public void setDefaultAssertionStatus(boolean enable) { return; @@ -955,8 +921,6 @@ public abstract class ClassLoader { * <strong>Note:</strong> This method does nothing in the Android reference * implementation. * </p> - * - * @since Android 1.0 */ public void clearAssertionStatus() { return; diff --git a/luni-kernel/src/main/java/java/lang/Compiler.java b/luni-kernel/src/main/java/java/lang/Compiler.java index cf41f06..88251e7 100644 --- a/luni-kernel/src/main/java/java/lang/Compiler.java +++ b/luni-kernel/src/main/java/java/lang/Compiler.java @@ -20,11 +20,7 @@ package java.lang; /** * Placeholder class for environments which explicitly manage the action of a * <em>Just In Time (JIT)</em> compiler. This class is usually implemented by - * the virtual machine vendor. The Android reference implementation does not - * (yet) contain such a JIT compiler, though other implementations may choose to - * provide one. - * - * @since Android 1.0 + * the virtual machine vendor. */ public final class Compiler { @@ -38,12 +34,12 @@ public final class Compiler { /** * Executes an operation according to the specified command object. This * method is the low-level interface to the JIT compiler. It may return any - * object or {@code null} if no JIT compiler is available. + * object or {@code null} if no JIT compiler is available. Returns null + * on Android, whether or not the system has a JIT. * * @param cmd * the command object for the JIT compiler. * @return the result of executing command or {@code null}. - * @since Android 1.0 */ public static Object command(Object cmd) { return null; @@ -51,14 +47,14 @@ public final class Compiler { /** * Compiles the specified class using the JIT compiler and indicates if - * compilation has been successful. + * compilation has been successful. Does nothing and returns false on + * Android. * * @param classToCompile * java.lang.Class the class to JIT compile * @return {@code true} if the compilation has been successful; * {@code false} if it has failed or if there is no JIT compiler * available. - * @since Android 1.0 */ public static boolean compileClass(Class<?> classToCompile) { return false; @@ -66,32 +62,28 @@ public final class Compiler { /** * Compiles all classes whose name matches the specified name using the JIT - * compiler and indicates if compilation has been successful. + * compiler and indicates if compilation has been successful. Does nothing + * and returns false on Android. * * @param nameRoot * the string to match class names with. * @return {@code true} if the compilation has been successful; * {@code false} if it has failed or if there is no JIT compiler * available. - * @since Android 1.0 */ public static boolean compileClasses(String nameRoot) { return false; } /** - * Disables the JIT compiler. - * - * @since Android 1.0 + * Disables the JIT compiler. Does nothing on Android. */ public static void disable() { return; } /** - * Enables the JIT compiler. - * - * @since Android 1.0 + * Enables the JIT compiler. Does nothing on Android. */ public static void enable() { return; diff --git a/luni-kernel/src/main/java/java/lang/Object.java b/luni-kernel/src/main/java/java/lang/Object.java index 5250871..bdb66b9 100644 --- a/luni-kernel/src/main/java/java/lang/Object.java +++ b/luni-kernel/src/main/java/java/lang/Object.java @@ -45,15 +45,11 @@ package java.lang; * The {@link #wait()} and {@link #notify()} methods provide a foundation for * synchronization, acquiring and releasing an internal monitor associated with * each {@code Object}. - * - * @since Android 1.0 */ public class Object { /** * Constructs a new instance of {@code Object}. - * - * @since Android 1.0 */ public Object() { } @@ -72,7 +68,6 @@ public class Object { * @throws CloneNotSupportedException * if this object's class does not implement the {@code * Cloneable} interface. - * @since Android 1.0 */ protected Object clone() throws CloneNotSupportedException { if (!(this instanceof Cloneable)) { @@ -111,7 +106,6 @@ public class Object { * @return {@code true} if the specified object is equal to this {@code * Object}; {@code false} otherwise. * @see #hashCode - * @since Android 1.0 */ public boolean equals(Object o) { return this == o; @@ -142,7 +136,6 @@ public class Object { * @throws Throwable * any exception which is raised during finalization; these are * ignored by the virtual machine. - * @since Android 1.0 */ protected void finalize() throws Throwable { } @@ -173,7 +166,6 @@ public class Object { * * @return this object's hash code. * @see #equals - * @since Android 1.0 */ public native int hashCode(); @@ -202,7 +194,6 @@ public class Object { * @see #wait(long) * @see #wait(long,int) * @see java.lang.Thread - * @since Android 1.0 */ public final native void notify(); @@ -248,7 +239,6 @@ public class Object { * </pre> * * @return a printable representation of this object. - * @since Android 1.0 */ public String toString() { return getClass().getName() + '@' + Integer.toHexString(hashCode()); @@ -281,7 +271,6 @@ public class Object { * @see #wait(long) * @see #wait(long,int) * @see java.lang.Thread - * @since Android 1.0 */ public final void wait() throws InterruptedException { wait(0 ,0); @@ -319,7 +308,6 @@ public class Object { * @see #wait() * @see #wait(long,int) * @see java.lang.Thread - * @since Android 1.0 */ public final void wait(long millis) throws InterruptedException { wait(millis, 0); @@ -361,7 +349,6 @@ public class Object { * @see #wait() * @see #wait(long,int) * @see java.lang.Thread - * @since Android 1.0 */ public final native void wait(long millis, int nanos) throws InterruptedException; } diff --git a/luni-kernel/src/main/java/java/lang/Package.java b/luni-kernel/src/main/java/java/lang/Package.java index 58cee36..9ad40b8 100644 --- a/luni-kernel/src/main/java/java/lang/Package.java +++ b/luni-kernel/src/main/java/java/lang/Package.java @@ -46,7 +46,6 @@ import java.net.URL; * Packages are managed by class loaders. All classes loaded by the same loader * from the same package share a {@code Package} instance. * </p> - * @since Android 1.0 * * @see java.lang.ClassLoader */ @@ -76,7 +75,6 @@ public class Package implements AnnotatedElement { * the annotation type to look for. * @return an instance of {@link Annotation} or {@code null}. * @see java.lang.reflect.AnnotatedElement#getAnnotation(java.lang.Class) - * @since Android 1.0 */ @SuppressWarnings("unchecked") public <A extends Annotation> A getAnnotation(Class<A> annotationType) { @@ -95,7 +93,6 @@ public class Package implements AnnotatedElement { * * @return an array of {@link Annotation} instances, which may be empty. * @see java.lang.reflect.AnnotatedElement#getAnnotations() - * @since Android 1.0 */ public Annotation[] getAnnotations() { return getDeclaredAnnotations(this, true); @@ -106,7 +103,6 @@ public class Package implements AnnotatedElement { * * @return an array of {@link Annotation} instances, which may be empty. * @see java.lang.reflect.AnnotatedElement#getDeclaredAnnotations() - * @since Android 1.0 */ public Annotation[] getDeclaredAnnotations() { return getDeclaredAnnotations(this, false); @@ -133,7 +129,6 @@ public class Package implements AnnotatedElement { * @return {@code true} if the annotation is present; {@code false} * otherwise. * @see java.lang.reflect.AnnotatedElement#isAnnotationPresent(java.lang.Class) - * @since Android 1.0 */ public boolean isAnnotationPresent( Class<? extends Annotation> annotationType) { @@ -145,7 +140,6 @@ public class Package implements AnnotatedElement { * if this is unknown. The format of this string is unspecified. * * @return the implementation title, may be {@code null}. - * @since Android 1.0 */ public String getImplementationTitle() { return implTitle; @@ -157,7 +151,6 @@ public class Package implements AnnotatedElement { * format of this string is unspecified. * * @return the implementation vendor name, may be {@code null}. - * @since Android 1.0 */ public String getImplementationVendor() { return implVendor; @@ -168,7 +161,6 @@ public class Package implements AnnotatedElement { * null} if this is unknown. The format of this string is unspecified. * * @return the implementation version, may be {@code null}. - * @since Android 1.0 */ public String getImplementationVersion() { return implVersion; @@ -179,7 +171,6 @@ public class Package implements AnnotatedElement { * example: "java.lang". * * @return the name of this package. - * @since Android 1.0 */ public String getName() { return name; @@ -193,7 +184,6 @@ public class Package implements AnnotatedElement { * the name of the package to find. * @return the requested package, or {@code null}. * @see ClassLoader#getPackage(java.lang.String) - * @since Android 1.0 */ public static Package getPackage(String packageName) { ClassLoader classloader = VMStack.getCallingClassLoader(); @@ -205,7 +195,6 @@ public class Package implements AnnotatedElement { * * @return all the packages known to the caller's class loader. * @see ClassLoader#getPackages - * @since Android 1.0 */ public static Package[] getPackages() { ClassLoader classloader = VMStack.getCallingClassLoader(); @@ -217,7 +206,6 @@ public class Package implements AnnotatedElement { * {@code null} if this is unknown. * * @return the specification title, may be {@code null}. - * @since Android 1.0 */ public String getSpecificationTitle() { return specTitle; @@ -229,7 +217,6 @@ public class Package implements AnnotatedElement { * unknown. * * @return the specification vendor name, may be {@code null}. - * @since Android 1.0 */ public String getSpecificationVendor() { return specVendor; @@ -241,7 +228,6 @@ public class Package implements AnnotatedElement { * non-negative integers separated by dots; for example: "1.2.3". * * @return the specification version string, may be {@code null}. - * @since Android 1.0 */ public String getSpecificationVersion() { return specVersion; @@ -264,7 +250,6 @@ public class Package implements AnnotatedElement { * @throws NumberFormatException * if this package's version string or the one provided are not * in the correct format. - * @since Android 1.0 */ public boolean isCompatibleWith(String version) throws NumberFormatException { @@ -293,7 +278,6 @@ public class Package implements AnnotatedElement { * Indicates whether this package is sealed. * * @return {@code true} if this package is sealed; {@code false} otherwise. - * @since Android 1.0 */ public boolean isSealed() { return sealBase != null; @@ -307,7 +291,6 @@ public class Package implements AnnotatedElement { * the URL to check. * @return {@code true} if this package is sealed with {@code url}; {@code * false} otherwise - * @since Android 1.0 */ public boolean isSealed(URL url) { return sealBase != null && sealBase.sameFile(url); diff --git a/luni-kernel/src/main/java/java/lang/Runtime.java b/luni-kernel/src/main/java/java/lang/Runtime.java index 8560399..6d928f7 100644 --- a/luni-kernel/src/main/java/java/lang/Runtime.java +++ b/luni-kernel/src/main/java/java/lang/Runtime.java @@ -58,8 +58,6 @@ import dalvik.system.VMStack; * get a singleton instance by invoking {@link #getRuntime()}. * * @see System - * - * @since Android 1.0 */ public class Runtime { @@ -135,7 +133,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String[] progArray) throws java.io.IOException { return exec(progArray, null, null); @@ -161,7 +158,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String[] progArray, String[] envp) throws java.io.IOException { return exec(progArray, envp, null); @@ -189,7 +185,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String[] progArray, String[] envp, File directory) throws IOException { // BEGIN android-changed: push responsibility for argument checking into ProcessManager @@ -212,7 +207,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String prog) throws java.io.IOException { return exec(prog, null, null); @@ -236,7 +230,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String prog, String[] envp) throws java.io.IOException { return exec(prog, envp, null); @@ -263,7 +256,6 @@ public class Runtime { * if the current {@code SecurityManager} disallows program * execution. * @see SecurityManager#checkExec - * @since Android 1.0 */ public Process exec(String prog, String[] envp, File directory) throws java.io.IOException { // Sanity checks @@ -288,7 +280,7 @@ public class Runtime { /** * Causes the virtual machine to stop running and the program to exit. If * {@link #runFinalizersOnExit(boolean)} has been previously invoked with a - * {@code true} argument, then all all objects will be properly + * {@code true} argument, then all objects will be properly * garbage-collected and finalized first. * * @param code @@ -298,7 +290,6 @@ public class Runtime { * if the current {@code SecurityManager} does not allow the * running thread to terminate the virtual machine. * @see SecurityManager#checkExit - * @since Android 1.0 */ public void exit(int code) { // Security checks @@ -349,7 +340,6 @@ public class Runtime { * running program. * * @return the approximate amount of free memory, measured in bytes. - * @since Android 1.0 */ public native long freeMemory(); @@ -357,8 +347,6 @@ public class Runtime { * Indicates to the virtual machine that it would be a good time to run the * garbage collector. Note that this is a hint only. There is no guarantee * that the garbage collector will actually be run. - * - * @since Android 1.0 */ public native void gc(); @@ -366,7 +354,6 @@ public class Runtime { * Returns the single {@code Runtime} instance. * * @return the {@code Runtime} object for the current application. - * @since Android 1.0 */ public static Runtime getRuntime() { return mRuntime; @@ -386,7 +373,6 @@ public class Runtime { * if the current {@code SecurityManager} does not allow to load * the library. * @see SecurityManager#checkLink - * @since Android 1.0 */ public void load(String pathName) { // Security checks @@ -424,7 +410,6 @@ public class Runtime { * if the current {@code SecurityManager} does not allow to load * the library. * @see SecurityManager#checkLink - * @since Android 1.0 */ public void loadLibrary(String libName) { // Security checks @@ -479,7 +464,6 @@ public class Runtime { * Provides a hint to the virtual machine that it would be useful to attempt * to perform any outstanding object finalizations. * - * @since Android 1.0 */ public void runFinalization() { runFinalization(false); @@ -495,7 +479,6 @@ public class Runtime { * {@code true} to enable finalization on exit, {@code false} to * disable it. * @deprecated This method is unsafe. - * @since Android 1.0 */ @Deprecated public static void runFinalizersOnExit(boolean run) { @@ -511,7 +494,6 @@ public class Runtime { * program. * * @return the total amount of memory, measured in bytes. - * @since Android 1.0 */ public native long totalMemory(); @@ -522,7 +504,6 @@ public class Runtime { * @param enable * {@code true} to switch tracing on, {@code false} to switch it * off. - * @since Android 1.0 */ public void traceInstructions(boolean enable) { // TODO(Google) Provide some implementation for this. @@ -535,7 +516,6 @@ public class Runtime { * @param enable * {@code true} to switch tracing on, {@code false} to switch it * off. - * @since Android 1.0 */ public void traceMethodCalls(boolean enable) { if (enable != tracingMethods) { @@ -558,7 +538,6 @@ public class Runtime { * the input stream to localize. * @return the localized input stream. * @deprecated Use {@link InputStreamReader}. - * @since Android 1.0 */ @Deprecated public InputStream getLocalizedInputStream(InputStream stream) { @@ -578,7 +557,6 @@ public class Runtime { * the output stream to localize. * @return the localized output stream. * @deprecated Use {@link OutputStreamWriter}. - * @since Android 1.0 */ @Deprecated public OutputStream getLocalizedOutputStream(OutputStream stream) { @@ -700,7 +678,6 @@ public class Runtime { * @see #addShutdownHook(Thread) * @see #removeShutdownHook(Thread) * @see #runFinalizersOnExit(boolean) - * @since Android 1.0 */ public void halt(int code) { // Security checks @@ -718,7 +695,6 @@ public class Runtime { * Android reference implementation (currently) always returns 1. * * @return the number of available processors, at least 1. - * @since Android 1.0 */ public int availableProcessors() { return 1; @@ -730,7 +706,6 @@ public class Runtime { * * @return the maximum amount of memory that the virtual machine will try to * allocate, measured in bytes. - * @since Android 1.0 */ public native long maxMemory(); diff --git a/luni-kernel/src/main/java/java/lang/StackTraceElement.java b/luni-kernel/src/main/java/java/lang/StackTraceElement.java index 5394ae9..88fe1ab 100644 --- a/luni-kernel/src/main/java/java/lang/StackTraceElement.java +++ b/luni-kernel/src/main/java/java/lang/StackTraceElement.java @@ -25,7 +25,6 @@ import java.io.Serializable; * call stack at the time a {@code Throwable} gets thrown. * * @see Throwable#getStackTrace() - * @since Android 1.0 */ public final class StackTraceElement implements Serializable { @@ -59,7 +58,6 @@ public final class StackTraceElement implements Serializable { * method. * @throws NullPointerException * if {@code cls} or {@code method} is {@code null}. - * @since Android 1.0 */ public StackTraceElement(String cls, String method, String file, int line) { super(); @@ -98,7 +96,6 @@ public final class StackTraceElement implements Serializable { * @return {@code true} if the specified object is equal to this * {@code StackTraceElement}; {@code false} otherwise. * @see #hashCode - * @since Android 1.0 */ @Override public boolean equals(Object obj) { @@ -143,7 +140,6 @@ public final class StackTraceElement implements Serializable { * {@code StackTraceElement}. * * @return the fully qualified type name of the class - * @since Android 1.0 */ public String getClassName() { return (declaringClass == null) ? "<unknown class>" : declaringClass; @@ -155,7 +151,6 @@ public final class StackTraceElement implements Serializable { * * @return the name of the file, or {@code null} if this information is not * available. - * @since Android 1.0 */ public String getFileName() { return fileName; @@ -167,7 +162,6 @@ public final class StackTraceElement implements Serializable { * * @return the line number, or a negative number if this information is not * available. - * @since Android 1.0 */ public int getLineNumber() { return lineNumber; @@ -179,7 +173,6 @@ public final class StackTraceElement implements Serializable { * * @return the name of the method, or "<unknown method>" if this information * is not available. - * @since Android 1.0 */ public String getMethodName() { return (methodName == null) ? "<unknown method>" : methodName; @@ -205,7 +198,6 @@ public final class StackTraceElement implements Serializable { * * @return {@code true} if the method in which this stack trace element is * executing is a native method; {@code false} otherwise. - * @since Android 1.0 */ public boolean isNativeMethod() { // BEGIN android-changed diff --git a/luni-kernel/src/main/java/java/lang/System.java b/luni-kernel/src/main/java/java/lang/System.java index 6a69c2e..3de7b1f 100644 --- a/luni-kernel/src/main/java/java/lang/System.java +++ b/luni-kernel/src/main/java/java/lang/System.java @@ -58,29 +58,21 @@ import dalvik.system.VMStack; * class itself can not be instantiated. * * @see Runtime - * - * @since Android 1.0 */ public final class System { /** * Default input stream. - * - * @since Android 1.0 */ public static final InputStream in; /** * Default output stream. - * - * @since Android 1.0 */ public static final PrintStream out; /** * Default error output stream. - * - * @since Android 1.0 */ public static final PrintStream err; @@ -118,7 +110,6 @@ public final class System { * if a {@link SecurityManager} is installed and its {@code * checkPermission()} method does not allow the change of the * stream. - * @since Android 1.0 */ public static void setIn(InputStream newIn) { SecurityManager secMgr = System.getSecurityManager(); @@ -138,7 +129,6 @@ public final class System { * if a {@link SecurityManager} is installed and its {@code * checkPermission()} method does not allow the change of the * stream. - * @since Android 1.0 */ public static void setOut(java.io.PrintStream newOut) { SecurityManager secMgr = System.getSecurityManager(); @@ -159,7 +149,6 @@ public final class System { * if a {@link SecurityManager} is installed and its {@code * checkPermission()} method does not allow the change of the * stream. - * @since Android 1.0 */ public static void setErr(java.io.PrintStream newErr) { SecurityManager secMgr = System.getSecurityManager(); @@ -191,7 +180,6 @@ public final class System { * @param length * the number of elements of the {@code array1} content they have * to be copied. - * @since Android 1.0 */ public static native void arraycopy(Object src, int srcPos, Object dest, int destPos, int length); @@ -203,7 +191,6 @@ public final class System { * the results. * * @return the local system time in milliseconds. - * @since Android 1.0 */ public static native long currentTimeMillis(); @@ -214,14 +201,13 @@ public final class System { * very exact system time expression. * * @return the current timestamp in nanoseconds. - * @since Android 1.0 */ public static native long nanoTime(); /** * Causes the virtual machine to stop running and the program to exit. If * {@link #runFinalizersOnExit(boolean)} has been previously invoked with a - * {@code true} argument, then all all objects will be properly + * {@code true} argument, then all objects will be properly * garbage-collected and finalized first. * * @param code @@ -230,7 +216,6 @@ public final class System { * if the running thread has not enough permission to exit the * virtual machine. * @see SecurityManager#checkExit - * @since Android 1.0 */ public static void exit(int code) { Runtime.getRuntime().exit(code); @@ -240,8 +225,6 @@ public final class System { * Indicates to the virtual machine that it would be a good time to run the * garbage collector. Note that this is a hint only. There is no guarantee * that the garbage collector will actually be run. - * - * @since Android 1.0 */ public static void gc() { Runtime.getRuntime().gc(); @@ -259,8 +242,6 @@ public final class System { * if a {@link SecurityManager} is installed and its {@code * checkPermission()} method does not allow the querying of * single environment variables. - * - * @since Android 1.0 */ public static String getenv(String name) { if (name == null) { @@ -289,7 +270,6 @@ public final class System { * if a {@link SecurityManager} is installed and its {@code * checkPermission()} method does not allow the querying of * all environment variables. - * @since Android 1.0 */ public static Map<String, String> getenv() { SecurityManager secMgr = System.getSecurityManager(); @@ -332,7 +312,6 @@ public final class System { * if an I/O error occurred. * @see SelectorProvider * @see SelectorProvider#inheritedChannel() - * @since Android 1.0 */ public static Channel inheritedChannel() throws IOException { return SelectorProvider.provider().inheritedChannel(); @@ -347,7 +326,6 @@ public final class System { * @throws SecurityException * if a {@link SecurityManager} is installed and its {@code * checkPropertiesAccess()} method does not allow the operation. - * @since Android 1.0 */ public static Properties getProperties() { SecurityManager secMgr = System.getSecurityManager(); @@ -407,7 +385,6 @@ public final class System { * @throws SecurityException * if a {@link SecurityManager} is installed and its {@code * checkPropertyAccess()} method does not allow the operation. - * @since Android 1.0 */ public static String getProperty(String prop) { return getProperty(prop, null); @@ -427,7 +404,6 @@ public final class System { * @throws SecurityException * if a {@link SecurityManager} is installed and its {@code * checkPropertyAccess()} method does not allow the operation. - * @since Android 1.0 */ public static String getProperty(String prop, String defaultValue) { if (prop.length() == 0) { @@ -453,7 +429,6 @@ public final class System { * @throws SecurityException * if a security manager exists and write access to the * specified property is not allowed. - * @since Android 1.0 */ public static String setProperty(String prop, String value) { if (prop.length() == 0) { @@ -479,7 +454,6 @@ public final class System { * @throws SecurityException * if a security manager exists and write access to the * specified property is not allowed. - * @since Android 1.0 */ public static String clearProperty(String key) { if (key == null) { @@ -511,7 +485,6 @@ public final class System { * Returns the active security manager. * * @return the system security manager object. - * @since Android 1.0 */ public static SecurityManager getSecurityManager() { return securityManager; @@ -527,7 +500,6 @@ public final class System { * the object to calculate the hash code. * @return the hash code for the given object. * @see java.lang.Object#hashCode - * @since Android 1.0 */ public static native int identityHashCode(Object anObject); @@ -538,7 +510,6 @@ public final class System { * the path of the file to be loaded. * @throws SecurityException * if the library was not allowed to be loaded. - * @since Android 1.0 */ public static void load(String pathName) { SecurityManager smngr = System.getSecurityManager(); @@ -559,7 +530,6 @@ public final class System { * if the library could not be loaded. * @throws SecurityException * if the library was not allowed to be loaded. - * @since Android 1.0 */ public static void loadLibrary(String libName) { SecurityManager smngr = System.getSecurityManager(); @@ -571,9 +541,7 @@ public final class System { /** * Provides a hint to the virtual machine that it would be useful to attempt - * to perform any outstanding object finalizations. - * - * @since Android 1.0 + * to perform any outstanding object finalization. */ public static void runFinalization() { Runtime.getRuntime().runFinalization(); @@ -587,7 +555,6 @@ public final class System { * @param flag * the flag determines if finalization on exit is enabled. * @deprecated this method is unsafe. - * @since Android 1.0 */ @SuppressWarnings("deprecation") @Deprecated @@ -603,7 +570,6 @@ public final class System { * @throws SecurityException * if a {@link SecurityManager} is installed and its {@code * checkPropertiesAccess()} method does not allow the operation. - * @since Android 1.0 */ public static void setProperties(Properties p) { SecurityManager secMgr = System.getSecurityManager(); @@ -629,7 +595,6 @@ public final class System { * if the security manager has already been set and if its * checkPermission method does not allow to redefine the * security manager. - * @since Android 1.0 */ public static void setSecurityManager(final SecurityManager sm) { if (securityManager != null) { @@ -660,7 +625,6 @@ public final class System { * @param userLibName * the name of the library to look up. * @return the platform specific filename for the library. - * @since Android 1.0 */ public static native String mapLibraryName(String userLibName); diff --git a/luni-kernel/src/main/java/java/lang/Thread.java b/luni-kernel/src/main/java/java/lang/Thread.java index 4f9f988..2dbba37 100644 --- a/luni-kernel/src/main/java/java/lang/Thread.java +++ b/luni-kernel/src/main/java/java/lang/Thread.java @@ -69,7 +69,6 @@ import org.apache.harmony.security.fortress.SecurityUtils; * @see java.lang.Object * @see java.lang.ThreadGroup * - * @since Android 1.0 */ public class Thread implements Runnable { @@ -90,8 +89,6 @@ public class Thread implements Runnable { /** * A representation of a thread's state. A given thread may only be in one * state at a time. - * - * @since Android 1.0 */ public enum State { /** @@ -122,22 +119,16 @@ public class Thread implements Runnable { /** * The maximum priority value allowed for a thread. - * - * @since Android 1.0 */ public final static int MAX_PRIORITY = 10; /** * The minimum priority value allowed for a thread. - * - * @since Android 1.0 */ public final static int MIN_PRIORITY = 1; /** * The normal (default) priority value assigned to threads. - * - * @since Android 1.0 */ public final static int NORM_PRIORITY = 5; @@ -208,8 +199,6 @@ public class Thread implements Runnable { * * @see java.lang.ThreadGroup * @see java.lang.Runnable - * - * @since Android 1.0 */ public Thread() { create(null, null, null, 0); @@ -226,8 +215,6 @@ public class Thread implements Runnable { * * @see java.lang.ThreadGroup * @see java.lang.Runnable - * - * @since Android 1.0 */ public Thread(Runnable runnable) { create(null, runnable, null, 0); @@ -246,8 +233,6 @@ public class Thread implements Runnable { * * @see java.lang.ThreadGroup * @see java.lang.Runnable - * - * @since Android 1.0 */ public Thread(Runnable runnable, String threadName) { if (threadName == null) { @@ -268,7 +253,6 @@ public class Thread implements Runnable { * @see java.lang.ThreadGroup * @see java.lang.Runnable * - * @since Android 1.0 */ public Thread(String threadName) { if (threadName == null) { @@ -298,8 +282,6 @@ public class Thread implements Runnable { * @see java.lang.Runnable * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public Thread(ThreadGroup group, Runnable runnable) { create(group, runnable, null, 0); @@ -325,8 +307,6 @@ public class Thread implements Runnable { * @see java.lang.Runnable * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public Thread(ThreadGroup group, Runnable runnable, String threadName) { if (threadName == null) { @@ -353,8 +333,6 @@ public class Thread implements Runnable { * @see java.lang.Runnable * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public Thread(ThreadGroup group, String threadName) { if (threadName == null) { @@ -389,8 +367,6 @@ public class Thread implements Runnable { * @see java.lang.Runnable * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public Thread(ThreadGroup group, Runnable runnable, String threadName, long stackSize) { if (threadName == null) { @@ -530,8 +506,6 @@ public class Thread implements Runnable { * Thread}'s group and its subgroups. * * @return the number of {@code Thread}s - * - * @since Android 1.0 */ public static int activeCount() { return currentThread().getThreadGroup().activeCount(); @@ -549,8 +523,6 @@ public class Thread implements Runnable { * * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public final void checkAccess() { // Forwards the message to the SecurityManager (if there's one) passing @@ -569,8 +541,6 @@ public class Thread implements Runnable { * @deprecated The results of this call were never well defined. To make * things worse, it would depend on whether the Thread was * suspended or not, and suspend was deprecated too. - * - * @since Android 1.0 */ @Deprecated public int countStackFrames() { @@ -581,8 +551,6 @@ public class Thread implements Runnable { * Returns the Thread of the caller, that is, the current Thread. * * @return the current Thread. - * - * @since Android 1.0 */ public static Thread currentThread() { return VMThread.currentThread(); @@ -592,8 +560,6 @@ public class Thread implements Runnable { * Destroys the receiver without any monitor cleanup. * * @deprecated Not implemented. - * - * @since Android 1.0 */ @Deprecated public void destroy() { @@ -605,8 +571,6 @@ public class Thread implements Runnable { * stack for this Thread. * * @see Throwable#printStackTrace() - * - * @since Android 1.0 */ public static void dumpStack() { new Throwable("stack dump").printStackTrace(); @@ -626,8 +590,6 @@ public class Thread implements Runnable { * {@link SecurityManager#checkAccess(Thread)} * @see java.lang.SecurityException * @see java.lang.SecurityManager - * - * @since Android 1.0 */ public static int enumerate(Thread[] threads) { Thread thread = Thread.currentThread(); @@ -646,8 +608,6 @@ public class Thread implements Runnable { * if the current SecurityManager fails the * {@link SecurityManager#checkPermission(java.security.Permission)} * call. - * - * @since Android 1.0 */ public static Map<Thread, StackTraceElement[]> getAllStackTraces() { SecurityManager securityManager = System.getSecurityManager(); @@ -691,8 +651,6 @@ public class Thread implements Runnable { * * @throws SecurityException * if the aforementioned security check fails. - * - * @since Android 1.0 */ public ClassLoader getContextClassLoader() { // First, if the conditions @@ -719,8 +677,6 @@ public class Thread implements Runnable { * * @return an {@link UncaughtExceptionHandler} or <code>null</code> if * none exists. - * - * @since Android 1.0 */ public static UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() { return defaultUncaughtHandler; @@ -733,8 +689,6 @@ public class Thread implements Runnable { * has been terminated. * * @return the thread's ID. - * - * @since Android 1.0 */ public long getId() { return id; @@ -744,8 +698,6 @@ public class Thread implements Runnable { * Returns the name of the Thread. * * @return the Thread's name - * - * @since Android 1.0 */ public final String getName() { return name; @@ -756,8 +708,6 @@ public class Thread implements Runnable { * * @return the Thread's priority * @see Thread#setPriority - * - * @since Android 1.0 */ public final int getPriority() { return priority; @@ -776,8 +726,6 @@ public class Thread implements Runnable { * if the current SecurityManager fails the * {@link SecurityManager#checkPermission(java.security.Permission)} * call. - * - * @since Android 1.0 */ public StackTraceElement[] getStackTrace() { SecurityManager securityManager = System.getSecurityManager(); @@ -794,8 +742,6 @@ public class Thread implements Runnable { * monitoring purposes. * * @return a {@link State} value. - * - * @since Android 1.0 */ public State getState() { // TODO This is ugly and should be implemented better. @@ -819,8 +765,6 @@ public class Thread implements Runnable { * Returns the ThreadGroup to which this Thread belongs. * * @return the Thread's ThreadGroup - * - * @since Android 1.0 */ public final ThreadGroup getThreadGroup() { // TODO This should actually be done at native termination. @@ -837,8 +781,6 @@ public class Thread implements Runnable { * then <code>null</code> is returned. * * @return an {@link UncaughtExceptionHandler} instance or {@code null}. - * - * @since Android 1.0 */ public UncaughtExceptionHandler getUncaughtExceptionHandler() { if (uncaughtHandler != null) @@ -877,8 +819,6 @@ public class Thread implements Runnable { * @see java.lang.SecurityManager * @see Thread#interrupted * @see Thread#isInterrupted - * - * @since Android 1.0 */ public void interrupt() { checkAccess(); @@ -903,8 +843,6 @@ public class Thread implements Runnable { * @see Thread#currentThread * @see Thread#interrupt * @see Thread#isInterrupted - * - * @since Android 1.0 */ public static boolean interrupted() { return VMThread.interrupted(); @@ -916,10 +854,8 @@ public class Thread implements Runnable { * the receiver hasn't been started yet or if it has already started and run * to completion and died. * - * @return a <code>boolean</code> indicating the lifeness of the Thread + * @return a <code>boolean</code> indicating the liveness of the Thread * @see Thread#start - * - * @since Android 1.0 */ public final boolean isAlive() { return (vmThread != null); @@ -934,8 +870,6 @@ public class Thread implements Runnable { * * @return a <code>boolean</code> indicating whether the Thread is a daemon * @see Thread#setDaemon - * - * @since Android 1.0 */ public final boolean isDaemon() { return daemon; @@ -949,8 +883,6 @@ public class Thread implements Runnable { * @return a <code>boolean</code> indicating the interrupt status * @see Thread#interrupt * @see Thread#interrupted - * - * @since Android 1.0 */ public boolean isInterrupted() { VMThread vmt = this.vmThread; @@ -969,8 +901,6 @@ public class Thread implements Runnable { * the receiver while it was in the <code>join()</code> call * @see Object#notifyAll * @see java.lang.ThreadDeath - * - * @since Android 1.0 */ public final void join() throws InterruptedException { VMThread t = vmThread; @@ -995,8 +925,6 @@ public class Thread implements Runnable { * the receiver while it was in the <code>join()</code> call * @see Object#notifyAll * @see java.lang.ThreadDeath - * - * @since Android 1.0 */ public final void join(long millis) throws InterruptedException { join(millis, 0); @@ -1013,8 +941,6 @@ public class Thread implements Runnable { * the receiver while it was in the <code>join()</code> call * @see Object#notifyAll * @see java.lang.ThreadDeath - * - * @since Android 1.0 */ public final void join(long millis, int nanos) throws InterruptedException { if (millis < 0 || nanos < 0 || nanos >= NANOS_PER_MILLI) { @@ -1070,8 +996,6 @@ public class Thread implements Runnable { * if <code>checkAccess()</code> fails with a SecurityException * @see Thread#suspend() * @deprecated Used with deprecated method {@link Thread#suspend} - * - * @since Android 1.0 */ @Deprecated public final void resume() { @@ -1088,8 +1012,6 @@ public class Thread implements Runnable { * holds. If no Runnable is set, does nothing. * * @see Thread#start - * - * @since Android 1.0 */ public void run() { if (target != null) { @@ -1109,8 +1031,6 @@ public class Thread implements Runnable { * checkPermission call. * @see java.lang.ClassLoader * @see #getContextClassLoader() - * - * @since Android 1.0 */ public void setContextClassLoader(ClassLoader cl) { SecurityManager securityManager = System.getSecurityManager(); @@ -1130,8 +1050,6 @@ public class Thread implements Runnable { * @throws SecurityException * if <code>checkAccess()</code> fails with a SecurityException * @see Thread#isDaemon - * - * @since Android 1.0 */ public final void setDaemon(boolean isDaemon) { checkAccess(); @@ -1160,8 +1078,6 @@ public class Thread implements Runnable { * @throws SecurityException * if the current SecurityManager fails the checkPermission * call. - * - * @since Android 1.0 */ public static void setDefaultUncaughtExceptionHandler(UncaughtExceptionHandler handler) { SecurityManager securityManager = System.getSecurityManager(); @@ -1195,8 +1111,6 @@ public class Thread implements Runnable { * @throws SecurityException if <code>checkAccess()</code> fails with a * SecurityException * @see Thread#getName - * - * @since Android 1.0 */ public final void setName(String threadName) { if (threadName == null) { @@ -1227,14 +1141,12 @@ public class Thread implements Runnable { * if the new priority is greater than Thread.MAX_PRIORITY or * less than Thread.MIN_PRIORITY * @see Thread#getPriority - * - * @since Android 1.0 */ public final void setPriority(int priority) { checkAccess(); if (priority < Thread.MIN_PRIORITY || priority > Thread.MAX_PRIORITY) { - throw new IllegalArgumentException("Prioritiy out of range"); // TODO Externalize? + throw new IllegalArgumentException("Priority out of range"); // TODO Externalize? } if (priority > group.getMaxPriority()) { @@ -1259,8 +1171,6 @@ public class Thread implements Runnable { * The handler to set or <code>null</code>. * @throws SecurityException * if the current SecurityManager fails the checkAccess call. - * - * @since Android 1.0 */ public void setUncaughtExceptionHandler(UncaughtExceptionHandler handler) { checkAccess(); @@ -1279,8 +1189,6 @@ public class Thread implements Runnable { * if <code>interrupt()</code> was called for this Thread while * it was sleeping * @see Thread#interrupt() - * - * @since Android 1.0 */ public static void sleep(long time) throws InterruptedException { Thread.sleep(time, 0); @@ -1299,8 +1207,6 @@ public class Thread implements Runnable { * if <code>interrupt()</code> was called for this Thread while * it was sleeping * @see Thread#interrupt() - * - * @since Android 1.0 */ public static void sleep(long millis, int nanos) throws InterruptedException { VMThread.sleep(millis, nanos); @@ -1314,8 +1220,6 @@ public class Thread implements Runnable { * @throws IllegalThreadStateException if the Thread has been started before * * @see Thread#run - * - * @since Android 1.0 */ public synchronized void start() { if (hasBeenStarted) { @@ -1336,8 +1240,6 @@ public class Thread implements Runnable { * SecurityException * @deprecated because stopping a thread in this manner is unsafe and can * leave your application and the VM in an unpredictable state. - * - * @since Android 1.0 */ @Deprecated public final void stop() { @@ -1357,8 +1259,6 @@ public class Thread implements Runnable { * <code>null</code> * @deprecated because stopping a thread in this manner is unsafe and can * leave your application and the VM in an unpredictable state. - * - * @since Android 1.0 */ @Deprecated public final synchronized void stop(Throwable throwable) { @@ -1391,8 +1291,6 @@ public class Thread implements Runnable { * if <code>checkAccess()</code> fails with a SecurityException * @see Thread#resume() * @deprecated May cause deadlocks. - * - * @since Android 1.0 */ @Deprecated public final void suspend() { @@ -1409,8 +1307,6 @@ public class Thread implements Runnable { * Thread. It includes the Thread's name, priority, and group name. * * @return a printable representation for the receiver. - * - * @since Android 1.0 */ @Override public String toString() { @@ -1420,8 +1316,6 @@ public class Thread implements Runnable { /** * Causes the calling Thread to yield execution time to another Thread that * is ready to run. The actual scheduling is implementation-dependent. - * - * @since Android 1.0 */ public static void yield() { VMThread.yield(); @@ -1434,8 +1328,6 @@ public class Thread implements Runnable { * @param object the object to test for the monitor lock * @return true if the current thread has a monitor lock on the specified * object; false otherwise - * - * @since Android 1.0 */ public static boolean holdsLock(Object object) { return currentThread().vmThread.holdsLock(object); @@ -1446,8 +1338,6 @@ public class Thread implements Runnable { * terminated by an uncaught exception. Upon such termination, the handler * is notified of the terminating thread and causal exception. If there is * no explicit handler set then the thread's group is the default handler. - * - * @since Android 1.0 */ public static interface UncaughtExceptionHandler { /** @@ -1457,8 +1347,6 @@ public class Thread implements Runnable { * * @param thread the thread that has an uncaught exception * @param ex the exception that was thrown - * - * @since Android 1.0 */ void uncaughtException(Thread thread, Throwable ex); } diff --git a/luni-kernel/src/main/java/java/lang/ThreadGroup.java b/luni-kernel/src/main/java/java/lang/ThreadGroup.java index 33fa31e..66865ff 100644 --- a/luni-kernel/src/main/java/java/lang/ThreadGroup.java +++ b/luni-kernel/src/main/java/java/lang/ThreadGroup.java @@ -32,8 +32,6 @@ package java.lang; * * @see Thread * @see SecurityManager - * - * @since Android 1.0 */ public class ThreadGroup implements Thread.UncaughtExceptionHandler { @@ -396,7 +394,7 @@ public class ThreadGroup implements Thread.UncaughtExceptionHandler { /** * Iterates over all thread groups in this group (and, optionally, its - * sub-groups) and and stores the groups in the given array. Returns when + * sub-groups) and stores the groups in the given array. Returns when * the array is full or no more groups remain, whichever happens first. * * @param groups the array into which the ThreadGroups will be copied diff --git a/luni-kernel/src/main/java/java/lang/Throwable.java b/luni-kernel/src/main/java/java/lang/Throwable.java index 12b4e9b..c94631b 100644 --- a/luni-kernel/src/main/java/java/lang/Throwable.java +++ b/luni-kernel/src/main/java/java/lang/Throwable.java @@ -41,8 +41,6 @@ import java.io.PrintWriter; * @see Error * @see Exception * @see RuntimeException - * - * @since Android 1.0 */ public class Throwable implements java.io.Serializable { private static final long serialVersionUID = -3042686055658047285L; @@ -72,8 +70,6 @@ public class Throwable implements java.io.Serializable { /** * Constructs a new {@code Throwable} that includes the current stack trace. - * - * @since Android 1.0 */ public Throwable() { super(); @@ -86,7 +82,6 @@ public class Throwable implements java.io.Serializable { * * @param detailMessage * the detail message for this {@code Throwable}. - * @since Android 1.0 */ public Throwable(String detailMessage) { this(); @@ -101,7 +96,6 @@ public class Throwable implements java.io.Serializable { * the detail message for this {@code Throwable}. * @param throwable * the cause of this {@code Throwable}. - * @since Android 1.0 */ public Throwable(String detailMessage, Throwable throwable) { this(); @@ -115,7 +109,6 @@ public class Throwable implements java.io.Serializable { * * @param throwable * the cause of this {@code Throwable}. - * @since Android 1.0 */ public Throwable(Throwable throwable) { this(); @@ -131,7 +124,6 @@ public class Throwable implements java.io.Serializable { * trace to represent the location where the exception was re-thrown. * * @return this {@code Throwable} instance. - * @since Android 1.0 */ public Throwable fillInStackTrace() { // Fill in the intermediate representation @@ -148,7 +140,6 @@ public class Throwable implements java.io.Serializable { * provided at creation time. * * @return this {@code Throwable}'s detail message. - * @since Android 1.0 */ public String getMessage() { return detailMessage; @@ -158,11 +149,9 @@ public class Throwable implements java.io.Serializable { * Returns the extra information message which was provided when this * {@code Throwable} was created. Returns {@code null} if no message was * provided at creation time. Subclasses may override this method to return - * localized text for the message. The Android reference implementation - * returns the unlocalized detail message. + * localized text for the message. Android returns the regular detail message. * * @return this {@code Throwable}'s localized detail message. - * @since Android 1.0 */ public String getLocalizedMessage() { return getMessage(); @@ -178,7 +167,6 @@ public class Throwable implements java.io.Serializable { * the call stack. Changes in the array obtained from this call will * not change the call stack stored in this {@code Throwable}. * @see #printStackTrace() - * @since Android 1.0 */ public StackTraceElement[] getStackTrace() { return getInternalStackTrace().clone(); @@ -198,7 +186,6 @@ public class Throwable implements java.io.Serializable { * @throws NullPointerException * if any element in {@code trace} is {@code null}. * @see #printStackTrace() - * @since Android 1.0 */ public void setStackTrace(StackTraceElement[] trace) { StackTraceElement[] newTrace = trace.clone(); @@ -214,7 +201,6 @@ public class Throwable implements java.io.Serializable { * Writes a printable representation of this {@code Throwable}'s stack trace * to the {@code System.err} stream. * - * @since Android 1.0 */ public void printStackTrace() { printStackTrace(System.err); @@ -268,7 +254,6 @@ public class Throwable implements java.io.Serializable { * * @param err * the stream to write the stack trace on. - * @since Android 1.0 */ public void printStackTrace(PrintStream err) { err.println(toString()); @@ -305,7 +290,6 @@ public class Throwable implements java.io.Serializable { * * @param err * the writer to write the stack trace on. - * @since Android 1.0 */ public void printStackTrace(PrintWriter err) { err.println(toString()); @@ -356,7 +340,6 @@ public class Throwable implements java.io.Serializable { * if {@code Throwable} is this object. * @throws IllegalStateException * if the cause has already been initialized. - * @since Android 1.0 */ public Throwable initCause(Throwable throwable) { // BEGIN android-note @@ -377,7 +360,6 @@ public class Throwable implements java.io.Serializable { * no cause. * * @return Throwable this {@code Throwable}'s cause. - * @since Android 1.0 */ public Throwable getCause() { if (cause == this) { @@ -407,4 +389,3 @@ public class Throwable implements java.io.Serializable { native private static StackTraceElement[] nativeGetStackTrace(Object stackState); // END android-added } - diff --git a/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java b/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java index b5b2de0..46ffcad 100644 --- a/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java +++ b/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java @@ -44,8 +44,6 @@ package java.lang.ref; * Phantom references are useful for implementing cleanup operations that are * necessary before an object gets garbage-collected. They are sometimes more * flexible than the {@link Object#finalize()} method. - * - * @since Android 1.0 */ public class PhantomReference<T> extends Reference<T> { @@ -57,8 +55,6 @@ public class PhantomReference<T> extends Reference<T> { * * @param r the referent to track * @param q the queue to register the phantom reference object with - * - * @since Android 1.0 */ public PhantomReference(T r, ReferenceQueue<? super T> q) { super(); @@ -71,8 +67,6 @@ public class PhantomReference<T> extends Reference<T> { * accessible. * * @return {@code null} (always) - * - * @since Android 1.0 */ @Override public T get() { diff --git a/luni-kernel/src/main/java/java/lang/ref/Reference.java b/luni-kernel/src/main/java/java/lang/ref/Reference.java index c695830..9b59b35 100644 --- a/luni-kernel/src/main/java/java/lang/ref/Reference.java +++ b/luni-kernel/src/main/java/java/lang/ref/Reference.java @@ -39,8 +39,6 @@ package java.lang.ref; * also not desirable to do so, since references require very close cooperation * with the system's garbage collector. The existing, specialized reference * classes should be used instead. - * - * @since Android 1.0 */ public abstract class Reference<T> { @@ -86,8 +84,6 @@ public abstract class Reference<T> { /** * Makes the referent {@code null}. This does not force the reference * object to be enqueued. - * - * @since Android 1.0 */ public void clear() { referent = null; @@ -103,8 +99,6 @@ public abstract class Reference<T> { * * @return {@code true} if this call has caused the {@code Reference} to * become enqueued, or {@code false} otherwise - * - * @since Android 1.0 */ @SuppressWarnings("unchecked") private synchronized boolean enqueueInternal() { @@ -128,8 +122,6 @@ public abstract class Reference<T> { * * @return {@code true} if this call has caused the {@code Reference} to * become enqueued, or {@code false} otherwise - * - * @since Android 1.0 */ public boolean enqueue() { return enqueueInternal(); @@ -140,8 +132,6 @@ public abstract class Reference<T> { * * @return the referent to which reference refers, or {@code null} if the * object has been cleared. - * - * @since Android 1.0 */ public T get() { return referent; @@ -152,8 +142,6 @@ public abstract class Reference<T> { * * @return {@code true} if the {@code Reference} has been enqueued, {@code * false} otherwise - * - * @since Android 1.0 */ public boolean isEnqueued() { return queueNext != null; diff --git a/luni-kernel/src/main/java/java/lang/ref/SoftReference.java b/luni-kernel/src/main/java/java/lang/ref/SoftReference.java index 757289e..2bf8746 100644 --- a/luni-kernel/src/main/java/java/lang/ref/SoftReference.java +++ b/luni-kernel/src/main/java/java/lang/ref/SoftReference.java @@ -83,8 +83,6 @@ package java.lang.ref; * known to be weakly-referenced. * </li> * </ul> - * - * @since Android 1.0 */ public class SoftReference<T> extends Reference<T> { @@ -93,8 +91,6 @@ public class SoftReference<T> extends Reference<T> { * reference is not registered with any reference queue. * * @param r the referent to track - * - * @since Android 1.0 */ public SoftReference(T r) { super(); @@ -109,27 +105,10 @@ public class SoftReference<T> extends Reference<T> { * @param q the queue to register to the reference object with. A null value * results in a weak reference that is not associated with any * queue. - * - * @since Android 1.0 */ public SoftReference(T r, ReferenceQueue<? super T> q) { super(); referent = r; queue = q; } - -// BEGIN android-removed -// /** -// * Return the referent of the reference object. -// * -// * @return the referent to which reference refers, or {@code null} if the -// * referent has been cleared. -// * -// * @since Android 1.0 -// */ -// @Override -// public T get() { -// return super.get(); -// } -// END android-removed } diff --git a/luni-kernel/src/main/java/java/lang/ref/WeakReference.java b/luni-kernel/src/main/java/java/lang/ref/WeakReference.java index cbd2248..e326a24 100644 --- a/luni-kernel/src/main/java/java/lang/ref/WeakReference.java +++ b/luni-kernel/src/main/java/java/lang/ref/WeakReference.java @@ -82,8 +82,6 @@ package java.lang.ref; * known to be weakly-referenced. * </li> * </ul> - * - * @since Android 1.0 */ public class WeakReference<T> extends Reference<T> { @@ -92,8 +90,6 @@ public class WeakReference<T> extends Reference<T> { * reference is not registered with any reference queue. * * @param r the referent to track - * - * @since Android 1.0 */ public WeakReference(T r) { super(); @@ -108,8 +104,6 @@ public class WeakReference<T> extends Reference<T> { * @param q the queue to register to the reference object with. A null value * results in a weak reference that is not associated with any * queue. - * - * @since Android 1.0 */ public WeakReference(T r, ReferenceQueue<? super T> q) { super(); diff --git a/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java b/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java index 0178276..8990156 100644 --- a/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java +++ b/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java @@ -54,8 +54,6 @@ import org.apache.harmony.kernel.vm.ReflectionAccess; * @see Constructor * @see Method * @see ReflectPermission - * - * @since Android 1.0 */ public class AccessibleObject implements AnnotatedElement { @@ -110,8 +108,6 @@ public class AccessibleObject implements AnnotatedElement { * * @see #setAccessible(boolean) * @see ReflectPermission - * - * @since Android 1.0 */ public static void setAccessible(AccessibleObject[] objects, boolean flag) throws SecurityException { @@ -131,8 +127,6 @@ public class AccessibleObject implements AnnotatedElement { * Constructs a new {@code AccessibleObject} instance. {@code * AccessibleObject} instances can only be constructed by the virtual * machine. - * - * @since Android 1.0 */ protected AccessibleObject() { super(); @@ -144,8 +138,6 @@ public class AccessibleObject implements AnnotatedElement { * * @return {@code true} if this object is accessible without security * checks, {@code false} otherwise - * - * @since Android 1.0 */ public boolean isAccessible() { return flag; @@ -164,8 +156,6 @@ public class AccessibleObject implements AnnotatedElement { * if the request is denied * * @see ReflectPermission - * - * @since Android 1.0 */ public void setAccessible(boolean flag) throws SecurityException { SecurityManager smgr = System.getSecurityManager(); diff --git a/luni-kernel/src/main/java/java/lang/reflect/Array.java b/luni-kernel/src/main/java/java/lang/reflect/Array.java index 8c01054..8a12f71 100644 --- a/luni-kernel/src/main/java/java/lang/reflect/Array.java +++ b/luni-kernel/src/main/java/java/lang/reflect/Array.java @@ -34,8 +34,6 @@ package java.lang.reflect; /** * This class provides static methods to create and access arrays dynamically. - * - * @since Android 1.0 */ public final class Array { @@ -64,8 +62,6 @@ public final class Array { * if {@code array} is not an array * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static Object get(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -121,8 +117,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static boolean getBoolean(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -156,8 +150,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static byte getByte(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -187,8 +179,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static char getChar(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -222,8 +212,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static double getDouble(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -253,8 +241,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static float getFloat(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -284,8 +270,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static int getInt(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -309,8 +293,6 @@ public final class Array { * if the {@code array} is {@code null} * @throws IllegalArgumentException * if {@code array} is not an array - * - * @since Android 1.0 */ public static int getLength(Object array) { if (array instanceof Object[]) @@ -365,8 +347,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static long getLong(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -396,8 +376,6 @@ public final class Array { * index position can not be converted to the return type * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static short getShort(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -427,8 +405,6 @@ public final class Array { * @throws IllegalArgumentException * if the array of dimensions is of size zero, or exceeds the * limit of the number of dimension for an array (currently 255) - * - * @since Android 1.0 */ public static Object newInstance(Class<?> componentType, int[] dimensions) throws NegativeArraySizeException, IllegalArgumentException { @@ -465,8 +441,6 @@ public final class Array { * if the component type is null * @throws NegativeArraySizeException * if {@code size < 0} - * - * @since Android 1.0 */ public static Object newInstance(Class<?> componentType, int size) throws NegativeArraySizeException { @@ -528,8 +502,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void set(Object array, int index, Object value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -588,8 +560,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setBoolean(Object array, int index, boolean value) { if (array instanceof boolean[]) { @@ -617,8 +587,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setByte(Object array, int index, byte value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -647,8 +615,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setChar(Object array, int index, char value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -681,8 +647,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setDouble(Object array, int index, double value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -715,8 +679,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setFloat(Object array, int index, float value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -745,8 +707,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setInt(Object array, int index, int value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -775,8 +735,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setLong(Object array, int index, long value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { @@ -805,8 +763,6 @@ public final class Array { * converted to the array type by a widening conversion * @throws ArrayIndexOutOfBoundsException * if {@code index < 0 || index >= array.length} - * - * @since Android 1.0 */ public static void setShort(Object array, int index, short value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException { diff --git a/luni-kernel/src/main/java/java/lang/reflect/Constructor.java b/luni-kernel/src/main/java/java/lang/reflect/Constructor.java index 3918d7e..784f273 100644 --- a/luni-kernel/src/main/java/java/lang/reflect/Constructor.java +++ b/luni-kernel/src/main/java/java/lang/reflect/Constructor.java @@ -46,8 +46,6 @@ import org.apache.harmony.luni.lang.reflect.Types; * accessed, and the constructor can be invoked dynamically. * * @param <T> the class that declares this constructor - * - * @since Android 1.0 */ public final class Constructor<T> extends AccessibleObject implements GenericDeclaration, Member { @@ -132,8 +130,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * including the type parameters. * * @return the string representation of the constructor's declaration - * - * @since Android 1.0 */ public String toGenericString() { StringBuilder sb = new StringBuilder(80); @@ -185,8 +181,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * @throws MalformedParameterizedTypeException * if any parameter type points to a type that cannot be * instantiated for some reason - * - * @since Android 1.0 */ public Type[] getGenericParameterTypes() { initGenericTypes(); @@ -207,7 +201,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * @throws MalformedParameterizedTypeException * if any exception type points to a type that cannot be * instantiated for some reason - * @since Android 1.0 */ public Type[] getGenericExceptionTypes() { initGenericTypes(); @@ -228,8 +221,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * set, then an array of empty arrays is returned. * * @return an array of arrays of {@code Annotation} instances - * - * @since Android 1.0 */ public Annotation[][] getParameterAnnotations() { Annotation[][] parameterAnnotations @@ -248,8 +239,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * * @return {@code true} if a vararg is declare, otherwise * {@code false} - * - * @since Android 1.0 */ public boolean isVarArgs() { int mods = getConstructorModifiers(declaringClass, slot); @@ -262,8 +251,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * * @return {@code true} if this constructor is synthetic, {@code false} * otherwise - * - * @since Android 1.0 */ public boolean isSynthetic() { int mods = getConstructorModifiers(declaringClass, slot); @@ -283,8 +270,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * constructor, {@code false} otherwise * * @see #hashCode - * - * @since Android 1.0 */ @Override public boolean equals(Object object) { @@ -295,8 +280,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * Returns the class that declares this constructor. * * @return the declaring class - * - * @since Android 1.0 */ public Class<T> getDeclaringClass() { return declaringClass; @@ -308,8 +291,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * returned. * * @return the declared exception classes - * - * @since Android 1.0 */ public Class<?>[] getExceptionTypes() { if (exceptionTypes == null) @@ -324,8 +305,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * @return the modifiers for this constructor * * @see Modifier - * - * @since Android 1.0 */ public int getModifiers() { return getConstructorModifiers(declaringClass, slot); @@ -337,8 +316,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * Returns the name of this constructor. * * @return the name of this constructor - * - * @since Android 1.0 */ public String getName() { return declaringClass.getName(); @@ -350,8 +327,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * no parameters, an empty array will be returned. * * @return the parameter types - * - * @since Android 1.0 */ public Class<?>[] getParameterTypes() { return parameterTypes.clone(); @@ -385,8 +360,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * @return the hash code * * @see #equals - * - * @since Android 1.0 */ @Override public int hashCode() { @@ -438,8 +411,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * if an exception was thrown by the invoked constructor * * @see AccessibleObject - * - * @since Android 1.0 */ public T newInstance(Object... args) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { @@ -468,8 +439,6 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec * {@code public String(byte[],String) throws UnsupportedEncodingException} * * @return a printable representation for this constructor - * - * @since Android 1.0 */ @Override public String toString() { diff --git a/luni-kernel/src/main/java/java/lang/reflect/Field.java b/luni-kernel/src/main/java/java/lang/reflect/Field.java index 0ea16df..baaafdd 100644 --- a/luni-kernel/src/main/java/java/lang/reflect/Field.java +++ b/luni-kernel/src/main/java/java/lang/reflect/Field.java @@ -43,8 +43,6 @@ import org.apache.harmony.kernel.vm.StringUtils; /** * This class represents a field. Information about the field can be accessed, * and the field's value can be accessed dynamically. - * - * @since Android 1.0 */ public final class Field extends AccessibleObject implements Member { @@ -132,7 +130,6 @@ public final class Field extends AccessibleObject implements Member { * Indicates whether or not this field is synthetic. * * @return {@code true} if this field is synthetic, {@code false} otherwise - * @since Android 1.0 */ public boolean isSynthetic() { int flags = getFieldModifiers(declaringClass, slot); @@ -144,7 +141,6 @@ public final class Field extends AccessibleObject implements Member { * generic type. * * @return the string representation of this field - * @since Android 1.0 */ public String toGenericString() { StringBuilder sb = new StringBuilder(80); @@ -166,7 +162,6 @@ public final class Field extends AccessibleObject implements Member { * * @return {@code true} if this field is an enumeration constant, {@code * false} otherwise - * @since Android 1.0 */ public boolean isEnumConstant() { int flags = getFieldModifiers(declaringClass, slot); @@ -184,7 +179,6 @@ public final class Field extends AccessibleObject implements Member { * @throws MalformedParameterizedTypeException * if the generic type points to a type that cannot be * instantiated for some reason - * @since Android 1.0 */ public Type getGenericType() { initGenericType(); @@ -208,7 +202,6 @@ public final class Field extends AccessibleObject implements Member { * @return {@code true} if the specified object is equal to this method, * {@code false} otherwise * @see #hashCode - * @since Android 1.0 */ @Override public boolean equals(Object object) { @@ -241,7 +234,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public Object get(Object object) throws IllegalAccessException, IllegalArgumentException { return getField(object, declaringClass, type, slot, flag); @@ -269,7 +261,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public boolean getBoolean(Object object) throws IllegalAccessException, IllegalArgumentException { @@ -298,7 +289,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public byte getByte(Object object) throws IllegalAccessException, IllegalArgumentException { return getBField(object, declaringClass, type, slot, flag, TYPE_BYTE); @@ -326,7 +316,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public char getChar(Object object) throws IllegalAccessException, IllegalArgumentException { return getCField(object, declaringClass, type, slot, flag, TYPE_CHAR); @@ -336,7 +325,6 @@ public final class Field extends AccessibleObject implements Member { * Returns the class that declares this field. * * @return the declaring class - * @since Android 1.0 */ public Class<?> getDeclaringClass() { return declaringClass; @@ -364,7 +352,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public double getDouble(Object object) throws IllegalAccessException, IllegalArgumentException { return getDField(object, declaringClass, type, slot, flag, TYPE_DOUBLE); @@ -392,7 +379,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public float getFloat(Object object) throws IllegalAccessException, IllegalArgumentException { return getFField(object, declaringClass, type, slot, flag, TYPE_FLOAT); @@ -420,7 +406,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public int getInt(Object object) throws IllegalAccessException, IllegalArgumentException { return getIField(object, declaringClass, type, slot, flag, TYPE_INTEGER); @@ -448,7 +433,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public long getLong(Object object) throws IllegalAccessException, IllegalArgumentException { return getJField(object, declaringClass, type, slot, flag, TYPE_LONG); @@ -460,7 +444,6 @@ public final class Field extends AccessibleObject implements Member { * * @return the modifiers for this field * @see Modifier - * @since Android 1.0 */ public int getModifiers() { return getFieldModifiers(declaringClass, slot); @@ -472,7 +455,6 @@ public final class Field extends AccessibleObject implements Member { * Returns the name of this field. * * @return the name of this field - * @since Android 1.0 */ public String getName() { return name; @@ -500,7 +482,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public short getShort(Object object) throws IllegalAccessException, IllegalArgumentException { return getSField(object, declaringClass, type, slot, flag, TYPE_SHORT); @@ -512,7 +493,6 @@ public final class Field extends AccessibleObject implements Member { * of the class * * @return the constructor's signature. - * @since Android 1.0 */ @SuppressWarnings("unused") private String getSignature() { @@ -523,7 +503,6 @@ public final class Field extends AccessibleObject implements Member { * Return the {@link Class} associated with the type of this field. * * @return the type of this field - * @since Android 1.0 */ public Class<?> getType() { return type; @@ -539,7 +518,6 @@ public final class Field extends AccessibleObject implements Member { * * @return the hash code for this field * @see #equals - * @since Android 1.0 */ @Override public int hashCode() { @@ -576,7 +554,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void set(Object object, Object value) throws IllegalAccessException, IllegalArgumentException { @@ -610,7 +587,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setBoolean(Object object, boolean value) throws IllegalAccessException, IllegalArgumentException { @@ -643,7 +619,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setByte(Object object, byte value) throws IllegalAccessException, IllegalArgumentException { @@ -676,7 +651,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setChar(Object object, char value) throws IllegalAccessException, IllegalArgumentException { @@ -709,7 +683,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setDouble(Object object, double value) throws IllegalAccessException, IllegalArgumentException { @@ -742,7 +715,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setFloat(Object object, float value) throws IllegalAccessException, IllegalArgumentException { @@ -775,7 +747,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setInt(Object object, int value) throws IllegalAccessException, IllegalArgumentException { @@ -808,7 +779,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setLong(Object object, long value) throws IllegalAccessException, IllegalArgumentException { @@ -841,7 +811,6 @@ public final class Field extends AccessibleObject implements Member { * if the object is not compatible with the declaring class * @throws IllegalAccessException * if this field is not accessible - * @since Android 1.0 */ public void setShort(Object object, short value) throws IllegalAccessException, IllegalArgumentException { @@ -865,7 +834,6 @@ public final class Field extends AccessibleObject implements Member { * java.lang.System.in} * * @return a printable representation for this field - * @since Android 1.0 */ @Override public String toString() { diff --git a/luni-kernel/src/main/java/java/lang/reflect/Method.java b/luni-kernel/src/main/java/java/lang/reflect/Method.java index dabf9a4..6678f8c 100644 --- a/luni-kernel/src/main/java/java/lang/reflect/Method.java +++ b/luni-kernel/src/main/java/java/lang/reflect/Method.java @@ -44,8 +44,6 @@ import org.apache.harmony.luni.lang.reflect.Types; /** * This class represents a method. Information about the method can be accessed, * and the method can be invoked dynamically. - * - * @since Android 1.0 */ public final class Method extends AccessibleObject implements GenericDeclaration, Member { @@ -134,8 +132,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * the type parameters. * * @return the string representation of this method - * - * @since Android 1.0 */ public String toGenericString() { StringBuilder sb = new StringBuilder(80); @@ -194,8 +190,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @throws MalformedParameterizedTypeException * if any parameter type points to a type that cannot be * instantiated for some reason - * - * @since Android 1.0 */ public Type[] getGenericParameterTypes() { initGenericTypes(); @@ -215,8 +209,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @throws MalformedParameterizedTypeException * if any exception type points to a type that cannot be * instantiated for some reason - * - * @since Android 1.0 */ public Type[] getGenericExceptionTypes() { initGenericTypes(); @@ -235,8 +227,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @throws MalformedParameterizedTypeException * if the return type points to a type that cannot be * instantiated for some reason - * - * @since Android 1.0 */ public Type getGenericReturnType() { initGenericTypes(); @@ -270,8 +260,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * and array of empty arrays is returned. * * @return an array of arrays of {@code Annotation} instances - * - * @since Android 1.0 */ public Annotation[][] getParameterAnnotations() { Annotation[][] parameterAnnotations @@ -289,8 +277,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * Indicates whether or not this method takes a variable number argument. * * @return {@code true} if a vararg is declared, {@code false} otherwise - * - * @since Android 1.0 */ public boolean isVarArgs() { int modifiers = getMethodModifiers(declaringClass, slot); @@ -301,8 +287,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * Indicates whether or not this method is a bridge. * * @return {@code true} if this method is a bridge, {@code false} otherwise - * - * @since Android 1.0 */ public boolean isBridge() { int modifiers = getMethodModifiers(declaringClass, slot); @@ -313,8 +297,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * Indicates whether or not this method is synthetic. * * @return {@code true} if this method is synthetic, {@code false} otherwise - * - * @since Android 1.0 */ public boolean isSynthetic() { int modifiers = getMethodModifiers(declaringClass, slot); @@ -330,8 +312,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @throws TypeNotPresentException * if this annotation member is of type {@code Class} and no * definition can be found - * - * @since Android 1.0 */ public Object getDefaultValue() { return getDefaultValue(declaringClass, slot); @@ -351,8 +331,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * method, {@code false} otherwise * * @see #hashCode - * - * @since Android 1.0 */ @Override public boolean equals(Object object) { @@ -363,8 +341,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * Returns the class that declares this method. * * @return the declaring class - * - * @since Android 1.0 */ public Class<?> getDeclaringClass() { return declaringClass; @@ -375,8 +351,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * this method has no declared exceptions, an empty array is returned. * * @return the declared exception classes - * - * @since Android 1.0 */ public Class<?>[] getExceptionTypes() { if (exceptionTypes == null) { @@ -393,8 +367,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @return the modifiers for this method * * @see Modifier - * - * @since Android 1.0 */ public int getModifiers() { return getMethodModifiers(declaringClass, slot); @@ -407,8 +379,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * instance. * * @return the name of this method - * - * @since Android 1.0 */ public String getName() { return name; @@ -420,8 +390,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * empty array will be returned. * * @return the parameter types - * - * @since Android 1.0 */ public Class<?>[] getParameterTypes() { return parameterTypes.clone(); @@ -432,8 +400,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * method. * * @return the return type - * - * @since Android 1.0 */ public Class<?> getReturnType() { return returnType; @@ -447,8 +413,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * @return hash code for this method * * @see #equals - * - * @since Android 1.0 */ @Override public int hashCode() { @@ -508,8 +472,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * if an exception was thrown by the invoked method * * @see AccessibleObject - * - * @since Android 1.0 */ public Object invoke(Object receiver, Object... args) throws IllegalAccessException, IllegalArgumentException, @@ -546,8 +508,6 @@ public final class Method extends AccessibleObject implements GenericDeclaration * ,InvocationTargetException} * * @return a printable representation for this method - * - * @since Android 1.0 */ @Override public String toString() { diff --git a/luni/src/main/java/java/io/FileOutputStream.java b/luni/src/main/java/java/io/FileOutputStream.java index ac76b97..912f2f4 100644 --- a/luni/src/main/java/java/io/FileOutputStream.java +++ b/luni/src/main/java/java/io/FileOutputStream.java @@ -34,8 +34,6 @@ import org.apache.harmony.nio.FileChannelFactory; * * @see BufferedOutputStream * @see FileInputStream - * - * @since Android 1.0 */ public class FileOutputStream extends OutputStream implements Closeable { diff --git a/luni/src/main/java/java/io/PrintStream.java b/luni/src/main/java/java/io/PrintStream.java index a69deab..9e84342 100644 --- a/luni/src/main/java/java/io/PrintStream.java +++ b/luni/src/main/java/java/io/PrintStream.java @@ -588,7 +588,6 @@ public class PrintStream extends FilterOutputStream implements Appendable, * @param inum * the integer value to print to the target stream. * @see #print(String) - * @since Android 1.0 */ public void println(int inum) { println(String.valueOf(inum)); @@ -601,7 +600,6 @@ public class PrintStream extends FilterOutputStream implements Appendable, * @param lnum * the long value to print to the target stream. * @see #print(String) - * @since Android 1.0 */ public void println(long lnum) { println(String.valueOf(lnum)); @@ -614,7 +612,6 @@ public class PrintStream extends FilterOutputStream implements Appendable, * @param obj * the object to print to the target stream. * @see #print(String) - * @since Android 1.0 */ public void println(Object obj) { println(String.valueOf(obj)); @@ -632,7 +629,6 @@ public class PrintStream extends FilterOutputStream implements Appendable, * @param str * the string to print to the target stream. * @see #write(int) - * @since Android 1.0 */ public synchronized void println(String str) { print(str); diff --git a/luni/src/main/java/java/io/SerializablePermission.java b/luni/src/main/java/java/io/SerializablePermission.java index 7ff6524..8e385f0 100644 --- a/luni/src/main/java/java/io/SerializablePermission.java +++ b/luni/src/main/java/java/io/SerializablePermission.java @@ -35,8 +35,6 @@ import java.security.BasicPermission; * </table> * * @see ObjectStreamConstants - * - * @since Android 1.0 */ public final class SerializablePermission extends BasicPermission { private static final long serialVersionUID = 8537212141160296410L; @@ -50,7 +48,6 @@ public final class SerializablePermission extends BasicPermission { * * @param permissionName * the name of the new permission. - * @since Android 1.0 */ public SerializablePermission(String permissionName) { super(permissionName); @@ -64,7 +61,6 @@ public final class SerializablePermission extends BasicPermission { * the name of the new permission. * @param actions * ignored. - * @since Android 1.0 */ public SerializablePermission(String name, String actions) { super(name, actions); diff --git a/luni/src/main/java/java/io/package.html b/luni/src/main/java/java/io/package.html index c3daed5..d074aa0 100644 --- a/luni/src/main/java/java/io/package.html +++ b/luni/src/main/java/java/io/package.html @@ -10,7 +10,5 @@ unbuffered. And on top of that there are classes that help to abstract data streams as streams of chars, strings or even objects. </p> - - @since Android 1.0 </body> </html> diff --git a/luni/src/main/java/java/lang/Cloneable.java b/luni/src/main/java/java/lang/Cloneable.java index eb702f0..d67e070 100644 --- a/luni/src/main/java/java/lang/Cloneable.java +++ b/luni/src/main/java/java/lang/Cloneable.java @@ -26,7 +26,6 @@ package java.lang; * * @see Object#clone * @see CloneNotSupportedException - * @since Android 1.0 */ public interface Cloneable { // Marker interface diff --git a/luni/src/main/java/java/lang/package.html b/luni/src/main/java/java/lang/package.html index e61346f..8075edb 100644 --- a/luni/src/main/java/java/lang/package.html +++ b/luni/src/main/java/java/lang/package.html @@ -6,6 +6,5 @@ as well as several other classes which represent important data types or central aspects of the environment hosting the application. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/luni/src/main/java/java/lang/ref/package.html b/luni/src/main/java/java/lang/ref/package.html index a4b2c65..e4cd3b4 100644 --- a/luni/src/main/java/java/lang/ref/package.html +++ b/luni/src/main/java/java/lang/ref/package.html @@ -94,7 +94,5 @@ </tr> </table> </p> - - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/luni/src/main/java/java/lang/reflect/package.html b/luni/src/main/java/java/lang/reflect/package.html index 5ad5f99..ec457e2 100644 --- a/luni/src/main/java/java/lang/reflect/package.html +++ b/luni/src/main/java/java/lang/reflect/package.html @@ -11,7 +11,5 @@ reflection. The classes in this package represent the various language elements. </p> - - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/luni/src/main/java/java/net/package.html b/luni/src/main/java/java/net/package.html index b4e8b8d..dff1ccd 100644 --- a/luni/src/main/java/java/net/package.html +++ b/luni/src/main/java/java/net/package.html @@ -4,6 +4,5 @@ Provides networking-related functionality, such as streaming and datagram sockets, handling of Internet addresses, and dealing with HTTP requests. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/luni/src/main/java/java/util/ConcurrentModificationException.java b/luni/src/main/java/java/util/ConcurrentModificationException.java index 43d5a63..a9ca4e3 100644 --- a/luni/src/main/java/java/util/ConcurrentModificationException.java +++ b/luni/src/main/java/java/util/ConcurrentModificationException.java @@ -23,7 +23,6 @@ package java.util; * Collection as well. * * @see java.lang.RuntimeException - * @since Android 1.0 */ public class ConcurrentModificationException extends RuntimeException { diff --git a/luni/src/main/java/java/util/NoSuchElementException.java b/luni/src/main/java/java/util/NoSuchElementException.java index 5378e1d..4334f86 100644 --- a/luni/src/main/java/java/util/NoSuchElementException.java +++ b/luni/src/main/java/java/util/NoSuchElementException.java @@ -25,7 +25,6 @@ package java.util; * * @see Enumeration * @see java.lang.RuntimeException - * @since Android 1.0 */ public class NoSuchElementException extends RuntimeException { diff --git a/luni/src/main/java/java/util/package.html b/luni/src/main/java/java/util/package.html index 6b38357..3656147 100644 --- a/luni/src/main/java/java/util/package.html +++ b/luni/src/main/java/java/util/package.html @@ -6,6 +6,5 @@ and maps), classes for dealing with date and time, String-handling, formatting, localization, and scheduling repeated tasks. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/math/src/main/java/java/math/package.html b/math/src/main/java/java/math/package.html index f6450d0..4c9ba9f 100644 --- a/math/src/main/java/java/math/package.html +++ b/math/src/main/java/java/math/package.html @@ -8,6 +8,5 @@ The user has full control over the rounding behavior (comparable with the IEEE754R rounding modes). <p> - @since Android 1.0 </body> </html> diff --git a/nio/src/main/java/java/nio/channels/package.html b/nio/src/main/java/java/nio/channels/package.html index 7ca1a48..c16c811 100644 --- a/nio/src/main/java/java/nio/channels/package.html +++ b/nio/src/main/java/java/nio/channels/package.html @@ -5,6 +5,5 @@ files, sockets or other structures that allow input and/or output of data. Selectors support multiplexing of non-blocking channels. </p> - @since Android 1.0 </body> </html> diff --git a/nio/src/main/java/java/nio/channels/spi/package.html b/nio/src/main/java/java/nio/channels/spi/package.html index fde3d3e..e7b8a49 100644 --- a/nio/src/main/java/java/nio/channels/spi/package.html +++ b/nio/src/main/java/java/nio/channels/spi/package.html @@ -3,6 +3,5 @@ <p> Service-provider classes for nio channels. </p> - @since Android 1.0 </body> </html> diff --git a/nio/src/main/java/java/nio/package.html b/nio/src/main/java/java/nio/package.html index 46b6aaf..b521b67 100644 --- a/nio/src/main/java/java/nio/package.html +++ b/nio/src/main/java/java/nio/package.html @@ -11,6 +11,5 @@ array. Buffers also manage the position of the current element in the buffer, they can be rewound to the beginning and allow skipping of elements. </p> - @since Android 1.0 </body> </html> diff --git a/nio_char/src/main/java/java/nio/charset/package.html b/nio_char/src/main/java/java/nio/charset/package.html index 175fb71..6554010 100644 --- a/nio_char/src/main/java/java/nio/charset/package.html +++ b/nio_char/src/main/java/java/nio/charset/package.html @@ -10,6 +10,5 @@ de-/encoder pair that can be used to translate a byte stream. With the service provider package it is possible to use your own charsets. </p> - @since Android 1.0 </body> </html> diff --git a/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java b/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java index 6d5c66f..246da6a 100644 --- a/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java +++ b/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java @@ -21,8 +21,6 @@ import java.util.Iterator; /** * The service provider class for character sets. - * - * @since Android 1.0 */ public abstract class CharsetProvider { @@ -36,7 +34,6 @@ public abstract class CharsetProvider { * @throws SecurityException * if there is a security manager installed that does not permit * the runtime permission labeled "charsetProvider". - * @since Android 1.0 */ protected CharsetProvider() { SecurityManager securityManager = System.getSecurityManager(); @@ -48,7 +45,6 @@ public abstract class CharsetProvider { * Returns an iterator over all the available charsets. * * @return the iterator. - * @since Android 1.0 */ public abstract Iterator<Charset> charsets(); @@ -61,7 +57,6 @@ public abstract class CharsetProvider { * @param charsetName * the canonical or alias name of a character set. * @return the charset, or <code>null</code> if unavailable. - * @since Android 1.0 */ public abstract Charset charsetForName(String charsetName); } diff --git a/nio_char/src/main/java/java/nio/charset/spi/package.html b/nio_char/src/main/java/java/nio/charset/spi/package.html index f7d9d2b..4e58391 100644 --- a/nio_char/src/main/java/java/nio/charset/spi/package.html +++ b/nio_char/src/main/java/java/nio/charset/spi/package.html @@ -3,6 +3,5 @@ <p> Service-provider class for nio charset. </p> - @since Android 1.0 </body> </html> diff --git a/prefs/src/main/java/java/util/prefs/NodeSet.java b/prefs/src/main/java/java/util/prefs/NodeSet.java index 7edd030..202b90b 100644 --- a/prefs/src/main/java/java/util/prefs/NodeSet.java +++ b/prefs/src/main/java/java/util/prefs/NodeSet.java @@ -6,10 +6,6 @@ import org.w3c.dom.NodeList; import java.util.ArrayList; import java.util.Iterator; -/** - * - * @since Android 1.0 - */ class NodeSet implements NodeList { ArrayList<Node> list = new ArrayList<Node>(); diff --git a/prefs/src/main/java/java/util/prefs/package.html b/prefs/src/main/java/java/util/prefs/package.html index 8a3dd33..41cd12c 100644 --- a/prefs/src/main/java/java/util/prefs/package.html +++ b/prefs/src/main/java/java/util/prefs/package.html @@ -9,6 +9,5 @@ on the operating system, this package is designed to allow the installation of a custom service provider implementation. </p> - @since Android 1.0 </body> </html> diff --git a/regex/src/main/java/java/util/regex/Pattern.java b/regex/src/main/java/java/util/regex/Pattern.java index 26c74f8..c366732 100644 --- a/regex/src/main/java/java/util/regex/Pattern.java +++ b/regex/src/main/java/java/util/regex/Pattern.java @@ -52,7 +52,6 @@ import com.ibm.icu4jni.regex.NativeRegEx; * Android-specific implementation details. * * @see Matcher - * @since Android 1.0 */ public final class Pattern implements Serializable { diff --git a/regex/src/main/java/java/util/regex/package.html b/regex/src/main/java/java/util/regex/package.html index 0508f3e..3ce73eb 100644 --- a/regex/src/main/java/java/util/regex/package.html +++ b/regex/src/main/java/java/util/regex/package.html @@ -622,7 +622,7 @@ {n} </td> <td> - Match exactly n times + Match exactly n times. </td> </tr> <tr> @@ -680,7 +680,7 @@ </td> <td> Match at least n times, but no more than required for an - overall pattern match + overall pattern match. </td> </tr> <tr> @@ -877,8 +877,5 @@ all (throws an exception). </li> </ul> - - @since Android 1.0 - </body> </html> diff --git a/security-kernel/src/main/java/java/security/AccessControlContext.java b/security-kernel/src/main/java/java/security/AccessControlContext.java index 597cc44..8efdb27 100644 --- a/security-kernel/src/main/java/java/security/AccessControlContext.java +++ b/security-kernel/src/main/java/java/security/AccessControlContext.java @@ -73,7 +73,6 @@ public final class AccessControlContext { * not have permission to invoke this constructor * @throws NullPointerException * if {@code acc} is {@code null} - * @since Android 1.0 */ public AccessControlContext(AccessControlContext acc, DomainCombiner combiner) { @@ -96,7 +95,6 @@ public final class AccessControlContext { * checks in the context of this {@code AccessControlContext} * @throws NullPointerException * if {@code context} is {@code null} - * @since Android 1.0 */ public AccessControlContext(ProtectionDomain[] context) { if (context == null) { @@ -185,7 +183,6 @@ public final class AccessControlContext { * @throws NullPointerException * if the specified permission is {@code null} * @see AccessController#checkPermission(Permission) - * @since Android 1.0 */ public void checkPermission(Permission perm) throws AccessControlException { if (perm == null) { @@ -215,7 +212,6 @@ public final class AccessControlContext { * AccessControlContext} * @return {@code true} if the specified object is equal to this {@code * AccessControlContext}, otherwise {@code false} - * @since Android 1.0 */ @Override public boolean equals(Object obj) { @@ -251,7 +247,6 @@ public final class AccessControlContext { * @throws SecurityException * if a {@code SecurityManager} is installed and the caller does * not have permission to invoke this method - * @since Android 1.0 */ public DomainCombiner getDomainCombiner() { SecurityManager sm = System.getSecurityManager(); @@ -271,7 +266,6 @@ public final class AccessControlContext { * @return the hash code value for this {@code AccessControlContext} * @see Object#equals(Object) * @see AccessControlContext#equals(Object) - * @since Android 1.0 */ public int hashCode() { int hash = 0; diff --git a/security-kernel/src/main/java/java/security/AccessController.java b/security-kernel/src/main/java/java/security/AccessController.java index 5c5bc26..b27ab53 100644 --- a/security-kernel/src/main/java/java/security/AccessController.java +++ b/security-kernel/src/main/java/java/security/AccessController.java @@ -75,7 +75,6 @@ public final class AccessController { * @return the result of executing the privileged action * @throws NullPointerException * if the specified action is {@code null} - * @since Android 1.0 */ public static <T> T doPrivileged(PrivilegedAction<T> action) { if (action == null) { @@ -103,7 +102,6 @@ public final class AccessController { * @return the result of executing the privileged action * @throws NullPointerException * if the specified action is {@code null} - * @since Android 1.0 */ public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContext context) { @@ -134,7 +132,6 @@ public final class AccessController { * if the action's run method throws any checked exception * @throws NullPointerException * if the specified action is {@code null} - * @since Android 1.0 */ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action) throws PrivilegedActionException { @@ -168,7 +165,6 @@ public final class AccessController { * if the action's run method throws any checked exception * @throws NullPointerException * if the specified action is {@code null} - * @since Android 1.0 */ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action, AccessControlContext context) throws PrivilegedActionException { @@ -297,7 +293,6 @@ public final class AccessController { * if the specified permission is {@code null} * @see AccessControlContext#checkPermission(Permission) * - * @since Android 1.0 */ public static void checkPermission(Permission perm) throws AccessControlException { @@ -327,7 +322,6 @@ public final class AccessController { * * @return the {@code AccessControlContext} for the current {@code Thread} * @see Thread#currentThread - * @since Android 1.0 */ public static AccessControlContext getContext() { diff --git a/security/src/main/java/java/security/MessageDigest.java b/security/src/main/java/java/security/MessageDigest.java index cb8fc08..6996054 100644 --- a/security/src/main/java/java/security/MessageDigest.java +++ b/security/src/main/java/java/security/MessageDigest.java @@ -170,7 +170,6 @@ public abstract class MessageDigest extends MessageDigestSpi { * @param arg0 * the {@code byte} to update this {@code MessageDigest} with * @see #reset() - * @since Android 1.0 */ public void update(byte arg0) { engineUpdate(arg0); @@ -222,7 +221,6 @@ public abstract class MessageDigest extends MessageDigestSpi { * * @return the computed one way hash value * @see #reset - * @since Android 1.0 */ public byte[] digest() { return engineDigest(); diff --git a/security/src/main/java/java/security/acl/package.html b/security/src/main/java/java/security/acl/package.html index 3102fc2..b8ec061 100644 --- a/security/src/main/java/java/security/acl/package.html +++ b/security/src/main/java/java/security/acl/package.html @@ -10,6 +10,5 @@ Functionality for generating new entries in an ACL {@link java.security.acl.AclE for the creation of new owners {@link java.security.acl.Owner}, and for the registration of new permissions {@link java.security.acl.Permission} are provided. </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/cert/package.html b/security/src/main/java/java/security/cert/package.html index e3cc92b..e39b38f 100644 --- a/security/src/main/java/java/security/cert/package.html +++ b/security/src/main/java/java/security/cert/package.html @@ -18,6 +18,5 @@ Exception are generated mainly for three reasons:<br> </p><p> The functionality to check the different entries and extension fields of X.509 certificates are also provided. </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/interfaces/package.html b/security/src/main/java/java/security/interfaces/package.html index 6f14de1..dd24196 100644 --- a/security/src/main/java/java/security/interfaces/package.html +++ b/security/src/main/java/java/security/interfaces/package.html @@ -10,6 +10,5 @@ This package provides the interfaces needed to generate: (2) Keys for the Digital Signature Algorithm (DSA) specified by FIPS-186; (3) Keys for a generic Elliptic Curve asymmetric encryption algorithm. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/security/src/main/java/java/security/package.html b/security/src/main/java/java/security/package.html index b4f450e..4c5e2b4 100644 --- a/security/src/main/java/java/security/package.html +++ b/security/src/main/java/java/security/package.html @@ -31,6 +31,5 @@ be divided into two parts: implemented. </ul> </p> -@since Android 1.0 </body> </html> diff --git a/security/src/main/java/java/security/spec/package.html b/security/src/main/java/java/security/spec/package.html index 1a1a8e0..d75aee6 100644 --- a/security/src/main/java/java/security/spec/package.html +++ b/security/src/main/java/java/security/spec/package.html @@ -14,6 +14,5 @@ Keys may be specified via algorithm or in a more abstract and general way with A The parameters for the Elliptic Curve (EC) encryption algorithm are only specified as input parameters to the relevant EC-generator. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/security/src/main/java/javax/security/cert/package.html b/security/src/main/java/javax/security/cert/package.html index a58f1de..792b446 100644 --- a/security/src/main/java/javax/security/cert/package.html +++ b/security/src/main/java/javax/security/cert/package.html @@ -10,6 +10,5 @@ version of the java.security.cert package that was previously used by JSSE (Java All applications that do not have to be compatible with older versions of JSSE (that is before Java SDK 1.5) should only use java.security.cert. </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/sql/src/main/java/javax/sql/package.html b/sql/src/main/java/javax/sql/package.html index 6c9500f..7fdf1ce 100644 --- a/sql/src/main/java/javax/sql/package.html +++ b/sql/src/main/java/javax/sql/package.html @@ -4,6 +4,5 @@ Provides extensions to the standard interface for accessing SQL-based databases. <p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/text/src/main/java/java/text/package.html b/text/src/main/java/java/text/package.html index 2bcd8f9..b3f387a 100644 --- a/text/src/main/java/java/text/package.html +++ b/text/src/main/java/java/text/package.html @@ -1,17 +1,16 @@ <html> <body> <p> - The java.text package allows to uncouple the text in an application - from natural languages. + The java.text package offers internationalization and localization + facilities. </p> <p> By using the classes in this package, it is possible to write the - application in an unlocalized way. The benefit of this is that a new + application in an internationalized way. The benefit of this is that a new localization can be provided at any time without having to change the code. Support for localization is given for numbers, messages, dates and other characteristics of a language like the directionality, sorting order or enumeration of characters, words or lines. </p> - @since Android 1.0 </body> </html> diff --git a/x-net/src/main/java/javax/net/package.html b/x-net/src/main/java/javax/net/package.html index 27ba790..5674d06 100644 --- a/x-net/src/main/java/javax/net/package.html +++ b/x-net/src/main/java/javax/net/package.html @@ -3,14 +3,5 @@ <p> This package provides factory classes to create sockets and server-sockets. This classes can be subclassed to create factories for other kinds of socket for example the SSL-capable sockets from the package javax.net.ssl. </p> - @since Android 1.0 - </body> -</html> -<html> - <body> - <p> - This package provides factory classes to create sockets and server-sockets. This classes can be subclassed to create factories for other kinds of socket for example the SSL-capable sockets from the package javax.net.ssl. - </p> - @since Android 1.0 </body> </html> diff --git a/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java b/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java index 6620841..3e58897 100644 --- a/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java +++ b/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java @@ -24,8 +24,6 @@ import java.net.SocketException; /** * Default inoperative implementation of javax.net.ssl.SSLServerSocketFactory - * - * @since Android 1.0 */ class DefaultSSLServerSocketFactory extends SSLServerSocketFactory { diff --git a/x-net/src/main/java/javax/net/ssl/package.html b/x-net/src/main/java/javax/net/ssl/package.html index 3e6448e..14753c8 100644 --- a/x-net/src/main/java/javax/net/ssl/package.html +++ b/x-net/src/main/java/javax/net/ssl/package.html @@ -5,7 +5,7 @@ <html> <body> <p> -This package provides all the classes and interfaces needed to implemenet and program the Secure Socket +This package provides all the classes and interfaces needed to implement and program the Secure Socket abstraction based on the SSL protocol SSSLv3.0 or TLSv1.2. All the details of the SSL handshake protocol are accounted for, and a client or a server can specify the cipher set to use. @@ -13,14 +13,8 @@ set to use. X.509 certificates are verified, and, if desired, the client and the server each have the option of verifying the entire certificate chain until the root Certificate Authority is reached. -Notice that the Android javax.net.ssl package uses the OpenSSL Library to implement the low level -SSL functionality. All the relevant OpenSSl write(...) and read(...) functions are hidden within two -JNI files. The signatures of all the Java SSL methods are compliant with the Java 5.0 -specification. - -The provider for all SSL cryptological tools is The Legion of Bouncy Castle (http://www.bouncycastle.org). +Android uses code from The Legion of the Bouncy Castle (http://www.bouncycastle.org) and OpenSSL (http://openssl.org). </p> -@since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java b/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java index c39e3ff..34942e1 100644 --- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java +++ b/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java @@ -73,8 +73,6 @@ public class SSLContextImpl extends SSLContextSpi { * @param clientCache persistent client session cache or {@code null} * @param serverCache persistent server session cache or {@code null} * @throws KeyManagementException if initializing this instance fails - * - * @since Android 1.1 */ public void engineInit(KeyManager[] kms, TrustManager[] tms, SecureRandom sr, SSLClientSessionCache clientCache, @@ -126,4 +124,4 @@ public class SSLContextImpl extends SSLContextSpi { public ClientSessionContext engineGetClientSessionContext() { return clientSessionContext; } -}
\ No newline at end of file +} diff --git a/xml/src/main/java/javax/xml/package.html b/xml/src/main/java/javax/xml/package.html index 5a4621d..f3d8318 100644 --- a/xml/src/main/java/javax/xml/package.html +++ b/xml/src/main/java/javax/xml/package.html @@ -3,6 +3,5 @@ <p> Provides a utility class with useful XML constants. </p> - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/xml/src/main/java/org/w3c/dom/package.html b/xml/src/main/java/org/w3c/dom/package.html index 8189944..15f8ff6 100644 --- a/xml/src/main/java/org/w3c/dom/package.html +++ b/xml/src/main/java/org/w3c/dom/package.html @@ -6,7 +6,5 @@ {@link javax.xml.parsers.DocumentBuilder} are accessed and manipulated through these interfaces. </p> - - @since Android 1.0 </body> -</html>
\ No newline at end of file +</html> diff --git a/xml/src/main/java/org/xml/sax/ext/package.html b/xml/src/main/java/org/xml/sax/ext/package.html index 9b79d77..e443df4 100644 --- a/xml/src/main/java/org/xml/sax/ext/package.html +++ b/xml/src/main/java/org/xml/sax/ext/package.html @@ -43,6 +43,4 @@ be recognized directly by parsers, however. As an example, most validation systems can be cleanly layered on top of parsers supporting the standardized SAX2 interfaces. </p> -@since Android 1.0 - </BODY></HTML> diff --git a/xml/src/main/java/org/xml/sax/helpers/package.html b/xml/src/main/java/org/xml/sax/helpers/package.html index 3a265fd..8f323c0 100644 --- a/xml/src/main/java/org/xml/sax/helpers/package.html +++ b/xml/src/main/java/org/xml/sax/helpers/package.html @@ -8,6 +8,4 @@ support for bootstrapping SAX-based applications. <p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> for more information about SAX.</p> -@since Android 1.0 - </BODY></HTML> diff --git a/xml/src/main/java/org/xml/sax/package.html b/xml/src/main/java/org/xml/sax/package.html index fbe7108..7d7f257 100644 --- a/xml/src/main/java/org/xml/sax/package.html +++ b/xml/src/main/java/org/xml/sax/package.html @@ -294,6 +294,4 @@ the standard property URIs have the prefix XMLReader implementations need not support them. </p> -@since Android 1.0 - -</body></html>
\ No newline at end of file +</body></html> |