diff options
Diffstat (limited to 'dalvik')
26 files changed, 27 insertions, 70 deletions
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/Opcodes.java b/dalvik/src/main/java/dalvik/bytecode/Opcodes.java index 33795ba..845ace2 100644 --- a/dalvik/src/main/java/dalvik/bytecode/Opcodes.java +++ b/dalvik/src/main/java/dalvik/bytecode/Opcodes.java @@ -273,13 +273,18 @@ public interface Opcodes { int OP_SHR_INT_LIT8 = 0xe1; int OP_USHR_INT_LIT8 = 0xe2; - /* e3-eb unused */ + /* e3-e7 unused */ /* * The rest of these are either generated by dexopt for optimized * code, or inserted by the VM at runtime. They are never generated * by "dx". */ + int OP_IGET_WIDE_VOLATILE = 0xe8; + int OP_IPUT_WIDE_VOLATILE = 0xe9; + int OP_SGET_WIDE_VOLATILE = 0xea; + int OP_SPUT_WIDE_VOLATILE = 0xeb; + int OP_BREAKPOINT = 0xec; int OP_THROW_VERIFICATION_ERROR = 0xed; 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/AllocationLimitError.java b/dalvik/src/main/java/dalvik/system/AllocationLimitError.java index 9118199..e1417e2 100644 --- a/dalvik/src/main/java/dalvik/system/AllocationLimitError.java +++ b/dalvik/src/main/java/dalvik/system/AllocationLimitError.java @@ -19,8 +19,7 @@ package dalvik.system; /** * Is thrown when an allocation limit is exceeded. * - * @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. + * @hide */ public class AllocationLimitError extends VirtualMachineError { /** diff --git a/dalvik/src/main/java/dalvik/system/DexClassLoader.java b/dalvik/src/main/java/dalvik/system/DexClassLoader.java index 4a440b5..d4ccfed 100644 --- a/dalvik/src/main/java/dalvik/system/DexClassLoader.java +++ b/dalvik/src/main/java/dalvik/system/DexClassLoader.java @@ -235,7 +235,6 @@ public class DexClassLoader extends ClassLoader { System.out.println("DexClassLoader " + this + ": findClass '" + name + "'"); - byte[] data = null; int length = mFiles.length; for (int i = 0; i < length; i++) { 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/PotentialDeadlockError.java b/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java index 938a5cd..70f5fc0 100644 --- a/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java +++ b/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java @@ -19,8 +19,7 @@ package dalvik.system; /** * Is thrown when the VM identifies a potential deadlock. * - * @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. + * @hide */ public class PotentialDeadlockError extends VirtualMachineError { /** diff --git a/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java b/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java index ffde7cb..22f8668 100644 --- a/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java +++ b/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java @@ -20,8 +20,7 @@ package dalvik.system; * Is thrown when the VM determines that a DEX file's cache is out of date, and * that there is no way to recreate it. * - * @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. + * @hide */ public class StaleDexCacheError extends VirtualMachineError { /** diff --git a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java index 0e26a70..e05292e 100644 --- a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java +++ b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java @@ -26,8 +26,7 @@ import java.util.logging.Logger; * startup, as a reasonably easy way to get the standard property * <code>java.io.tmpdir</code> to point at something useful. * - * @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. + * @hide */ public class TemporaryDirectory { /** system property name for the temporary directory */ diff --git a/dalvik/src/main/java/dalvik/system/TouchDex.java b/dalvik/src/main/java/dalvik/system/TouchDex.java index 04c6546..aca0fd3 100644 --- a/dalvik/src/main/java/dalvik/system/TouchDex.java +++ b/dalvik/src/main/java/dalvik/system/TouchDex.java @@ -25,8 +25,7 @@ import java.io.FilenameFilter; /** * Induces optimization/verification of a set of DEX files. * - * @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. + * @hide */ public class TouchDex { diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java index 31e82ec..118d4a6 100644 --- a/dalvik/src/main/java/dalvik/system/VMDebug.java +++ b/dalvik/src/main/java/dalvik/system/VMDebug.java @@ -28,8 +28,7 @@ import java.io.IOException; * * @cts Please complete the spec. * - * @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. + * @hide */ public final class VMDebug { /** diff --git a/dalvik/src/main/java/dalvik/system/VMRuntime.java b/dalvik/src/main/java/dalvik/system/VMRuntime.java index e05e489..0d0747b 100644 --- a/dalvik/src/main/java/dalvik/system/VMRuntime.java +++ b/dalvik/src/main/java/dalvik/system/VMRuntime.java @@ -21,10 +21,7 @@ package dalvik.system; * An application cannot create its own Runtime instance, and must obtain * one from the getRuntime method. * - * @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 + * @hide */ public final class VMRuntime { @@ -162,6 +159,7 @@ public final class VMRuntime { * @return true if the VM thinks there's enough process memory * to satisfy this request, or false if not. */ + @Deprecated public native boolean trackExternalAllocation(long size); /** @@ -177,6 +175,7 @@ public final class VMRuntime { * should have been passed to trackExternalAlloc() when * the underlying memory was originally allocated. */ + @Deprecated public native void trackExternalFree(long size); /** @@ -185,6 +184,7 @@ public final class VMRuntime { * * @return the number of bytes */ + @Deprecated public native long getExternalBytesAllocated(); /** diff --git a/dalvik/src/main/java/dalvik/system/VMStack.java b/dalvik/src/main/java/dalvik/system/VMStack.java index b049962..e9d5765 100644 --- a/dalvik/src/main/java/dalvik/system/VMStack.java +++ b/dalvik/src/main/java/dalvik/system/VMStack.java @@ -20,8 +20,7 @@ package dalvik.system; * Provides a limited interface to the Dalvik VM stack. This class is mostly * used for implementing security checks. * - * @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. + * @hide */ public final class VMStack { /** diff --git a/dalvik/src/main/java/dalvik/system/Zygote.java b/dalvik/src/main/java/dalvik/system/Zygote.java index 641e856..21eee3d 100644 --- a/dalvik/src/main/java/dalvik/system/Zygote.java +++ b/dalvik/src/main/java/dalvik/system/Zygote.java @@ -21,8 +21,7 @@ package dalvik.system; * be partially initialized and then fork()'d from the partially initialized * state. * - * @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. + * @hide */ public class Zygote { /* 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/dalvik/src/main/native/dalvik_system_TouchDex.cpp b/dalvik/src/main/native/dalvik_system_TouchDex.cpp index e8b834b..b2614c9 100644 --- a/dalvik/src/main/native/dalvik_system_TouchDex.cpp +++ b/dalvik/src/main/native/dalvik_system_TouchDex.cpp @@ -259,20 +259,12 @@ static void logProcStatus(pid_t pid) fclose(fp); } -/* - * JNI registration. - */ static JNINativeMethod gMethods[] = { - /* name, signature, funcPtr */ { "trampoline", "(Ljava/lang/String;Ljava/lang/String;)I", (void*) dalvik_system_TouchDex_trampoline }, }; - -extern "C" int register_dalvik_system_TouchDex(JNIEnv* env) -{ - return jniRegisterNativeMethods(env, JAVA_PACKAGE "/TouchDex", - gMethods, NELEM(gMethods)); +int register_dalvik_system_TouchDex(JNIEnv* env) { + return jniRegisterNativeMethods(env, JAVA_PACKAGE "/TouchDex", gMethods, NELEM(gMethods)); } }; // namespace android - diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c index 25235dc..9aa0a8e 100644 --- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c +++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.c @@ -50,11 +50,7 @@ static void emptyJniStaticMethod6L(JNIEnv* env, jclass clazz, // This space intentionally left blank. } -/* - * JNI registration - */ static JNINativeMethod gMethods[] = { - /* name, signature, funcPtr */ { "emptyJniStaticMethod0", "()V", emptyJniStaticMethod0 }, { "emptyJniStaticMethod6", "(IIIIII)V", emptyJniStaticMethod6 }, { "emptyJniStaticMethod6L", @@ -62,9 +58,7 @@ static JNINativeMethod gMethods[] = { "Ljava/lang/Object;[Ljava/lang/Object;[[[[Ljava/lang/Object;)V", emptyJniStaticMethod6L }, }; - -int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env) -{ +int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env) { int result = jniRegisterNativeMethods(env, "org/apache/harmony/dalvik/NativeTestTarget", gMethods, NELEM(gMethods)); @@ -75,4 +69,3 @@ int register_org_apache_harmony_dalvik_NativeTestTarget(JNIEnv* env) } return 0; } - |