OSDN Git Service

android-x86/dalvik.git
15 years agoMerge change 1551
Android (Google) Code Review [Wed, 13 May 2009 18:23:08 +0000 (11:23 -0700)]
Merge change 1551

* changes:
  Added a note in response to external feedback.

15 years agoMerge change 1481
Android (Google) Code Review [Wed, 13 May 2009 17:46:55 +0000 (10:46 -0700)]
Merge change 1481

* changes:
  Bringing annotation up to Harmony r772995.

15 years agoAdded a note in response to external feedback.
Andy McFadden [Wed, 13 May 2009 17:39:24 +0000 (10:39 -0700)]
Added a note in response to external feedback.

15 years agoMerge change 1489
Android (Google) Code Review [Wed, 13 May 2009 00:47:45 +0000 (17:47 -0700)]
Merge change 1489

* changes:
  Wrote Dalvik "porting guide".

15 years agoWrote Dalvik "porting guide".
Andy McFadden [Tue, 12 May 2009 22:26:25 +0000 (15:26 -0700)]
Wrote Dalvik "porting guide".

15 years agoBringing annotation up to Harmony r772995.
Jesse Wilson [Tue, 12 May 2009 21:00:42 +0000 (14:00 -0700)]
Bringing annotation up to Harmony r772995.

commit 8f52858127fd95abc694f0080438479be3c71ac6
Merge: 68891f9 df17e4f
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue May 12 13:59:37 2009 -0700

    Merge branch 'annotation_772995' into annotation_dalvik

    Conflicts:
     libcore/annotation/.classpath
     libcore/annotation/build.xml
     libcore/annotation/src/main/java/java/lang/annotation/Annotation.java
     libcore/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java
     libcore/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
     libcore/annotation/src/main/java/java/lang/annotation/Documented.java
     libcore/annotation/src/main/java/java/lang/annotation/ElementType.java
     libcore/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
     libcore/annotation/src/main/java/java/lang/annotation/Inherited.java
     libcore/annotation/src/main/java/java/lang/annotation/Retention.java
     libcore/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java
     libcore/annotation/src/main/java/java/lang/annotation/Target.java

commit 68891f94f87bea309f92dbe2f9a8eab95fa93614
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue May 12 13:46:16 2009 -0700

    Stripped @since Android 1.0 from annotation/

commit e3acecef0db3b85369aaa6f5db7876cde29d7329
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue May 12 13:23:06 2009 -0700

    Dalvik annotation

commit df17e4f396151289e7c6c645191fb27be9950f80
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue May 12 13:21:33 2009 -0700

    Annotation 772995

commit b89fac88400f17b6ba8be359eacad29d9faf7baf
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue May 12 13:19:55 2009 -0700

    Annotation 527399.

15 years agoMerge change 1431
Android (Google) Code Review [Tue, 12 May 2009 20:04:13 +0000 (13:04 -0700)]
Merge change 1431

* changes:
  Bringing the logging module up to Harmony r772995.

15 years agoMerge change 1401
Android (Google) Code Review [Tue, 12 May 2009 16:06:10 +0000 (09:06 -0700)]
Merge change 1401

* changes:
  Minor cleanup.

15 years agoBringing the logging module up to Harmony r772995.
Jesse Wilson [Tue, 12 May 2009 02:08:46 +0000 (19:08 -0700)]
Bringing the logging module up to Harmony r772995.

commit 080ff677c719f1e53ffb544c3fb684bb9ff28677
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 19:06:05 2009 -0700

    Copied test changes over manually.

commit ea52f28de5378f7dd4eff5c0f83d805e997a98de
Merge: 0c1f753 a6c8255
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 18:49:28 2009 -0700

    Merge branch 'logging_772995' into logging_dalvik

    Conflicts:
     libcore/logging/.classpath
     libcore/logging/META-INF/MANIFEST.MF
     libcore/logging/build.xml
     libcore/logging/src/main/java/java/util/logging/ConsoleHandler.java
     libcore/logging/src/main/java/java/util/logging/FileHandler.java
     libcore/logging/src/main/java/java/util/logging/Formatter.java
     libcore/logging/src/main/java/java/util/logging/Handler.java
     libcore/logging/src/main/java/java/util/logging/Level.java
     libcore/logging/src/main/java/java/util/logging/LogManager.java
     libcore/logging/src/main/java/java/util/logging/LogRecord.java
     libcore/logging/src/main/java/java/util/logging/Logger.java
     libcore/logging/src/main/java/java/util/logging/LoggingMXBean.java
     libcore/logging/src/main/java/java/util/logging/LoggingPermission.java
     libcore/logging/src/main/java/java/util/logging/MemoryHandler.java
     libcore/logging/src/main/java/java/util/logging/SimpleFormatter.java
     libcore/logging/src/main/java/java/util/logging/SocketHandler.java
     libcore/logging/src/main/java/java/util/logging/StreamHandler.java
     libcore/logging/src/main/java/java/util/logging/XMLFormatter.java
     libcore/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java

commit 0c1f7538e6fe3091a3d142b2ac14f5bf338b3a55
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 16:06:59 2009 -0700

    Stripped @since Android 1.0

commit 4c715c6c58080b3cbed2928cd1b71b9931e217a3
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 15:57:59 2009 -0700

    Logging Dalvik.

commit a6c8255dbbad85145a2066d9846d24787df0f75f
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 15:56:41 2009 -0700

    Logging 772995

