am e937b1b2: Merge change 24110 into eclair

Merge commit 'e937b1b2d90dd9c1151f16af045c0fff1453c34e' into eclair-plus-aosp

* commit 'e937b1b2d90dd9c1151f16af045c0fff1453c34e':
  JarFile was not able to verify signed files with size 0.

Merge change 24110 into eclair

* changes:
  JarFile was not able to verify signed files with size 0.

merge from open-source master

am da03242f: Merge change 24840 into eclair

Merge commit 'da03242fe03a5ab342a6310b1e754e131ea628c9' into eclair-plus-aosp

* commit 'da03242fe03a5ab342a6310b1e754e131ea628c9':
  dalvik: Switch to common cutils sched_policy api

Merge change 24840 into eclair

* changes:
  dalvik: Switch to common cutils sched_policy api

am 2d34a33a: Merge change 23348 into eclair

Merge commit '2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1' into eclair-plus-aosp

* commit '2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1':
  Update crypto package to Harmony r802921. Only Javadoc changes.

Merge change 23348 into eclair

* changes:
  Update crypto package to Harmony r802921. Only Javadoc changes.

am 023a932a: Merge change 24788 into eclair

Merge commit '023a932add8087c96d59ea74135b28bb5e1ac16d' into eclair-plus-aosp

* commit '023a932add8087c96d59ea74135b28bb5e1ac16d':
  Fixing the delimiter for the HTTP "Accept" header to be well-formed.

Merge change 24788 into eclair

* changes:
  Fixing the delimiter for the HTTP "Accept" header to be well-formed.

dalvik: Switch to common cutils sched_policy api

Signed-off-by: San Mehat <san@google.com>

am efa0dcd5: Merge change 24508 into eclair

Merge commit 'efa0dcd52c030d2ace844070902979dd09e2c881' into eclair-plus-aosp

* commit 'efa0dcd52c030d2ace844070902979dd09e2c881':
  Addressed reviewer comments.

Merge change 24508 into eclair

* changes:
  Addressed reviewer comments.

am 00c464ff: Merge change 24751 into eclair

Merge commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0' into eclair-plus-aosp

* commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0':
  Windows SDK: add support for -J option to dx.bat

Merge change 24751 into eclair

* changes:
  Windows SDK: add support for -J option to dx.bat

Fixing the delimiter for the HTTP "Accept" header to be well-formed.

See bug 2107897.

Windows SDK: add support for -J option to dx.bat

BUG 1999508

Change-Id: I0c481d2cc0a96d1ca83aaa56c46c73eae17c2246

Addressed reviewer comments.

am 9ccfb95e: Merge change 24723 into eclair

Merge commit '9ccfb95e597a93020f2731c734c2a65e743fb601' into eclair-plus-aosp

* commit '9ccfb95e597a93020f2731c734c2a65e743fb601':
  Remove code duplication in InetAddress.getByAddress.

Merge change 24723 into eclair

* changes:
  Remove code duplication in InetAddress.getByAddress.

Remove code duplication in InetAddress.getByAddress.

Change-Id: Id2d72572fbe5b26ff4be9a2c959c41a48b859ea0

am 1e49340a: Merge change 24320 into eclair

Merge commit '1e49340a8249b147a2bb4f12e242ac5aedbddece' into eclair-plus-aosp

* commit '1e49340a8249b147a2bb4f12e242ac5aedbddece':
  Simplify networking code initialization using static structures instead of code.

Merge change 24320 into eclair

* changes:
  Simplify networking code initialization using static structures instead of code. Fix an uninitialized variable.

am 173086a3: Merge change 24620 into eclair

Merge commit '173086a363fd54e9e905409d3db06b01dbd0ccbd' into eclair-plus-aosp

* commit '173086a363fd54e9e905409d3db06b01dbd0ccbd':
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

Merge change 24620 into eclair

* changes:
  Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

Fix cert code to use the String form for TELETEX-encoded certs; see bug 2102191.

Simplify networking code initialization using static structures instead of code.
Fix an uninitialized variable.

Change-Id: Id9064a185525bfe072b244ea3d2acb56e5e185cd

am 20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

Merge commit '20677ed1a7114a2aa51086d5097f6328cd4fb94d' into eclair-plus-aosp

