diff options
Diffstat (limited to 'dalvik/src')
26 files changed, 101 insertions, 101 deletions
diff --git a/dalvik/src/main/java/dalvik/annotation/AndroidOnly.java b/dalvik/src/main/java/dalvik/annotation/AndroidOnly.java index d55991b..da3c1c5 100644 --- a/dalvik/src/main/java/dalvik/annotation/AndroidOnly.java +++ b/dalvik/src/main/java/dalvik/annotation/AndroidOnly.java @@ -24,7 +24,7 @@ import java.lang.annotation.Target; /** * Marks a test-case as Android-only, that is, it should not be executed on * other systems. - * + * * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/BrokenTest.java b/dalvik/src/main/java/dalvik/annotation/BrokenTest.java index 961de41..401d652 100644 --- a/dalvik/src/main/java/dalvik/annotation/BrokenTest.java +++ b/dalvik/src/main/java/dalvik/annotation/BrokenTest.java @@ -23,7 +23,7 @@ import java.lang.annotation.Target; /** * Marks a test case as broken. This means the test case should be fixed. - * + * * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/HostController.java b/dalvik/src/main/java/dalvik/annotation/HostController.java index c6e0bff..749dc62 100644 --- a/dalvik/src/main/java/dalvik/annotation/HostController.java +++ b/dalvik/src/main/java/dalvik/annotation/HostController.java @@ -29,9 +29,9 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) public @interface HostController { - + /** * The host controller method name. */ - String name() default ""; + String name() default ""; } diff --git a/dalvik/src/main/java/dalvik/annotation/KnownFailure.java b/dalvik/src/main/java/dalvik/annotation/KnownFailure.java index f5040bb..11e813d 100644 --- a/dalvik/src/main/java/dalvik/annotation/KnownFailure.java +++ b/dalvik/src/main/java/dalvik/annotation/KnownFailure.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; * Marks a test case as a known failure. This means the underlying * implementation should be fixed. Seems to be similar to @code{@ToBeFixed}, so * maybe the two can be merged at some point. - * + * * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/SideEffect.java b/dalvik/src/main/java/dalvik/annotation/SideEffect.java index 2688a17..b92e9bc 100644 --- a/dalvik/src/main/java/dalvik/annotation/SideEffect.java +++ b/dalvik/src/main/java/dalvik/annotation/SideEffect.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; * Marks a test-case as either having a side-effect that other tests might * notice or suffering from such a side effect. Such tests should be run in an * isolated manner. - * + * * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/TestInfo.java b/dalvik/src/main/java/dalvik/annotation/TestInfo.java index 876e0bf..4126fcc 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestInfo.java +++ b/dalvik/src/main/java/dalvik/annotation/TestInfo.java @@ -24,13 +24,13 @@ import java.lang.annotation.Target; /** * Defines an annotation for test methods that allow, among other things, to * link the test to the method that is being tested. - * + * * {@hide} */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) public @interface TestInfo { - + /** * Specifies the current status of the test, as determined by a reviewer. */ @@ -41,16 +41,16 @@ public @interface TestInfo { * it is testing a specific parameter combination or something. */ String notes() default ""; - + /** * Specifies the current level of coverage the test has. */ TestLevel level() default TestLevel.PARTIAL; /** - * Specifies the purpose (either if it is noteworth to mention such as if + * Specifies the purpose (either if it is noteworth to mention such as if * it is testing a specific parameter combination) or the covered test - * aspects (exceptions, normal cases, border edge cases, etc.) in + * aspects (exceptions, normal cases, border edge cases, etc.) in * case the level is Level.PARTIAL */ String purpose() default ""; @@ -59,5 +59,5 @@ public @interface TestInfo { * Specifies an array of target methods. */ TestTarget[] targets(); - + } diff --git a/dalvik/src/main/java/dalvik/annotation/TestLevel.java b/dalvik/src/main/java/dalvik/annotation/TestLevel.java index 9d2c6e7..f62ea2f 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestLevel.java +++ b/dalvik/src/main/java/dalvik/annotation/TestLevel.java @@ -18,16 +18,16 @@ package dalvik.annotation; /** * Defines an enumeration of possible states a test case can be in. - * + * * @hide */ public enum TestLevel { - + /** * Indicates that a test method completely tests its target API method. - */ + */ COMPLETE, - + /** * Indicates that a test method partially tests its target API method and * that together with all other {@code PARTIAL_COMPLETE} tests for the same @@ -39,15 +39,15 @@ public enum TestLevel { * Just for compatibility purposes, will be removed later. */ PARTIAL_OK, - + /** * Indicates that a test method partially tests its target API method. It * needs a second review phase to find out if the sum of all partial tests * is sufficient for completely testing the target API method. If yes, the * level has to be changed to {@code PARTIAL_COMPLETE}. */ - PARTIAL, - + PARTIAL, + /** * Indicates that a test method is known to not completely test an API * method but the missing test steps are too complex and costly to @@ -55,31 +55,31 @@ public enum TestLevel { * and {@code COMPLETE}. */ SUFFICIENT, - + /** * Indicates that a test method provides additional testing for an API - * method for which there already exists one {@code COMPLETE} or a set of + * method for which there already exists one {@code COMPLETE} or a set of * {@code PARTIAL_COMPLETE} tests. This level may also be used for test - * methods that test a concept which can not be directly attributed to + * methods that test a concept which can not be directly attributed to * the specification of an API method or class. */ - ADDITIONAL, - + ADDITIONAL, + /** * Indicates that there is nothing to test in an API method, for example if * the specification states that a method does nothing. */ NOT_NECESSARY, - + /** * Indicates that it is very hard or impossible to test an API method. */ NOT_FEASIBLE, - + /** * Indicates that the tests is either insufficient or wrong. Something needs * to be done about it. */ TODO, - + } diff --git a/dalvik/src/main/java/dalvik/annotation/TestStatus.java b/dalvik/src/main/java/dalvik/annotation/TestStatus.java index d5aad12..fc7a920 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestStatus.java +++ b/dalvik/src/main/java/dalvik/annotation/TestStatus.java @@ -23,22 +23,22 @@ package dalvik.annotation; * */ public enum TestStatus { - + /** * Status is "to be reviewed", which is the initial state when a test method * has been annotated. - */ + */ TBR, - + /** * Status is "to do", meaning a reviewer has determined that additional work * is needed. */ - TODO, - + TODO, + /** * Status is "looks good to me", meaning the test is okay. */ - LGTM - + LGTM + } diff --git a/dalvik/src/main/java/dalvik/annotation/TestTarget.java b/dalvik/src/main/java/dalvik/annotation/TestTarget.java index 9912312..158698d 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTarget.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTarget.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.ANNOTATION_TYPE }) public @interface TestTarget { - + /** * Specifies the name of the method that is being tested. */ @@ -46,7 +46,7 @@ public @interface TestTarget { * ...), ... */ String conceptName() default ""; - + /** * Specifies the signature of the method that is being tested, in terms of * Java classes. diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java index c79b0f1..7d0f638 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java @@ -32,12 +32,12 @@ import dalvik.annotation.TestTargetNew; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) public @interface TestTargetClass { - + /** * Specifies the class being tested. */ Class<?> value(); - + /** * Option to specify untested methods for the class. * @hide diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java b/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java index 507c041..80aebee 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargetNew.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD }) public @interface TestTargetNew { - + /** * Specifies the name of the API method that is being tested. This field * may be left empty if the test target is a concept implemented in a @@ -50,12 +50,12 @@ public @interface TestTargetNew { * test progress doclet. */ Class<?> clazz() default void.class; - + /** * Specifies the level of coverage the tested API method has. */ TestLevel level(); - + /** * Specifies noteworthy plain-text information about the test, for example * if something is NOT covered by the test method. diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargets.java b/dalvik/src/main/java/dalvik/annotation/TestTargets.java index 8552717..8358561 100644 --- a/dalvik/src/main/java/dalvik/annotation/TestTargets.java +++ b/dalvik/src/main/java/dalvik/annotation/TestTargets.java @@ -33,7 +33,7 @@ import dalvik.annotation.TestTargetNew; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD }) public @interface TestTargets { - + /** * Specifies the API methods that are tested by the annotated test method. */ diff --git a/dalvik/src/main/java/dalvik/annotation/Timeout.java b/dalvik/src/main/java/dalvik/annotation/Timeout.java index 74c8d10..1a779ac 100644 --- a/dalvik/src/main/java/dalvik/annotation/Timeout.java +++ b/dalvik/src/main/java/dalvik/annotation/Timeout.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; * Defines an annotation to be used for specifying a test timeout. A test * harness that supports timeouts should allow a test to be run for at least * this time before killing it. Time is measured in seconds. - * + * * @hide */ @Retention(RetentionPolicy.RUNTIME) diff --git a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java b/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java index ff9cf35..5e57f1c 100644 --- a/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java +++ b/dalvik/src/main/java/dalvik/annotation/VirtualTestTarget.java @@ -42,14 +42,14 @@ import java.lang.annotation.Target; * is not known, we need to be able to indicate that such a class exists and * that it must be tested. This is done by defining corresponding classes and * annotating them with {@code @VirtualTestTarget}. This class can then be - * used in the {@code @TestTargetClass} annotation with which we annotate + * used in the {@code @TestTargetClass} annotation with which we annotate * {@code TestCase} subclasses. * @hide */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) public @interface VirtualTestTarget { - + /** * Field for comments. */ diff --git a/dalvik/src/main/java/dalvik/bytecode/Opcodes.java b/dalvik/src/main/java/dalvik/bytecode/Opcodes.java index 845ace2..a6f053a 100644 --- a/dalvik/src/main/java/dalvik/bytecode/Opcodes.java +++ b/dalvik/src/main/java/dalvik/bytecode/Opcodes.java @@ -66,7 +66,7 @@ public interface Opcodes { int OP_NEW_INSTANCE = 0x22; int OP_NEW_ARRAY = 0x23; - + int OP_FILLED_NEW_ARRAY = 0x24; int OP_FILLED_NEW_ARRAY_RANGE = 0x25; int OP_FILL_ARRAY_DATA = 0x26; @@ -77,7 +77,7 @@ public interface Opcodes { int OP_GOTO_32 = 0x2a; int OP_PACKED_SWITCH = 0x2b; int OP_SPARSE_SWITCH = 0x2c; - + int OP_CMPL_FLOAT = 0x2d; int OP_CMPG_FLOAT = 0x2e; int OP_CMPL_DOUBLE = 0x2f; @@ -151,7 +151,7 @@ public interface Opcodes { int OP_INVOKE_INTERFACE = 0x72; /* 73 unused */ - + int OP_INVOKE_VIRTUAL_RANGE = 0x74; int OP_INVOKE_SUPER_RANGE = 0x75; int OP_INVOKE_DIRECT_RANGE = 0x76; diff --git a/dalvik/src/main/java/dalvik/system/AllocationLimitError.java b/dalvik/src/main/java/dalvik/system/AllocationLimitError.java index e1417e2..b3f8947 100644 --- a/dalvik/src/main/java/dalvik/system/AllocationLimitError.java +++ b/dalvik/src/main/java/dalvik/system/AllocationLimitError.java @@ -31,7 +31,7 @@ public class AllocationLimitError extends VirtualMachineError { /** * Creates a new exception instance and initializes it with a given message. - * + * * @param detailMessage the error message */ public AllocationLimitError(String detailMessage) { diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java index 7beddbb..8f9aec7 100644 --- a/dalvik/src/main/java/dalvik/system/DexFile.java +++ b/dalvik/src/main/java/dalvik/system/DexFile.java @@ -43,10 +43,10 @@ public final class DexFile { * 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 * in its original (pre-dexopt) state. - * + * * @param file * the File object referencing the actual DEX file - * + * * @throws IOException * if an I/O error occurs, such as the file not being found or * access rights missing for opening it @@ -64,10 +64,10 @@ public final class DexFile { * 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 * in its original (pre-dexopt) state. - * + * * @param fileName * the filename of the DEX file - * + * * @throws IOException * if an I/O error occurs, such as the file not being found or * access rights missing for opening it @@ -144,7 +144,7 @@ public final class DexFile { /** * Gets the name of the (already opened) DEX file. - * + * * @return the file name */ public String getName() { @@ -156,11 +156,11 @@ public final class DexFile { * <p> * This may not be able to release any resources. If classes have been * loaded, the underlying storage can't be discarded. - * + * * @throws IOException * if an I/O error occurs during closing the file, which * normally should not happen - * + * * @cts Second sentence is a bit cryptic. */ public void close() throws IOException { @@ -178,17 +178,17 @@ public final class DexFile { * isn't found because it isn't feasible to throw exceptions wildly every * time a class is not found in the first DEX file we look at. It will * throw exceptions for other failures, though. - * + * * @param name * the class name, which should look like "java/lang/String" - * + * * @param loader * the class loader that tries to load the class (in most cases * the caller of the method - * + * * @return the {@link Class} object representing the class, or {@code null} * if the class cannot be loaded - * + * * @cts Exception comment is a bit cryptic. What exception will be thrown? */ public Class loadClass(String name, ClassLoader loader) { @@ -214,7 +214,7 @@ public final class DexFile { /** * Enumerate the names of the classes in this DEX file. - * + * * @return an enumeration of names of classes contained in the DEX file, in * the usual internal form (like "java/lang/String"). */ @@ -246,9 +246,9 @@ public final class DexFile { /* return a String array with class names */ native private static String[] getClassNameList(int cookie); - /** + /** * Called when the class is finalized. Makes sure the DEX file is closed. - * + * * @throws IOException * if an I/O error occurs during closing the file, which * normally should not happen diff --git a/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java b/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java index 70f5fc0..7a18bb5 100644 --- a/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java +++ b/dalvik/src/main/java/dalvik/system/PotentialDeadlockError.java @@ -31,7 +31,7 @@ public class PotentialDeadlockError extends VirtualMachineError { /** * Creates a new exception instance and initializes it with a given message. - * + * * @param detailMessage the error message */ public PotentialDeadlockError(String detailMessage) { diff --git a/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java b/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java index 22f8668..8bdd86a 100644 --- a/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java +++ b/dalvik/src/main/java/dalvik/system/StaleDexCacheError.java @@ -32,7 +32,7 @@ public class StaleDexCacheError extends VirtualMachineError { /** * Creates a new exception instance and initializes it with a given message. - * + * * @param detailMessage the error message */ public StaleDexCacheError(String detailMessage) { diff --git a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java index e05292e..1f2defd 100644 --- a/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java +++ b/dalvik/src/main/java/dalvik/system/TemporaryDirectory.java @@ -37,23 +37,23 @@ public class TemporaryDirectory { /** whether a temporary directory has been configured yet */ private static boolean configured = false; - + /** * Convenience method which is equivalent to * <code>setupDirectory(new File(baseDir))</code>. - * + * * @param baseDir the base directory of the temporary directory */ public static void setUpDirectory(String baseDir) { setUpDirectory(new File(baseDir)); } - + /** * Sets up the temporary directory, but only if one isn't already * defined for this process, and only if it is possible (e.g., the * directory already exists and is read-write, or the directory * can be created). This call will do one of three things: - * + * * <ul> * <li>return without error and without doing anything, if a * previous call to this method succeeded</li> @@ -63,7 +63,7 @@ public class TemporaryDirectory { * <li>throw <code>UnsupportedOperationException</code> if the * directory could not be created or accessed</li> * </ul> - * + * * @param baseDir the base directory of the temporary directory */ public static synchronized void setUpDirectory(File baseDir) { @@ -92,7 +92,7 @@ public class TemporaryDirectory { "Failed to create directory: " + absolute); } } - + System.setProperty(PROPERTY, absolute); configured = true; } diff --git a/dalvik/src/main/java/dalvik/system/TouchDex.java b/dalvik/src/main/java/dalvik/system/TouchDex.java index aca0fd3..129dc70 100644 --- a/dalvik/src/main/java/dalvik/system/TouchDex.java +++ b/dalvik/src/main/java/dalvik/system/TouchDex.java @@ -39,7 +39,7 @@ public class TouchDex { * * @param dexFiles a colon-separated list of DEX files. * @return zero on success - * + * * @cts What about error cases? */ public static int start(String dexFiles) { diff --git a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java index 18669c5..615fb24 100644 --- a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java +++ b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java @@ -36,9 +36,9 @@ import dalvik.system.DexFile; class TouchDexLoader extends ClassLoader { private String path; - + private boolean initialized; - + /** * Create a ClassLoader that finds files in the specified path. */ @@ -50,21 +50,21 @@ class TouchDexLoader extends ClassLoader { this.path = path; } - + private void ensureInit() { if (initialized) { return; } - + initialized = true; - + mPaths = path.split(":"); //System.out.println("TouchDexLoader: " + mPaths); mFiles = new File[mPaths.length]; mZips = new ZipFile[mPaths.length]; mDexs = new DexFile[mPaths.length]; - boolean wantDex = + boolean wantDex = System.getProperty("android.vm.dexfile", "").equals("true"); /* open all Zip and DEX files up front */ @@ -131,7 +131,7 @@ class TouchDexLoader extends ClassLoader { protected Class<?> findClass(String name) throws ClassNotFoundException { ensureInit(); - + byte[] data = null; int i; @@ -174,7 +174,7 @@ class TouchDexLoader extends ClassLoader { } } } - + return defineClass(name, data, 0, data.length); } } @@ -188,7 +188,7 @@ class TouchDexLoader extends ClassLoader { */ protected URL findResource(String name) { ensureInit(); - + byte[] data = null; int i; @@ -310,7 +310,7 @@ class TouchDexLoader extends ClassLoader { return zip.getEntry(name) != null; } - /** + /** * Find a native library. * * Return the full pathname of the first appropriate-looking file diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java index 118d4a6..5fa5432 100644 --- a/dalvik/src/main/java/dalvik/system/VMDebug.java +++ b/dalvik/src/main/java/dalvik/system/VMDebug.java @@ -25,7 +25,7 @@ import java.io.IOException; * friendly way for use by application developers. On the Android platform, the * recommended way to access this functionality is through the class * <code>android.os.Debug</code>. - * + * * @cts Please complete the spec. * * @hide @@ -110,7 +110,7 @@ public final class VMDebug { /** * Returns the time since the last known debugger activity. - * + * * @return the time in milliseconds, or -1 if the debugger is not connected */ public static native long lastDebuggerActivity(); @@ -125,7 +125,7 @@ public final class VMDebug { /** * Determines if a debugger is currently attached. - * + * * @return true if (and only if) a debugger is connected */ public static native boolean isDebuggerConnected(); @@ -155,12 +155,12 @@ public final class VMDebug { * href="{@docRoot}guide/developing/tools/traceview.html"> Running the * Traceview Debugging Program</a> for information about reading * trace files. - * + * * <p>You can use either a fully qualified path and * name, or just a name. If only a name is specified, the file will * be created under the /sdcard/ directory. If a name is not given, * the default is /sdcard/dmtrace.trace.</p> - * + * * @param traceFileName name to give the trace file * @param bufferSize the maximum size of both files combined. If passed * as <code>0</code>, it defaults to 8MB. @@ -181,7 +181,7 @@ public final class VMDebug { * Like startMethodTracing(String, int, int), but taking an already-opened * FileDescriptor in which the trace is written. The file name is also * supplied simply for logging. Makes a dup of the file descriptor. - * + * * Not exposed in the SDK unless we are really comfortable with supporting * this and find it would be useful. * @hide @@ -244,7 +244,7 @@ public final class VMDebug { * The time is expressed in nanoseconds, and is only meaningful when * compared to the result from an earlier call. Note that nanosecond * resolution does not imply nanosecond accuracy. - * + * * @return the CPU usage. A value of -1 means the system does not support * this feature. */ @@ -264,13 +264,13 @@ public final class VMDebug { * catching regressions in code that is expected to operate without causing * any allocations. The limit is valid from the return of this method until * it is either changed or the thread terminates. - * + * * @param limit * the new limit. A value of 0 means not a single new object may * be allocated. A value of -1 disables the limit. - * + * * @return the previous limit, or -1 if no limit was set - * + * * @see #setGlobalAllocationLimit(int) */ public static native int setAllocationLimit(int limit); @@ -280,13 +280,13 @@ public final class VMDebug { * catching regressions in code that is expected to operate without causing * any allocations. The limit is valid from the return of this method until * it is either changed or the thread terminates. - * + * * @param limit * the new limit. A value of 0 means not a single new object may * be allocated. A value of -1 disables the limit. - * + * * @return the previous limit, or -1 if no limit was set - * + * * @see #setAllocationLimit(int) */ public static native int setGlobalAllocationLimit(int limit); @@ -306,7 +306,7 @@ public final class VMDebug { /** * Gets the number of loaded classes. - * + * * @return the number of loaded classes */ public static native int getLoadedClassCount(); diff --git a/dalvik/src/main/java/dalvik/system/VMStack.java b/dalvik/src/main/java/dalvik/system/VMStack.java index e9d5765..f569439 100644 --- a/dalvik/src/main/java/dalvik/system/VMStack.java +++ b/dalvik/src/main/java/dalvik/system/VMStack.java @@ -25,7 +25,7 @@ package dalvik.system; public final class VMStack { /** * Returns the defining class loader of the caller's caller. - * + * * @return the requested class loader, or {@code null} if this is the * bootstrap class loader. */ @@ -33,7 +33,7 @@ public final class VMStack { /** * Returns the defining class loader of the caller's caller's caller. - * + * * @return the requested class loader, or {@code null} if this is the * bootstrap class loader. */ diff --git a/dalvik/src/main/java/dalvik/system/Zygote.java b/dalvik/src/main/java/dalvik/system/Zygote.java index 21eee3d..0aee960 100644 --- a/dalvik/src/main/java/dalvik/system/Zygote.java +++ b/dalvik/src/main/java/dalvik/system/Zygote.java @@ -94,7 +94,7 @@ public class Zygote { /** * Special method to start the system server process. In addition to the * common actions performed in forkAndSpecialize, the pid of the child - * process is recorded such that the death of the child process will cause + * process is recorded such that the death of the child process will cause * zygote to exit. * * @param uid the UNIX uid that the new process should setuid() to after @@ -112,7 +112,7 @@ public class Zygote { * @return 0 if this is the child, pid of the child * if this is the parent, or -1 on error. */ - native public static int forkSystemServer(int uid, int gid, + native public static int forkSystemServer(int uid, int gid, int[] gids, int debugFlags, int[][] rlimits); /** diff --git a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java index 59a7cad..5ca3b2a 100644 --- a/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java +++ b/dalvik/src/main/java/org/apache/harmony/dalvik/ddmc/ChunkHandler.java @@ -76,7 +76,7 @@ public abstract class ChunkHandler { */ public static ByteBuffer wrapChunk(Chunk request) { ByteBuffer in; - + in = ByteBuffer.wrap(request.data, request.offset, request.length); in.order(CHUNK_ORDER); return in; |