commit db77dbdf56e99e3dcced2d758f7150007562c41c
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon May 11 15:54:13 2009 -0700

    Logging 527399

15 years agoMerge change 1394
Android (Google) Code Review [Mon, 11 May 2009 22:45:13 +0000 (15:45 -0700)]
Merge change 1394

* changes:
  Squashed commit of the following:

15 years agoMinor cleanup.
Dan Bornstein [Mon, 11 May 2009 21:56:37 +0000 (14:56 -0700)]
Minor cleanup.

15 years agoam 4da0525: Merge change 1400 into donut
Android (Google) Code Review [Mon, 11 May 2009 21:52:02 +0000 (14:52 -0700)]
am 4da0525: Merge change 1400 into donut

Merge commit '4da052510571aea4711d04de25a24b58cab1dadc'

* commit '4da052510571aea4711d04de25a24b58cab1dadc':
  Increase default stack size from 8K to 12K.

15 years agoMerge change 1400 into donut
Android (Google) Code Review [Mon, 11 May 2009 21:49:39 +0000 (14:49 -0700)]
Merge change 1400 into donut

* changes:
  Increase default stack size from 8K to 12K.

15 years agoIncrease default stack size from 8K to 12K.
Andy McFadden [Mon, 11 May 2009 21:39:13 +0000 (14:39 -0700)]
Increase default stack size from 8K to 12K.

For internal bug 1844105.

15 years agoam 08eacd4: am 64b928e: AI 148694: Manually copied from cupcake_dcm CL 1
Andy Stadler [Mon, 11 May 2009 21:21:10 +0000 (14:21 -0700)]
am 08eacd4: am 64b928e: AI 148694: Manually copied from cupcake_dcm CL 1

Merge commit '08eacd482ca9988b021a9e9e6c8bec573d6e4057'

* commit '08eacd482ca9988b021a9e9e6c8bec573d6e4057':
  AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  When resetting the

15 years agoam 64b928e: AI 148694: Manually copied from cupcake_dcm CL 148669-p9. W
Andy Stadler [Mon, 11 May 2009 21:15:32 +0000 (14:15 -0700)]
am 64b928e: AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  W

Merge commit '64b928e82a3b91b339ff9ee980c4a0c020daa251' into donut

* commit '64b928e82a3b91b339ff9ee980c4a0c020daa251':
  AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  When resetting the

15 years agoSquashed commit of the following:
Jesse Wilson [Mon, 11 May 2009 21:08:03 +0000 (14:08 -0700)]
Squashed commit of the following:

commit 2e4a7b3a3accb25865fb4c5535168b0d6bcebae4
Merge: 81ff13e 6c7f7e7
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date:   Mon May 11 13:47:02 2009 -0700

    Update our auth/ package to Harmony r772995. This change is just whitespace, plus dropping the newly added GSS tests and sample data (Generic Security services, org.ietf.jgss).

    Merge branch 'auth_772995' into auth_dalvik

    Conflicts:
     libcore/auth/.classpath
     libcore/auth/META-INF/MANIFEST.MF
     libcore/auth/build.xml
     libcore/auth/make/exclude.common
     libcore/auth/src/main/java/javax/security/auth/AuthPermission.java
     libcore/auth/src/main/java/javax/security/auth/DestroyFailedException.java
     libcore/auth/src/main/java/javax/security/auth/Destroyable.java
     libcore/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java
     libcore/auth/src/main/java/javax/security/auth/Subject.java
     libcore/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java
     libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
     libcore/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java
     libcore/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
     libcore/auth/src/main/java/javax/security/auth/kerberos/KerberosKey.java
     libcore/auth/src/main/java/javax/security/auth/login/LoginException.java
     libcore/auth/src/main/java/javax/security/auth/x500/X500Principal.java
     libcore/auth/src/main/java/org/apache/harmony/auth/login/DefaultConfiguration.java
     libcore/auth/src/main/native/auth/unix/exports.txt
     libcore/auth/src/main/native/auth/unix/makefile
     libcore/auth/src/main/native/auth/windows/makefile
     libcore/auth/src/test/java/common/org/ietf/jgss/OidTest.java

commit 81ff13ec7ae480ac783f692f38c845f502b49809
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date:   Fri May 8 17:53:27 2009 -0700

    Stripped @since tags

commit 8b4d0e9b66d8d674a56a26f0d1bc111f9d2faa8d
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date:   Fri May 8 17:40:36 2009 -0700

    Auth dalvik.

commit 6c7f7e7d41393869e3900ad224bf32a26378d723
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date:   Fri May 8 17:39:48 2009 -0700

    Auth 772995

commit ed7f6150f8235006c59afab862d30d6033b02460
Author: Jesse Wilson <jessewilson@jessewilson.mtv.corp.google.com>
Date:   Fri May 8 17:38:12 2009 -0700

    Auth 527399

15 years agoAI 148694: Manually copied from cupcake_dcm CL 148669-p9. When resetting the
Andy Stadler [Mon, 11 May 2009 21:03:58 +0000 (14:03 -0700)]
AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  When resetting the
  mode of the encoder, clear the leftover input & output buffers.
  This claims to fix buffer overwriting we're seeing during account
  sync and message download.
  BUG=1822859

Automated import of CL 148694

15 years agoam 8cee535: am 974cdcd: AI 148692: Merge change #148679 into Cupcake, si
Dan Bornstein [Mon, 11 May 2009 20:46:42 +0000 (13:46 -0700)]
am 8cee535: am 974cdcd: AI 148692: Merge change #148679 into Cupcake, si