* commit '20677ed1a7114a2aa51086d5097f6328cd4fb94d':
  dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug

Signed-off-by: San Mehat <san@google.com>

am 03c7547c: Merge change 24425 into eclair

Merge commit '03c7547c40e6fc5b29b929b64f114e2dd3894e8e' into eclair-plus-aosp

* commit '03c7547c40e6fc5b29b929b64f114e2dd3894e8e':
  vm: Add support for using scheduler policies instead of cgroups

Merge change 24425 into eclair

* changes:
  vm: Add support for using scheduler policies instead of cgroups

vm: Add support for using scheduler policies instead of cgroups

Signed-off-by: San Mehat <san@google.com>

am 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

Merge commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7' into eclair-plus-aosp

* commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7':
  DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

Merge change 11462

* changes:
  Typo fix in javadoc

Merge change 11461

* changes:
  Cosmetic change: cst -> type in javadoc @param

am 7f5e6aa1: Merge change 23896 into eclair

Merge commit '7f5e6aa1503d13300c277225bf4eea9e5a11495a' into eclair-plus-aosp

* commit '7f5e6aa1503d13300c277225bf4eea9e5a11495a':
  InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

am 9dc72a3c: Modified Thread.c to allow sampling profiler thread in zygote. Added a function that queries the native thread status. Modified the profiler to sample every thread at a fixed interval instead of adjusting the delay based on the number of threads. This wil

Merge commit '9dc72a3c54af7201b6b85d96dba23a5f85309d9b' into eclair-plus-aosp

* commit '9dc72a3c54af7201b6b85d96dba23a5f85309d9b':
  Modified Thread.c to allow sampling profiler thread in zygote. Added a function that

JarFile was not able to verify signed files with size 0.

This regressen was introduced by harmony optimizations done in HARMONY-4569.
This fix allows for jar entries of size 0 to also get successfully validated.
A regression test has been added to JarFileTest.

Merge change 23896 into eclair

* changes:
  InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

Modified Thread.c to allow sampling profiler thread in zygote. Added a function that
queries the native thread status. Modified the profiler to sample every thread at
a fixed interval instead of adjusting the delay based on the number of threads. This
will make it easier to compare results across apps. Added ability to shut down
the profiler thread. Added code to track whether the method was a leaf or a
caller.

am f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.

Merge commit 'f2f6f8b8d47733be0f291612730690b5ce379257' into eclair-plus-aosp

* commit 'f2f6f8b8d47733be0f291612730690b5ce379257':
  Document that createSocketFileDescriptor throws an exception on failure.

Document that createSocketFileDescriptor throws an exception on failure.

Change-Id: Ic002b4dc8c40d798316afbab7a14bd81593e2541

am 3a4e4249: Merge change 23983 into eclair

Merge commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650' into eclair-plus-aosp

* commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650':
  If an error occurs when creating a socket, don't call any more JNI methods

Merge change 23983 into eclair

* changes:
  If an error occurs when creating a socket, don't call any more JNI methods (thus causing a segfault) but return immediately.

If an error occurs when creating a socket, don't call any more JNI methods
(thus causing a segfault) but return immediately.

Change-Id: I7d05997e38e631200542f85eba16b854d488d584

am 09302d63: Merge change 23572 into eclair

Merge commit '09302d631adbdc36edd3ec961149b8f0fe1931f1' into eclair-plus-aosp

* commit '09302d631adbdc36edd3ec961149b8f0fe1931f1':
  Do not check hash codes against golden values. Instead, spot check that they

Merge change 23572 into eclair

* changes:
  Do not check hash codes against golden values. Instead, spot check that they differ for different addresses and obvious values (e.g., 0 or 1) that might be returned by buggy implementations.

merge from open-source master

InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary

BUG=2033986

am 02e04f8b: Merge change 22871 into eclair

Merge commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0' into eclair-plus-aosp

* commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0':
  More InetAddress fixes.

Merge change 22871 into eclair

* changes:
  More InetAddress fixes.

More InetAddress fixes.

1. Make sure getHostByAddrImpl actually throws UnknownHostException: set
   NI_NAMEREQD when calling getnameinfo to ensure it will fail if the IP
   address looked up does not have a name associated with it, and pass this
   exception back to the Java code. That way, the UnknownHostException passed
   back to the Java code has information on what went wrong.