Merge commit '8cee535966608f63ab11fe127c9045838974e08f'

* commit '8cee535966608f63ab11fe127c9045838974e08f':
  AI 148692: Merge change #148679 into Cupcake, since we probably want to

15 years agoam 974cdcd: AI 148692: Merge change #148679 into Cupcake, since we proba
Dan Bornstein [Mon, 11 May 2009 20:40:57 +0000 (13:40 -0700)]
am 974cdcd: AI 148692: Merge change #148679 into Cupcake, since we proba

Merge commit '974cdcdc22ce05a0574bf7f2559a175c8d9434e9' into donut

* commit '974cdcdc22ce05a0574bf7f2559a175c8d9434e9':
  AI 148692: Merge change #148679 into Cupcake, since we probably want to

15 years agoAI 148692: Merge change #148679 into Cupcake, since we probably want to
Dan Bornstein [Mon, 11 May 2009 20:39:31 +0000 (13:39 -0700)]
AI 148692: Merge change #148679 into Cupcake, since we probably want to
  take it for rel if there's an opportunity. Original
  description:
  Fix InputStreamReader to not drop input on buffer boundaries.
  This fix takes the salient code from Harmony tip-of-tree,
  though it's not a wholesale replacement of the file. In
  particular, I left in the old encoding name handling as well
  as one remaining "FIXME" that I don't think would have been
  addressed.
  BUG=1836908

Automated import of CL 148692

15 years agoam 96e0f60: Merge change 1369 into donut
Android (Google) Code Review [Mon, 11 May 2009 17:47:31 +0000 (10:47 -0700)]
am 96e0f60: Merge change 1369 into donut

Merge commit '96e0f600a6a52aa1424c1e8787fc40c1b3b3f79a'

* commit '96e0f600a6a52aa1424c1e8787fc40c1b3b3f79a':
  Updated a comment.

15 years agoMerge change 1369 into donut
Android (Google) Code Review [Mon, 11 May 2009 17:46:25 +0000 (10:46 -0700)]
Merge change 1369 into donut

* changes:
  Updated a comment.

15 years agoUpdated a comment.
Andy McFadden [Mon, 11 May 2009 17:44:52 +0000 (10:44 -0700)]
Updated a comment.

15 years agoam ac02d18: am 2de2459: AI 148670: More tests that need to be marked bro
Jorg Pleumann [Mon, 11 May 2009 17:16:41 +0000 (10:16 -0700)]
am ac02d18: am 2de2459: AI 148670: More tests that need to be marked bro

Merge commit 'ac02d185cf7f5b494c621ca67a4d786348deac3a'

* commit 'ac02d185cf7f5b494c621ca67a4d786348deac3a':
  AI 148670: More tests that need to be marked broken, since

15 years agoam 2de2459: AI 148670: More tests that need to be marked broken, since
Jorg Pleumann [Mon, 11 May 2009 17:12:32 +0000 (10:12 -0700)]
am 2de2459: AI 148670: More tests that need to be marked broken, since

Merge commit '2de2459caf88698400b7bcadaf87b5767b22f81e' into donut

* commit '2de2459caf88698400b7bcadaf87b5767b22f81e':
  AI 148670: More tests that need to be marked broken, since

15 years agoAI 148670: More tests that need to be marked broken, since
Jorg Pleumann [Mon, 11 May 2009 17:10:42 +0000 (10:10 -0700)]
AI 148670: More tests that need to be marked broken, since
  they behave differently in CTS and plain VM.
  Hopefully the last ones...
  BUG=1285921

Automated import of CL 148670

15 years agoam 99647fb: Pull the useful part of p9-132414 over to "donut".
Andy McFadden [Mon, 11 May 2009 14:46:27 +0000 (07:46 -0700)]
am 99647fb: Pull the useful part of p9-132414 over to "donut".

Merge commit '99647fbab2aee5730d277ddb2247709ccd4c95fa'

* commit '99647fbab2aee5730d277ddb2247709ccd4c95fa':
  Pull the useful part of p9-132414 over to "donut".

15 years agoPull the useful part of p9-132414 over to "donut".
Andy McFadden [Fri, 8 May 2009 22:26:33 +0000 (15:26 -0700)]
Pull the useful part of p9-132414 over to "donut".

This was inspired by some valgrind complaints marcone noticed.  The change
is already part of "master".