2. Remove superfluous logging on reverse lookups in the C code.

Change-Id: Ie195ce1f12e7b43fbf75f494002804f9db68fd8c

am 365f9fbb: Merge change 23918 into eclair

Merge commit '365f9fbb3e5444f046ee569f168a231c8106ec09' into eclair-plus-aosp

* commit '365f9fbb3e5444f046ee569f168a231c8106ec09':
  do not merge: Josh's optimized HashMap and Hashtable

Merge change 23918 into eclair

* changes:
  do not merge: Josh's optimized HashMap and Hashtable

do not merge: Josh's optimized HashMap and Hashtable

This commit squashes two changes from master. The only
additional change is that I've added "implements Map<K, V>"
to the signature of HashMap, which is necessary until we
get Josh's Apicheck fix in the master branch.

commit 5483e8adebc09b7bc58eb568793868388c240116
Author: Joshua Bloch <jjb@google.com>
Date:   Mon Aug 31 17:55:19 2009 -0700

    Replaced existing Hashtable implementation with fast one.

commit 90dbc304086ba1f6f51ed0d0b3a7368cc0fd46cb
Author: Joshua Bloch <jjb@google.com>
Date:   Thu Aug 20 17:34:39 2009 -0700

    Replace existing HashMap and LinkedHashMap with faster versions.
    Among other optimizations, the new versions do no division and
    use a high-quality defensive hash function to minimize the odds
    of poor key distribution among buckets.  Third time's a charm.

merge from donut

am 16866f9c: Merge change 23208 into eclair

Merge commit '16866f9c1fcfe8b1d1103424ed901517ce60883a' into eclair-plus-aosp

* commit '16866f9c1fcfe8b1d1103424ed901517ce60883a':
  Fix Class.getConstructor("whatever", (Class[]) null).

Merge change 23208 into eclair

* changes:
  Fix Class.getConstructor("whatever", (Class[]) null).

Fix Class.getConstructor("whatever", (Class[]) null).

The RI treats null parameterTypes the same as an empty array.
This behavior is specified for getMethod, but only implied for getConstructor.

This patch:

* Fixes getConstructor.
* Improves javadoc for Class methods taking "Class... parameterTypes".
* Adds tests for both getConstructor and getMethod (which was already correct).
* Removes a line of debugging output to System.out.

Bug: 1824973

am 74d65387: Update GlobalSign Root CA to one that expires in 2028.

Merge commit '74d65387394ddf242ca01db4e4d88e6374c74ed4' into eclair-plus-aosp

* commit '74d65387394ddf242ca01db4e4d88e6374c74ed4':
  Update GlobalSign Root CA to one that expires in 2028.

Update GlobalSign Root CA to one that expires in 2028.

am ce90979d: Merge change 23480 into eclair

Merge commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df' into eclair-plus-aosp

* commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df':
  Add Entrust root and intermediate certs.

Merge change 23480 into eclair

* changes:
  Add Entrust root and intermediate certs.

am 91191d3e: Merge change 22771 into eclair

Merge commit '91191d3e208d3a7c25c03e40018729877f954926' into eclair-plus-aosp

* commit '91191d3e208d3a7c25c03e40018729877f954926':
  Don't mutate input in OSMemory.setIntArray/setShortArray.

Merge change 22771 into eclair

* changes:
  Don't mutate input in OSMemory.setIntArray/setShortArray.

am 4b8a5527: Merge change 23683 into eclair

Merge commit '4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571' into eclair-plus-aosp

* commit '4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571':
  DO NOT MERGE: Fix implementation of Thread.isAlive

Merge change 23683 into eclair

* changes:
  DO NOT MERGE: Fix implementation of Thread.isAlive

am ed974e9e: Merge change 23724 into eclair

Merge commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429' into eclair-plus-aosp

* commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429':
  Fix x86 call bridge

Merge change 23724 into eclair

* changes:
  Fix x86 call bridge

Fix x86 call bridge

am 793f1423: Merge change 23675 into eclair

Merge commit '793f142323c49818ad022a05cbfb931eefddae5b' into eclair-plus-aosp