(I just noticed that the comment isn't quite right, but hopefully if I leave
it alone it'll merge trivially and I can fix it up in a subsequent change.)

15 years agoIncrease size of LinearAlloc region, and warn about massive Mirandizing.
Andy McFadden [Fri, 8 May 2009 18:25:35 +0000 (11:25 -0700)]
Increase size of LinearAlloc region, and warn about massive Mirandizing.

15 years agoMerge change 1170
Android (Google) Code Review [Thu, 7 May 2009 21:21:34 +0000 (14:21 -0700)]
Merge change 1170

* changes:
  Added throw-verification-error instruction.

15 years agoAdded throw-verification-error instruction.
Andy McFadden [Thu, 7 May 2009 20:30:23 +0000 (13:30 -0700)]
Added throw-verification-error instruction.

This is for the deferred verifier error reporting.  It replaces OP_UNUSED_ED.
The instructions aren't actually used yet, which is good since the x86
version hasn't been written yet.

The mterp regen also pushed out some recent-ish changes that hadn't
propagated to the armv4t sources.

15 years agoam dbd5c90: am c423b40: AI 148447: Marking some more tests as broken, be
Jorg Pleumann [Thu, 7 May 2009 16:29:25 +0000 (09:29 -0700)]
am dbd5c90: am c423b40: AI 148447: Marking some more tests as broken, be

Merge commit 'dbd5c902c3cca79e22d0f38539cc195ef7395647'

* commit 'dbd5c902c3cca79e22d0f38539cc195ef7395647':
  AI 148447: Marking some more tests as broken, because they

15 years agoam c423b40: AI 148447: Marking some more tests as broken, because they
Jorg Pleumann [Thu, 7 May 2009 16:25:18 +0000 (09:25 -0700)]
am c423b40: AI 148447: Marking some more tests as broken, because they

Merge commit 'c423b4096a09b1c1eae05b8ef37e7e3c428e0b92' into donut

* commit 'c423b4096a09b1c1eae05b8ef37e7e3c428e0b92':
  AI 148447: Marking some more tests as broken, because they

15 years agoAI 148447: Marking some more tests as broken, because they
Jorg Pleumann [Thu, 7 May 2009 16:22:59 +0000 (09:22 -0700)]
AI 148447: Marking some more tests as broken, because they
  don't work properly in the CTS environment for
  some reason.
  BUG=1285921

Automated import of CL 148447

15 years agoam 61df6ac: am 2f563a4: AI 148431: Marking as broken a couple of tests
Jorg Pleumann [Thu, 7 May 2009 08:41:22 +0000 (01:41 -0700)]
am 61df6ac: am 2f563a4: AI 148431: Marking as broken a couple of tests

Merge commit '61df6ac69e6614cb9986bf4ce3626dda914e0c6a'

* commit '61df6ac69e6614cb9986bf4ce3626dda914e0c6a':
  AI 148431: Marking as broken a couple of tests

15 years agoam 2f563a4: AI 148431: Marking as broken a couple of tests
Jorg Pleumann [Thu, 7 May 2009 08:36:27 +0000 (01:36 -0700)]
am 2f563a4: AI 148431: Marking as broken a couple of tests

Merge commit '2f563a4590c4a0e54177906c47d50f4ef454eba5' into donut

* commit '2f563a4590c4a0e54177906c47d50f4ef454eba5':
  AI 148431: Marking as broken a couple of tests

15 years agoAI 148431: Marking as broken a couple of tests
Jorg Pleumann [Thu, 7 May 2009 08:35:52 +0000 (01:35 -0700)]
AI 148431: Marking as broken a couple of tests
  that tend to fail in the CTS host.
  BUG=1285921

Automated import of CL 148431

15 years agoMerge change 1112
Android (Google) Code Review [Wed, 6 May 2009 23:50:09 +0000 (16:50 -0700)]
Merge change 1112

* changes:
  Say a few words about the virtues of IsSameObject.

15 years agoSay a few words about the virtues of IsSameObject.
Andy McFadden [Wed, 6 May 2009 23:48:33 +0000 (16:48 -0700)]
Say a few words about the virtues of IsSameObject.

15 years agoam 619309e: Merge change 1003 into donut
Android (Google) Code Review [Wed, 6 May 2009 23:40:19 +0000 (16:40 -0700)]
am 619309e: Merge change 1003 into donut

Merge commit '619309e6a11b623b48b7231de712eaed3d469531'

* commit '619309e6a11b623b48b7231de712eaed3d469531':
  Add support for tracing Java method entry/exit in emulator.

15 years agoMerge change 1003 into donut
Android (Google) Code Review [Wed, 6 May 2009 23:38:16 +0000 (16:38 -0700)]
Merge change 1003 into donut

* changes:
  Add support for tracing Java method entry/exit in emulator.

15 years agoAdd support for tracing Java method entry/exit in emulator.
Jack Veenstra [Tue, 5 May 2009 18:29:51 +0000 (11:29 -0700)]
Add support for tracing Java method entry/exit in emulator.

This is part of a larger change and depends on changes to the
kernel and the emulator tracing code.  The code used to work by
by writing to a "magic page" which the emulator would notice
because it watches every load and store.  But the emulator lost
the ability to watch every load and store with the latest update
to qemu.  So the new code sets up a memory-mapped page that the
emulator watches.  This is cleaner and more efficient anyway.

15 years agoam 921d947: Merge change 1055 into donut
Android (Google) Code Review [Wed, 6 May 2009 18:41:48 +0000 (11:41 -0700)]
am 921d947: Merge change 1055 into donut

Merge commit '921d9479afef6d6df1ed9c60ef8f3110e4ad7fde'

* commit '921d9479afef6d6df1ed9c60ef8f3110e4ad7fde':
  Fix issue 1687880.

15 years agoMerge change 1055 into donut
Android (Google) Code Review [Wed, 6 May 2009 18:41:05 +0000 (11:41 -0700)]
Merge change 1055 into donut

* changes:
  Fix issue 1687880.

15 years agomerge a2ee53b and resolved conflicts...
Andy McFadden [Wed, 6 May 2009 17:19:16 +0000 (10:19 -0700)]
merge a2ee53b and resolved conflicts...

15 years agoFix issue 1687880.
Jing Yu [Wed, 6 May 2009 03:34:38 +0000 (20:34 -0700)]
Fix issue 1687880.

Change argument va_list to a standard representation.

15 years agoAdded XML output mode for dexdump.
Andy McFadden [Tue, 5 May 2009 23:52:10 +0000 (16:52 -0700)]
Added XML output mode for dexdump.

This adds an output mode that looks similar to the "current.xml" we
generate for our public APIs.  There are a number of differences in
content.  The original ("plain") output has not been altered.

I pulled in the bad checksum handling change (internal 142686) since
it's small, has turned out to be useful, and might make the merge of
this to master slightly easier.

This also renames a buffer in the ongoing temp file variable saga.

15 years agoMerge change 996
Android (Google) Code Review [Tue, 5 May 2009 20:12:21 +0000 (13:12 -0700)]
Merge change 996

* changes:
  A foolish consistency is the hobgoblin of little minds.     -- Ralph Waldo Emerson

15 years agoA foolish consistency is the hobgoblin of little minds.
Dan Bornstein [Tue, 5 May 2009 18:15:23 +0000 (11:15 -0700)]
A foolish consistency is the hobgoblin of little minds.
    -- Ralph Waldo Emerson

15 years agoam 6d874d2: Merge change 993 into donut
Android (Google) Code Review [Tue, 5 May 2009 18:19:16 +0000 (11:19 -0700)]
am 6d874d2: Merge change 993 into donut

Merge commit '6d874d2bda563ada1034d2b3219b35d800fc6860'

* commit '6d874d2bda563ada1034d2b3219b35d800fc6860':
  Pull fix from master branch, and correct filename juggling.

15 years agoMerge change 993 into donut
Android (Google) Code Review [Tue, 5 May 2009 18:15:46 +0000 (11:15 -0700)]
Merge change 993 into donut

* changes:
  Pull fix from master branch, and correct filename juggling.

15 years agoPull fix from master branch, and correct filename juggling.
Andy McFadden [Tue, 5 May 2009 17:45:51 +0000 (10:45 -0700)]
Pull fix from master branch, and correct filename juggling.

The original fix was in p4 144906.  This also corrects some problems that
arise when the temp file is specified.

15 years agoMerge change 948
Android (Google) Code Review [Tue, 5 May 2009 16:56:10 +0000 (09:56 -0700)]
Merge change 948

* changes:
  Tweaks, Mostly grep-based, to better conform to the coding guidelines.

15 years agoTweaks, Mostly grep-based, to better conform to the coding guidelines.
Dan Bornstein [Mon, 4 May 2009 21:03:49 +0000 (14:03 -0700)]
Tweaks, Mostly grep-based, to better conform to the coding guidelines.

15 years agoam 1444f86: Merge change 945 into donut
Android (Google) Code Review [Mon, 4 May 2009 20:33:04 +0000 (13:33 -0700)]
am 1444f86: Merge change 945 into donut

Merge commit '1444f86148b2844800044b4776e2a35d362f3fa9'

* commit '1444f86148b2844800044b4776e2a35d362f3fa9':
  Moved the context class loader init down a bit to ensure proper init.

15 years agoMerge change 945 into donut
Android (Google) Code Review [Mon, 4 May 2009 20:32:58 +0000 (13:32 -0700)]
Merge change 945 into donut

* changes:
  Moved the context class loader init down a bit to ensure proper init.

15 years agoMoved the context class loader init down a bit to ensure proper init.
Andy McFadden [Mon, 4 May 2009 20:29:30 +0000 (13:29 -0700)]
Moved the context class loader init down a bit to ensure proper init.

Since we're executing interpreted code it's best if we set the context
class loader as late as possible in this function.  I also updated a few
comments while I was in there.

15 years agoam 8bad31e: Merge change 944 into donut
Android (Google) Code Review [Mon, 4 May 2009 19:59:36 +0000 (12:59 -0700)]
am 8bad31e: Merge change 944 into donut

Merge commit '8bad31ef86b3179b5725ac6e0ca9f615025b35b9'

* commit '8bad31ef86b3179b5725ac6e0ca9f615025b35b9':
  Set the main thread's context class loader to the system class loader.

15 years agoMerge change 944 into donut
Android (Google) Code Review [Mon, 4 May 2009 19:58:07 +0000 (12:58 -0700)]
Merge change 944 into donut

* changes:
  Set the main thread's context class loader to the system class loader.

15 years agoSet the main thread's context class loader to the system class loader.
Andy McFadden [Mon, 4 May 2009 19:52:57 +0000 (12:52 -0700)]
Set the main thread's context class loader to the system class loader.

15 years agoam 1cf3b27: Test for null object in the Get<Type>Field and Set<Type>Fiel
Andy McFadden [Mon, 4 May 2009 19:45:48 +0000 (12:45 -0700)]
am 1cf3b27: Test for null object in the Get<Type>Field and Set<Type>Fiel

Merge commit '1cf3b27e857824af08bab76489b6e25a213edc8d'

* commit '1cf3b27e857824af08bab76489b6e25a213edc8d':
  Test for null object in the Get<Type>Field and Set<Type>Field JNI functions.

15 years agoTest for null object in the Get<Type>Field and Set<Type>Field JNI functions.
Andy McFadden [Mon, 4 May 2009 19:28:51 +0000 (12:28 -0700)]
Test for null object in the Get<Type>Field and Set<Type>Field JNI functions.

Also adds some "return" calls after abortMaybe(), since it won't actually
abort if "warnonly" is set.

15 years agoClean up a couple more files.
Dan Bornstein [Fri, 1 May 2009 23:11:08 +0000 (16:11 -0700)]
Clean up a couple more files.

As usual, I did this while browsing the SSA code in an attempt to
understand what's going on with the weird local register assignment
issue.

15 years agoam 8eeeefc: Merge change 891 into donut
Android (Google) Code Review [Fri, 1 May 2009 19:41:35 +0000 (12:41 -0700)]
am 8eeeefc: Merge change 891 into donut

Merge commit '8eeeefccffb5e06107cd444436cc229f282a2b72'

* commit '8eeeefccffb5e06107cd444436cc229f282a2b72':
  Corrected behavior of Constructor.newInstance on abstract classes.

15 years agoMerge change 891 into donut
Android (Google) Code Review [Fri, 1 May 2009 19:27:34 +0000 (12:27 -0700)]
Merge change 891 into donut

* changes:
  Corrected behavior of Constructor.newInstance on abstract classes.

15 years agoCorrected behavior of Constructor.newInstance on abstract classes.
Andy McFadden [Fri, 1 May 2009 00:47:50 +0000 (17:47 -0700)]
Corrected behavior of Constructor.newInstance on abstract classes.

The VM now throws an exception when somebody tries to create an instance
of an abstract class through a Constructor object.  It also ensures that
the class is initialized before attempting to create an instance.

This change adds some Constructor tests to the 042-new-instance VM test.
(It also pulls in some additions that were made to the 042 test back
in March, on the p4 master branch.)

15 years agoMerge change 849
Android (Google) Code Review [Fri, 1 May 2009 19:03:49 +0000 (12:03 -0700)]
Merge change 849

* changes:
  Corrected behavior of Constructor.newInstance on abstract classes.

15 years agoam 399fbc0: Merge change 818 into donut
Android (Google) Code Review [Fri, 1 May 2009 18:58:58 +0000 (11:58 -0700)]
am 399fbc0: Merge change 818 into donut

Merge commit '399fbc0d87bbe4f2808cb582dc23f932432ea846'

* commit '399fbc0d87bbe4f2808cb582dc23f932432ea846':
  Changed the way we check the magic number in guard pages.

15 years agoMerge change 818 into donut
Android (Google) Code Review [Fri, 1 May 2009 18:31:23 +0000 (11:31 -0700)]
Merge change 818 into donut

* changes:
  Changed the way we check the magic number in guard pages.

15 years agoCorrected behavior of Constructor.newInstance on abstract classes.
Andy McFadden [Fri, 1 May 2009 00:47:50 +0000 (17:47 -0700)]
Corrected behavior of Constructor.newInstance on abstract classes.

The VM now throws an exception when somebody tries to create an instance
of an abstract class through a Constructor object.  It also ensures that
the class is initialized before attempting to create an instance.

This change adds some Constructor tests to the 042-new-instance VM test.

15 years agoDrop a copyright notice in at the end.
Andy McFadden [Thu, 30 Apr 2009 21:12:27 +0000 (14:12 -0700)]
Drop a copyright notice in at the end.

15 years agoChanged the way we check the magic number in guard pages.
Andy McFadden [Thu, 30 Apr 2009 20:25:59 +0000 (13:25 -0700)]
Changed the way we check the magic number in guard pages.

Use memcmp instead of "==" so that, if the pointer is unaligned on a
platform where alignment matters, we fail with a nice warning instead
of a bus error.

Found while tracking down bug 1823434.

15 years agoMerge branch 'master' of ssh://android-git.corp.google.com:29418/platform/dalvik
Joe Onorato [Thu, 30 Apr 2009 04:20:29 +0000 (21:20 -0700)]
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/dalvik

15 years agoMerge change 764
Android (Google) Code Review [Wed, 29 Apr 2009 23:09:27 +0000 (16:09 -0700)]
Merge change 764

* changes:
  Script that formats dvm_gc_info lines.

15 years agoScript that formats dvm_gc_info lines.
Andy McFadden [Wed, 29 Apr 2009 22:55:28 +0000 (15:55 -0700)]
Script that formats dvm_gc_info lines.

Simple (?) script that parses the dvm_gc_info lines out of the event log
and parses the contents.  Mostly useful for displaying the external
allocation "limit" and "allocated" values, which don't really show up
anywhere else.

15 years agoam 2c98747: Improve zygote heap sharing.
Barry Hayes [Wed, 29 Apr 2009 20:10:13 +0000 (13:10 -0700)]
am 2c98747: Improve zygote heap sharing.

Merge commit '2c98747b403970ef4b3352e271633f93935b9825'

* commit '2c98747b403970ef4b3352e271633f93935b9825':
  Improve zygote heap sharing.

15 years agoam 50f46fd: am 14da4cc: AI 147896: Some more fixes for tests that failed
Jorg Pleumann [Wed, 29 Apr 2009 19:06:37 +0000 (12:06 -0700)]
am 50f46fd: am 14da4cc: AI 147896: Some more fixes for tests that failed

Merge commit '50f46fdcf99609da579d08668fe4d3d05aaf6c0c'

* commit '50f46fdcf99609da579d08668fe4d3d05aaf6c0c':
  AI 147896: Some more fixes for tests that failed in

15 years agoam 8073bbc: am ef71222: AI 147838: A couple of fixes for making the
Jorg Pleumann [Wed, 29 Apr 2009 19:06:36 +0000 (12:06 -0700)]
am 8073bbc: am ef71222: AI 147838: A couple of fixes for making the

Merge commit '8073bbcc99d6a66f49497915ee12ce13f5b2ef85'

* commit '8073bbcc99d6a66f49497915ee12ce13f5b2ef85':
  AI 147838: A couple of fixes for making the

15 years agoam 4e3cc66: am 4645b7c: AI 147732: fix broken links
Scott Main [Wed, 29 Apr 2009 19:06:36 +0000 (12:06 -0700)]
am 4e3cc66: am 4645b7c: AI 147732: fix broken links

Merge commit '4e3cc66298b8e6d97670d3ed0b4170fb161d36f3'

* commit '4e3cc66298b8e6d97670d3ed0b4170fb161d36f3':
  AI 147732: fix broken links

15 years agoam 8c5029b: am 210c512: AI 147726: Getting rid of tests.luni.AllTests an
Jorg Pleumann [Wed, 29 Apr 2009 19:06:35 +0000 (12:06 -0700)]
am 8c5029b: am 210c512: AI 147726: Getting rid of tests.luni.AllTests an

Merge commit '8c5029b6aeb814facb790f4a460d85637401ede3'

* commit '8c5029b6aeb814facb790f4a460d85637401ede3':
  AI 147726: Getting rid of tests.luni.AllTests and

15 years agoam 28352aa: am 7cc0301: AI 147723: This should have been deleted a while
Jorg Pleumann [Wed, 29 Apr 2009 19:06:35 +0000 (12:06 -0700)]
am 28352aa: am 7cc0301: AI 147723: This should have been deleted a while

Merge commit '28352aafc2dba4e0f2c507649706389e1bea327e'

* commit '28352aafc2dba4e0f2c507649706389e1bea327e':
  AI 147723: This should have been deleted a while ago, since

15 years agoam d26d3fc: am 3fb3946: AI 147687: Several fixes for failing tests in th
Urs Grob [Wed, 29 Apr 2009 19:06:34 +0000 (12:06 -0700)]
am d26d3fc: am 3fb3946: AI 147687: Several fixes for failing tests in th

Merge commit 'd26d3fc95151c78102bc7bff12bb4b099424fd3f'

* commit 'd26d3fc95151c78102bc7bff12bb4b099424fd3f':
  AI 147687: Several fixes for failing tests in the cts host. also tests that timeout

15 years agoam fbf8886: am 119c75d: AI 147660: Fixes for tests in the security modul
Urs Grob [Wed, 29 Apr 2009 19:06:34 +0000 (12:06 -0700)]
am fbf8886: am 119c75d: AI 147660: Fixes for tests in the security modul

Merge commit 'fbf888693006c4135f61f7113dab80af44241681'

* commit 'fbf888693006c4135f61f7113dab80af44241681':
  AI 147660: Fixes for tests in the security module.

15 years agoam 025322b: am 2b828ef: AI 147464: Some small bugfixes for the core test
Jorg Pleumann [Wed, 29 Apr 2009 19:06:33 +0000 (12:06 -0700)]
am 025322b: am 2b828ef: AI 147464: Some small bugfixes for the core test

Merge commit '025322b5586f76fb2b886700f7a01deaa5d513bd'

* commit '025322b5586f76fb2b886700f7a01deaa5d513bd':
  AI 147464: Some small bugfixes for the core tests.

15 years agoam 1c7ba87: Fix an infinite loop in ClassLoader.isAncestorOf()
Urs Grob [Wed, 29 Apr 2009 19:06:33 +0000 (12:06 -0700)]
am 1c7ba87: Fix an infinite loop in ClassLoader.isAncestorOf()

Merge commit '1c7ba87b216ec3de563ac4d70548313da9b9bc1b'

* commit '1c7ba87b216ec3de563ac4d70548313da9b9bc1b':
  Fix an infinite loop in ClassLoader.isAncestorOf()

15 years agoam f2931ca: Fix for excessive GREF use in gethostbyaddr.
Urs Grob [Wed, 29 Apr 2009 19:06:33 +0000 (12:06 -0700)]
am f2931ca: Fix for excessive GREF use in gethostbyaddr.

Merge commit 'f2931ca22c6307a8740f2ec61795f7cfa6971262'

* commit 'f2931ca22c6307a8740f2ec61795f7cfa6971262':
  Fix for excessive GREF use in gethostbyaddr.

15 years agoam b8beb5f: vm: Replace a reference to TARGET_BUILD_TYPE with DEBUG_DALV
The Android Open Source Project [Wed, 29 Apr 2009 19:05:19 +0000 (12:05 -0700)]
am b8beb5f: vm: Replace a reference to TARGET_BUILD_TYPE with DEBUG_DALV

15 years agoam 4c99ba4: Merge change 374 into donut
Android (Google) Code Review [Wed, 29 Apr 2009 18:03:06 +0000 (11:03 -0700)]
am 4c99ba4: Merge change 374 into donut

Merge commit '4c99ba4317b8b900315c5e28322f1410d76c3d58'

* commit '4c99ba4317b8b900315c5e28322f1410d76c3d58':
  vm: Add support for changing the scheduler group for a thread.

15 years agoImprove zygote heap sharing.
Barry Hayes [Mon, 6 Apr 2009 17:03:48 +0000 (10:03 -0700)]
Improve zygote heap sharing.

[ This is bhayes change 9488 in external "master" ]

Lots of ClassObject structures are unshared [and thus make whole pages
unshared]. A big contributor to this is the initializing class loader
logic, which has two writable words in a ClassObject and does indeed
seem to write them a lot.

Class which are created "early" have a low serial number and are
probably being created by the zygote, and would benefit from better
sharing. This change move the two words for classes with a low serial
number to a global, making the two words in those ClassObjects unused,
and thus more likely to be shared across apps.

Measured increase in sharing is c 100K per app, at a cost of c 32K
increase in unshared globals.

This might be better as a Set<Pair<Class,ClassLoader>> or
something. Many ClassObjects have zero loaders, and the typical count
seems to be very small. It should be possible to remove the two words
from the ClassObject and at the same time have a smaller global data
structure.

Respond to reviewer's comments.
Moved the "external" InitiatingLoaderList[] from gDvm to allocated storage.
Made the warning for the "const" go away.
Remove "vm/Init.c" from the commit
Revert Globals.h to not contain ZYGOTE_CLASS_CUTOFF
Use calloc rather than malloc/clear

15 years agoam 14da4cc: AI 147896: Some more fixes for tests that failed in
Jorg Pleumann [Wed, 29 Apr 2009 04:53:13 +0000 (21:53 -0700)]
am 14da4cc: AI 147896: Some more fixes for tests that failed in

Merge commit '14da4ccdd69d8db7cef00b2ae5aabd32b6e1bdb4' into donut

* commit '14da4ccdd69d8db7cef00b2ae5aabd32b6e1bdb4':
  AI 147896: Some more fixes for tests that failed in

15 years agoam ef71222: AI 147838: A couple of fixes for making the
Jorg Pleumann [Wed, 29 Apr 2009 04:53:12 +0000 (21:53 -0700)]
am ef71222: AI 147838: A couple of fixes for making the

Merge commit 'ef7122278207e33b724c6360945f9eae1f9a5a58' into donut

* commit 'ef7122278207e33b724c6360945f9eae1f9a5a58':
  AI 147838: A couple of fixes for making the

15 years agoam 4645b7c: AI 147732: fix broken links
Scott Main [Wed, 29 Apr 2009 04:53:12 +0000 (21:53 -0700)]
am 4645b7c: AI 147732: fix broken links

Merge commit '4645b7c3a461769281a0b2b846a26c79e806aaa0' into donut

* commit '4645b7c3a461769281a0b2b846a26c79e806aaa0':
  AI 147732: fix broken links

15 years agoam 210c512: AI 147726: Getting rid of tests.luni.AllTests and
Jorg Pleumann [Wed, 29 Apr 2009 04:53:12 +0000 (21:53 -0700)]
am 210c512: AI 147726: Getting rid of tests.luni.AllTests and

Merge commit '210c51215f36a78183de70a19987dc2ece2fda30' into donut

* commit '210c51215f36a78183de70a19987dc2ece2fda30':
  AI 147726: Getting rid of tests.luni.AllTests and

15 years agoam 7cc0301: AI 147723: This should have been deleted a while ago, since
Jorg Pleumann [Wed, 29 Apr 2009 04:53:11 +0000 (21:53 -0700)]
am 7cc0301: AI 147723: This should have been deleted a while ago, since

Merge commit '7cc03015bd1bcc14fcc5a0d4ad8b235b24992de2' into donut

* commit '7cc03015bd1bcc14fcc5a0d4ad8b235b24992de2':
  AI 147723: This should have been deleted a while ago, since

15 years agoam 3fb3946: AI 147687: Several fixes for failing tests in the cts host.
Urs Grob [Wed, 29 Apr 2009 04:53:11 +0000 (21:53 -0700)]
am 3fb3946: AI 147687: Several fixes for failing tests in the cts host.

Merge commit '3fb3946640bdc1294131417ac6593a789373090d' into donut

* commit '3fb3946640bdc1294131417ac6593a789373090d':
  AI 147687: Several fixes for failing tests in the cts host. also tests that timeout

15 years agoam 119c75d: AI 147660: Fixes for tests in the security module.
Urs Grob [Wed, 29 Apr 2009 04:53:11 +0000 (21:53 -0700)]
am 119c75d: AI 147660: Fixes for tests in the security module.

Merge commit '119c75dad5494ac611c74599747e4bdc071eced1' into donut

* commit '119c75dad5494ac611c74599747e4bdc071eced1':
  AI 147660: Fixes for tests in the security module.

15 years agoam 2b828ef: AI 147464: Some small bugfixes for the core tests.
Jorg Pleumann [Wed, 29 Apr 2009 04:53:10 +0000 (21:53 -0700)]
am 2b828ef: AI 147464: Some small bugfixes for the core tests.

Merge commit '2b828ef0e241e67319349a30285ee7b812173040' into donut

* commit '2b828ef0e241e67319349a30285ee7b812173040':
  AI 147464: Some small bugfixes for the core tests.

15 years agoChanged the way errors are propagated through the verifier.
Andy McFadden [Sat, 18 Apr 2009 00:23:37 +0000 (17:23 -0700)]
Changed the way errors are propagated through the verifier.

Changed the boolean "okay" to a "failure" enumeration.  Most failures are
"generic", but some are called out specially.  Added a more detailed
failure result from resolver functions.

In theory, no behavior has changed.

15 years agoAI 147896: Some more fixes for tests that failed in
Jorg Pleumann [Tue, 28 Apr 2009 17:12:13 +0000 (10:12 -0700)]
AI 147896: Some more fixes for tests that failed in
  the CTS, but worked fine in run-core-tests:
  - One cert test needs isolation, because
  it destroys the security provider.
  - The Thread.sleep() tests were too flaky.
  - Tests that tried to open a temporary DEX
  file failed in the CTS because we do not
  have access to the system DEX cache. We
  are now simply creating our own.
  The Java plan in the CTS should now pass
  fully. Yippie!
  BUG=1285921

Automated import of CL 147896