* commit '793f142323c49818ad022a05cbfb931eefddae5b':
  Unbreak Dalvik VM initialization due to a native method that expects to be able

Merge change 23675 into eclair

* changes:
  Unbreak Dalvik VM initialization due to a native method that expects to be able to call an InetAddress no-args constructor. This constructor was package-private and was recently removed. This method is horribly complex and should go away (it probably doesn't even work, due to it attempting to find a class known as "java/io/FielDescriptor"), but it needs to be fixed for now.

Unbreak Dalvik VM initialization due to a native method that expects to be able
to call an InetAddress no-args constructor. This constructor was package-private
and was recently removed. This method is horribly complex and should go away (it
probably doesn't even work, due to it attempting to find a class known as
"java/io/FielDescriptor"), but it needs to be fixed for now.

Change-Id: I56b1e0e07f4c97af82e0a4f14dfd2d8af16f6b82

DO NOT MERGE: Fix implementation of Thread.isAlive

(Originally submitted to master, pulling over to eclair.)

The implementation of Thread.isAlive() was changed a couple of years ago
as part of the Harmony integration.  The current version relies on the
thread's state value to determine its liveness, but the VM was
originally written to be like JamVM, which used GNU ClassPath, which
uses the vmThread field instead.

It looks like it's possible for Thread.join() to get stuck, though as
far as I know this hasn't happened.

We're essentially rolling back part of 27774-p9.  For internal bug 1966734.

Also: ran --update on test 044.

am c19d2a1d: Fix two calls to memset(3) whose arguments were reversed.

Merge commit 'c19d2a1d798d8626f196d878abcf23a14bee40af' into eclair-plus-aosp

* commit 'c19d2a1d798d8626f196d878abcf23a14bee40af':
  Fix two calls to memset(3) whose arguments were reversed.

Fix two calls to memset(3) whose arguments were reversed.

External bug 3358 reported the libcore/x-net instance. Manual inspection
turned up another instance in vm, but nothing else in the dalvik package.

Tested by booting sapphire-eng and running the x-net tests.

Bug: 1999244

am 5ca29e14: Merge change 22629 into eclair

Merge commit '5ca29e142032b6559824e4f7d526bbc037b90c93' into eclair-plus-aosp

* commit '5ca29e142032b6559824e4f7d526bbc037b90c93':
  Fix "whatever".split(".") behavior.

Merge change 22629 into eclair

* changes:
  Fix "whatever".split(".") behavior.

Do not check hash codes against golden values. Instead, spot check that they
differ for different addresses and obvious values (e.g., 0 or 1) that might be
returned by buggy implementations.

Change-Id: I4c093ccc268c91fc256b4ba76e1243de2d27670d

am 94e11fc4: InetAddress refactoring.

Merge commit '94e11fc41d9bb7648932a21be7fa895c2432f610' into eclair-plus-aosp

* commit '94e11fc41d9bb7648932a21be7fa895c2432f610':
  InetAddress refactoring.

InetAddress refactoring.

1. Refactor all protocol-specific methods from InetAddress into Inet[46]Address.
2. Move all protocol-specific constants from InetAddress into Inet[46]Address.

This change should have no effect on the stack's behaviour but makes it easy to
find parts of the code that still have dependencies on IPv4 so they can be
examined and fixed.

Change-Id: I70860ee04cf7c01bffaa35c8c64199f69d99826f

Add Entrust root and intermediate certs.

merge from open-source master

Update crypto package to Harmony r802921. Only Javadoc changes.

commit d5d4307b5b9f37e6f66ab1273be1acd2a29177de
Merge: 2c2287b 1c60d7c
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 15:36:46 2009 -0700

    Merge branch 'crypto_802921' into crypto_dalvik

    Conflicts:
     libcore/crypto/.classpath
     libcore/crypto/build.xml
     libcore/crypto/src/main/java/javax/crypto/BadPaddingException.java
     libcore/crypto/src/main/java/javax/crypto/Cipher.java
     libcore/crypto/src/main/java/javax/crypto/CipherInputStream.java
     libcore/crypto/src/main/java/javax/crypto/CipherOutputStream.java
     libcore/crypto/src/main/java/javax/crypto/CipherSpi.java
     libcore/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
     libcore/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
     libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java
     libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
     libcore/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java
     libcore/crypto/src/main/java/javax/crypto/KeyAgreement.java
     libcore/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java
     libcore/crypto/src/main/java/javax/crypto/KeyGenerator.java
     libcore/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java
     libcore/crypto/src/main/java/javax/crypto/Mac.java
     libcore/crypto/src/main/java/javax/crypto/MacSpi.java
     libcore/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java
     libcore/crypto/src/main/java/javax/crypto/NullCipher.java
     libcore/crypto/src/main/java/javax/crypto/SealedObject.java
     libcore/crypto/src/main/java/javax/crypto/SecretKey.java
     libcore/crypto/src/main/java/javax/crypto/SecretKeyFactory.java
     libcore/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java
     libcore/crypto/src/main/java/javax/crypto/ShortBufferException.java
     libcore/crypto/src/main/java/javax/crypto/interfaces/DHKey.java
     libcore/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
     libcore/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java
     libcore/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java
     libcore/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/PSource.java
     libcore/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
     libcore/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java

commit 2c2287b521cc5f558d9929e14e31ec92da6285b1
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:45 2009 -0700

    crypto_dalvik

commit 1c60d7c222c55ae49add8345a192c54357bb4a1f
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:34 2009 -0700

    crypto_802921

commit 50cf7f5d97de2f65ee0769aafec7b5a3551cb5d0
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Aug 31 14:56:27 2009 -0700

    crypto_527399

Update prefs to Harmony r772995.

Notable changes:
 - exception handling has changed to cleanup more reliably
 - calls to Collection.toArray() size the array properly
 - lots of style tweaks (rewrapping Javadoc, reintending wrapped code, whitespace)
 - new PrefsTester class ensures tests store prefs in the tmp directory

Squashed commit of the following:

    commit 2157269d8ed39ccb8a71d735c12bbabcfd548243
    Merge: d287282 97818bf
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Wed Aug 5 11:14:26 2009 -0700

        Merge branch 'prefs_772995' into prefs_dalvik

        Conflicts:
         libcore/prefs/.classpath
         libcore/prefs/.settings/org.eclipse.jdt.core.prefs
         libcore/prefs/build.xml
         libcore/prefs/make/exclude.linux.x86_64.drl
         libcore/prefs/make/exclude.windows.x86.drl
         libcore/prefs/make/exclude.windows.x86_64.drl
         libcore/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
         libcore/prefs/src/main/java/java/util/prefs/BackingStoreException.java
         libcore/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
         libcore/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java
         libcore/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
         libcore/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java
         libcore/prefs/src/main/java/java/util/prefs/NodeChangeListener.java
         libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java
         libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java
         libcore/prefs/src/main/java/java/util/prefs/Preferences.java
         libcore/prefs/src/main/java/java/util/prefs/PreferencesFactory.java
         libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesFactoryImpl.java
         libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesImpl.java
         libcore/prefs/src/main/java/java/util/prefs/XMLParser.java
         libcore/prefs/src/main/java/org/apache/harmony/prefs/internal/nls/Messages.java
         libcore/prefs/src/main/native/prefs/windows/PreferencesImpl.c
         libcore/prefs/src/main/native/prefs/windows/hyprefs.rc
         libcore/prefs/src/main/native/prefs/windows/makefile
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
         libcore/prefs/src/test/java/tests/prefs/AllTests.java

    commit d287282b550d4a5d262f1d1703344ed61bdc6d15
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:36:36 2009 -0700

        Dalvik Prefs

    commit 97818bf21cfde744eeb5fbf1f9c31d9bd66f5a2e
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:35:52 2009 -0700

        Prefs 772995

    commit 9a506f93947938dad3b41e1393f53b766ba0319f
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:22:40 2009 -0700

        Prefs 527399

Typo fix in javadoc

spec -> otherSpec

Merge change 23193 into eclair

* changes:
  Expand indirect reference ifdefs.

Cosmetic change: cst -> type in javadoc @param

Expand indirect reference ifdefs.

This excludes some things that used to be common between the direct and
indirect reference implementations.  The goal is to restore the original
method call performance.  In particular, we no longer convert native
method arguments to local references when USE_INDIRECT_REF is not
defined.

Merge change 22992 into eclair

* changes:
  Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.

Fix reporting of certain verify errors.

The code was assuming that the reference type could always be inferred
from the error code, but in two cases it couldn't.  This resulted in a
weird string appearing where the class name should be in the exception.
The type is now explicitly stuffed into the replacement instruction.

I added one additional test to 075; with this, plus 003 and 077, I think
we have full coverage.

For bug 2084560.

Merge change 9368

* changes:
  libcore/.../rg_apache_harmony_xml_ExpatParser: in C++, the return type of strchr(const char*) is 'const char*' instead of 'char *'.

Don't mutate input in OSMemory.setIntArray/setShortArray.

We now take a copy and then swap bytes in the copy if necessary,
rather than swapping the input, copying, and swapping the input
back.

I've switched to GetShortArrayRegion/GetIntArrayRegion instead
of GetPrimitiveArrayCritical because the latter makes life
unnecessarily hard for the VM/GC, and requires a second JNI call
to undo.

I've also renamed the native functions to match the Java methods
they implement.

(Tested by running the nio tests on the emulator, with added
logging to check that all four variants are called.)

Bug: 2019584

Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.

Change-Id: Ifdf236450007866f24c8b23d52617c41d4e9c324

Merge change 22965 into eclair

* changes:
  Fix some JNI indirect reference stuff.

Update x-net to Harmony r802921.

Notable changes
 - synchronization added where it was needed!
 - try/finally added to reliably tear down in DefaultSSLContext
 - ContextImpl deleted, it wasn't necessary
 - methods reordered to make statics first in the class
 - PrivilegedActions parameterized with <Void>
 - DigitalSignature now throws AssertionErrors in impossible states
   and throws AlertExceptions on invalid keys (rather than dumping
   a stacktrace)
 - ValueKeys added to SSLSessionImpl instead of TwoKeyMaps
 - SSLSessionImpl.clone() simplified to do a traditional clone

Squashed commit of the following:

commit 2d9e43d542ab7086af271bf52e847c582decbab1
Merge: 8b79eb4 a8dc377
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 15:25:21 2009 -0700

    Merge branch 'x-net_802921' into x-net_dalvik

    Conflicts:
     libcore/x-net/.classpath
     libcore/x-net/.settings/org.eclipse.jdt.core.prefs
     libcore/x-net/build.xml
     libcore/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/DefaultSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/SocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
     libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
     libcore/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java
     libcore/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLContext.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLEngine.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLKeyException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLPermission.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSession.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSocket.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManager.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
     libcore/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/X509KeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/X509TrustManager.java
     libcore/x-net/src/main/java/javax/net/ssl/package-info.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/ProtocolVersionTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/TrustManagerFactoryImplTest.java
     libcore/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java
     libcore/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
     libcore/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
     libcore/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
     libcore/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java
     libcore/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java

commit 8b79eb40a27f0b336d5516606d43162ecead09ca
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:58:17 2009 -0700

    x-net_dalvik

commit a8dc3778cd2a1a5d6d0cfff6eec22e7bfbdb9c14
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:55 2009 -0700

    x-net_802921

commit 07ca0ed8aa5927c909f880559c17d162c111608e
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:07 2009 -0700

    x-net_527399

commit 9b44ccfc38c2fc2a6cf2c3cc39a13cc5bce635ba
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 11:14:01 2009 -0700

    Small changes missed in the original submission of 22482.

Fix some JNI indirect reference stuff.

Convert where needed, don't convert where not needed, and make sure
we're using the right one.

With this, my ad-hoc tests pass, and the boot proceeds until we hit a
failure that looks like it might be due to logic outside the VM.

Merge change 10635

* changes:
  Add a bit-map encoding of Object-reference field offsets to ClassObject.

Merge change 22845 into eclair

* changes:
  IPv6 fixes to java.net.InetAddress.

IPv6 fixes to java.net.InetAddress.

1. Make hashCode() do something that makes sense for IPv6 addresses.
2. Expand coverage of hashCode unit test.
3. Fix failing regression test for getAllByName().
4. Document that the getByName test is broken. I will fix it in a future change.
5. Expand test coverage of the isMulticastAddress test to include IPv6 and
   non-multicast addresses.

All tests now pass.

Change-Id: I6f52c7c3213dd01bf773228b1ed5d44df813f877