summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Entrust root and intermediate certs.Nagendra Modadugu2009-09-015-0/+290
|
* Update prefs to Harmony r772995.Jesse Wilson2009-08-3127-706/+678
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge change 23193 into eclairAndroid (Google) Code Review2009-08-310-0/+0
|\ | | | | | | | | * changes: Expand indirect reference ifdefs.
| * Expand indirect reference ifdefs.Andy McFadden2009-08-280-0/+0
| | | | | | | | | | | | | | | | 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 eclairAndroid (Google) Code Review2009-08-283-5/+25
|\ \ | |/ |/| | | | | * changes: Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.
| * Annotate tests that are failing due to legacy IP address formats that have ↵Lorenzo Colitti2009-08-273-5/+25
| | | | | | | | | | | | not been implemented yet. Change-Id: Ifdf236450007866f24c8b23d52617c41d4e9c324
* | Fix reporting of certain verify errors.Andy McFadden2009-08-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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 22965 into eclairAndroid (Google) Code Review2009-08-270-0/+0
|\ \ | | | | | | | | | | | | * changes: Fix some JNI indirect reference stuff.
| * | Fix some JNI indirect reference stuff.Andy McFadden2009-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Update x-net to Harmony r802921.Jesse Wilson2009-08-2792-2062/+1326
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge change 22845 into eclairAndroid (Google) Code Review2009-08-273-30/+48
|\ \ | |/ |/| | | | | * changes: IPv6 fixes to java.net.InetAddress.
| * IPv6 fixes to java.net.InetAddress.Lorenzo Colitti2009-08-263-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am dfd0afbc: Each time we start an SSL session, we have to find the trust ↵Bob Lee2009-08-268-50/+253
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | anchor. This used to be an O(N) operation. If the trust anchor we\'re looking for was close to N, finding it could take a couple seconds. This change makes the operation O(1). Merge commit 'dfd0afbcb08b871e224a28ecb4ed427a7693545c' into eclair * commit 'dfd0afbcb08b871e224a28ecb4ed427a7693545c': Each time we start an SSL session, we have to find the trust anchor. This used to be an O(N) operation. If the trust anchor we're looking for was close to N, finding it could take a couple seconds. This change makes the operation O(1).
| * | Each time we start an SSL session, we have to find the trust anchor. This ↵Bob Lee2009-08-268-50/+253
| | | | | | | | | | | | used to be an O(N) operation. If the trust anchor we're looking for was close to N, finding it could take a couple seconds. This change makes the operation O(1).
* | | Update sql to Harmony 802921.Jesse Wilson2009-08-2656-1544/+675
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes - ConnectionEvent field changed for serialization - Date toString classes no longer use SimpleDateFormat - Timestamp doesn't call through an overridable method in its constructor - Timestamp now checks the String passed to valueOf() using a regex - Properties now specifies a buffer size to avoid a user-inescapable warning Squashed commit of the following: commit dd9926cddda4db0227adbc174070791e5a9afa72 Merge: 8be3b27 4bed1fc Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 10:34:56 2009 -0700 Merge branch 'sql_802921' into sql_dalvik Conflicts: libcore/sql/.classpath libcore/sql/META-INF/MANIFEST.MF libcore/sql/build.xml libcore/sql/src/main/java/java/sql/Array.java libcore/sql/src/main/java/java/sql/BatchUpdateException.java libcore/sql/src/main/java/java/sql/Blob.java libcore/sql/src/main/java/java/sql/CallableStatement.java libcore/sql/src/main/java/java/sql/Clob.java libcore/sql/src/main/java/java/sql/Connection.java libcore/sql/src/main/java/java/sql/DataTruncation.java libcore/sql/src/main/java/java/sql/DatabaseMetaData.java libcore/sql/src/main/java/java/sql/Date.java libcore/sql/src/main/java/java/sql/Driver.java libcore/sql/src/main/java/java/sql/DriverManager.java libcore/sql/src/main/java/java/sql/DriverPropertyInfo.java libcore/sql/src/main/java/java/sql/ParameterMetaData.java libcore/sql/src/main/java/java/sql/PreparedStatement.java libcore/sql/src/main/java/java/sql/Ref.java libcore/sql/src/main/java/java/sql/ResultSet.java libcore/sql/src/main/java/java/sql/ResultSetMetaData.java libcore/sql/src/main/java/java/sql/SQLData.java libcore/sql/src/main/java/java/sql/SQLException.java libcore/sql/src/main/java/java/sql/SQLInput.java libcore/sql/src/main/java/java/sql/SQLOutput.java libcore/sql/src/main/java/java/sql/SQLPermission.java libcore/sql/src/main/java/java/sql/SQLWarning.java libcore/sql/src/main/java/java/sql/Savepoint.java libcore/sql/src/main/java/java/sql/Statement.java libcore/sql/src/main/java/java/sql/Struct.java libcore/sql/src/main/java/java/sql/Time.java libcore/sql/src/main/java/java/sql/Timestamp.java libcore/sql/src/main/java/java/sql/Types.java libcore/sql/src/main/java/javax/sql/ConnectionEvent.java libcore/sql/src/main/java/javax/sql/ConnectionEventListener.java libcore/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java libcore/sql/src/main/java/javax/sql/DataSource.java libcore/sql/src/main/java/javax/sql/PooledConnection.java libcore/sql/src/main/java/javax/sql/RowSet.java libcore/sql/src/main/java/javax/sql/RowSetEvent.java libcore/sql/src/main/java/javax/sql/RowSetInternal.java libcore/sql/src/main/java/javax/sql/RowSetListener.java libcore/sql/src/main/java/javax/sql/RowSetMetaData.java libcore/sql/src/main/java/javax/sql/RowSetReader.java libcore/sql/src/main/java/javax/sql/RowSetWriter.java libcore/sql/src/main/java/javax/sql/rowset/BaseRowSet.java libcore/sql/src/main/java/javax/sql/rowset/WebRowSet.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialException.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialStruct.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java libcore/sql/src/main/java/javax/transaction/xa/XAException.java libcore/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/BaseRowSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialClobTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialJavaObjectTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialRefTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialStructTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/InvalidTransactionExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRequiredExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRolledbackExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAResourceTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XidTest.java commit 8be3b27082122a5c5b650ad5aad6a70b45fd58d4 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:39:01 2009 -0700 Dalvik SQL commit 4bed1fc3972b50198299137dc152d46dd9d5d532 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:38:11 2009 -0700 SQL 802921 commit 82f57ed5049955585aecfae659310b6bde3354d8 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:36:42 2009 -0700 SQL 527399
* | Merge change 22659 into eclairAndroid (Google) Code Review2009-08-260-0/+0
|\ \ | | | | | | | | | | | | * changes: Another round of scary indirect ref changes.
| * | Another round of scary indirect ref changes.Andy McFadden2009-08-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a not-really-working implementation to Jni.c, with various changes #ifdefed throughout the code. The ifdef is currently disabled, so the old behavior should continue. Eventually the old version will be stripped out and the ifdefs removed. This renames the stack's "localRefTop" field, which nudged a bunch of code. The name wasn't really right before (it's the *bottom* of the local references), and it's even less right now. This and one other mterp-visible constant were changed, which caused some ripples through mterp and the JIT, but the ifdeffing was limited to one in asm-constants.h (and the constant is the same both ways, so toggling the ifdef won't require rebuilding asm sources). Some comments and arg names in ReferenceTable were updated for the correct orientation of bottom vs. top. Some adjustments were made to the JNI code, e.g. dvmCallMethod now needs to understand if it needs to convert reference arguments from local/global refs to pointers (it's called from various places throughout the VM).
* | | Small changes missed in the original submission of 22482.Jesse Wilson2009-08-252-2/+2
| | |
* | | Merge change 22482 into eclairAndroid (Google) Code Review2009-08-2537-1685/+2108
|\ \ \ | |/ / |/| | | | | | | | * changes: Update java.text to Harmony r802921.
| * | Update java.text to Harmony r802921.Jesse Wilson2009-08-2437-1685/+2108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes: - Replaced some StringBuffers with StringBuilders - Harmony moved to ICU, we stayed with ResourceBundles - Harmony now uses ICU's Bidi, we continue to use BidiWrapper - Fixed DateFormat.readResolve() - Fixed DecimalFormat serialization for setMaximumIntegerDigits - Fixed currency to support "XXX" for null - Support for null in MessageFormat.format() - Rearranged methods in SimpleDateFormat. Body is the same. - Fixed tests for Bidi.getRunLimit(). These are new failures. commit 112ab830475bc1a1fab9c7a16589b5525892e6a0 Merge: 39b03a1 62c2b2e Author: Jesse Wilson <jessewilson@google.com> Date: Mon Aug 24 14:03:31 2009 -0700 Merge dalvik and Harmony for java.text Conflicts: libcore/text/.classpath libcore/text/META-INF/MANIFEST.MF libcore/text/build.xml libcore/text/make/exclude.common libcore/text/make/run-test.xml libcore/text/src/main/java/java/text/Annotation.java libcore/text/src/main/java/java/text/AttributedCharacterIterator.java libcore/text/src/main/java/java/text/AttributedString.java libcore/text/src/main/java/java/text/Bidi.java libcore/text/src/main/java/java/text/BreakIterator.java libcore/text/src/main/java/java/text/CharacterIterator.java libcore/text/src/main/java/java/text/ChoiceFormat.java libcore/text/src/main/java/java/text/CollationElementIterator.java libcore/text/src/main/java/java/text/CollationKey.java libcore/text/src/main/java/java/text/Collator.java libcore/text/src/main/java/java/text/DateFormat.java libcore/text/src/main/java/java/text/DateFormatSymbols.java libcore/text/src/main/java/java/text/DecimalFormat.java libcore/text/src/main/java/java/text/DecimalFormatSymbols.java libcore/text/src/main/java/java/text/FieldPosition.java libcore/text/src/main/java/java/text/Format.java libcore/text/src/main/java/java/text/MessageFormat.java libcore/text/src/main/java/java/text/NumberFormat.java libcore/text/src/main/java/java/text/ParseException.java libcore/text/src/main/java/java/text/ParsePosition.java libcore/text/src/main/java/java/text/RuleBasedCollator.java libcore/text/src/main/java/java/text/SimpleDateFormat.java libcore/text/src/main/java/java/text/StringCharacterIterator.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java libcore/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java commit 39b03a1b2b150d468cc15d8ff8a92a07c9098a5c Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:36 2009 -0700 text_dalvik commit 62c2b2e932da51858998820fe2558631999c1241 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:23 2009 -0700 text_802921 commit 2da8bc3457b9db827d96652e2bf159b7d5040ad1 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 19 17:00:08 2009 -0700 text_527399
* | | Use local references for native method args.Andy McFadden2009-08-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the JNI method call mechanism to register all reference arguments as local refs, as well as the "this" argument (for virtual calls) and the class object (for static calls). Before now we skipped this part, because we're handing raw object pointers around, and we know that all of the arguments can be found by the GC on the interpreted stack. In fact, there's no need to add the arguments for GC-correctness; rather, we need to do this to rewrite the pointers we hand to native code. This change impacts JNI method call performance, especially for functions with a large number of reference arguments. To improve things a little, there are now four "call bridge" functions: (1) general handler (2) synchronized method handler (grabs lock, calls #1) (3) virtual method, no reference args (4) static method, no reference args While booting the system, the virtual/static no-ref handlers are used for about 70% of calls. Since these don't have to scan the method signature to look for reference arguments, they're a bit faster. At this point we're still passing raw pointers around, so nothing should really change.
* | | Set os.arch property from uname().machine.Andy McFadden2009-08-210-0/+0
| | | | | | | | | | | | | | | Not sure why we didn't just do this in the first place. I get "x86_64" on desktop and "armv6l" on a sapphire.
* | | Move array pinning out of global references table.Andy McFadden2009-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to pin primitive arrays for certain JNI operations (it's that or return a copy of the contents). We don't move objects around in the virtual heap, so simply creating a global reference is enough to ensure the correct behavior of the calls. The global reference implementation is changing in a way that makes this approach inconvenient, so we now have a separate table for pinned primitive arrays. As a bonus, if GREF tracking is enabled, we will scan through the table when a pin entry is added. If there are 10 or more entries for the same array, a complaint is logged. This should allow us to find mismatched Get/Release sequences much more easily (before you had to wait until the global reference table exploded). We currently scan pin table entries at the same time as the JNI global references, so they'll still show up in hprof dumps as such. (Could also add a new Android-specific hprof root category, but that seems like more trouble than it's worth.)
* | | Merge change 22183 into eclairAndroid (Google) Code Review2009-08-210-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * changes: Progress toward indirect JNI references.
| * | | Progress toward indirect JNI references.Andy McFadden2009-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from simple typecasts to conversion functions for the objects passed in and out of JNI calls. No real change here; object references are still just pointers. Use explicit pin/unpin calls for primitive arrays. For GetStringChars we now pin the char[] rather than the String object. (Which doesn't make much difference in the grand scheme of things, since you need to keep the String to pass into the release function anyway.)
* | | | am 2b2e488b: Exposed default trust manager.Bob Lee2009-08-201-1/+9
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit '2b2e488b25922b0b34094305cac084073ffbd03c' into eclair * commit '2b2e488b25922b0b34094305cac084073ffbd03c': Exposed default trust manager.
| * | | Exposed default trust manager.Bob Lee2009-08-201-1/+9
| | | |
* | | | Merge change 22152 into eclairAndroid (Google) Code Review2009-08-200-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Fix a couple of compiler warnings.
| * | | | Fix a couple of compiler warnings.Andy McFadden2009-08-200-0/+0
| | |/ / | |/| |
* | | | Merge change 21907 into eclairAndroid (Google) Code Review2009-08-190-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Update storage size after expansion.
| * | | | Update storage size after expansion.Andy McFadden2009-08-190-0/+0
| |/ / / | | | | | | | | | | | | | | | | We allow expansion in dvmSetBit(), but failed to update the capacity after doing so.
* | | | Merge change 21833 into eclairAndroid (Google) Code Review2009-08-195-3/+146
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * changes: Fixing Unsafe.getUnsafe() to look up the stack the correct number of frames.
| * | | Fixing Unsafe.getUnsafe() to look up the stack the correct number of frames.Jesse Wilson2009-08-185-3/+146
| | |/ | |/| | | | | | | | | | Also tests for Unsafe.getUnsafe() and all the requisite AllTests files to make that show up in the continuous build.
* | | Enable IPv6.Lorenzo Colitti2009-08-181-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system has IPv6 connectivity, query the DNS for IPv6 addresses as well as IPv4 addresses. If IPv6 addresses are returned, prefer them by default. Impact of this change: - If the device is on a network with IPv6 configured, is using wifi, and has obtained an IPv6 address using autoconfiguration, the network stack will request IPv6 addresses as well as IPv4 addresses when making DNS queries. This allows the device to connect to websites and services that declare themselves to be reachable over IPv6. If an IPv6 connection fails, the stack will fall back to IPv4. This is what Windows Vista, Mac OS 10.4 and above, and most Linux distributions do by default. - If the device is not on a network that supports IPv6, or is using 3G/EVDO, nothing will change. I have been testing this change on self-compiled builds of master and eclair on Dream and Sholes for several weeks with no breakage that I can see.
* | Merge change 21796 into eclairAndroid (Google) Code Review2009-08-180-0/+0
|\ \ | | | | | | | | | | | | * changes: Turn down RegisterMap paranoia.
| * | Turn down RegisterMap paranoia.Andy McFadden2009-08-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This disables verification of RegisterMap contents and compressed output, as well as a GC-time check that double-checked the validity of a register known to hold a reference. For internal bug 1896437.
* | | Minor tweaks to JNI logging.Andy McFadden2009-08-180-0/+0
|/ / | | | | | | | | Reduced a LOGI to LOGD, normalized format, added a similar message for a field ID lookup that was failing (due to a bad flash, as it turns out).
* | am affecd77: Cleanup CTS core failing tests.Brett Chabot2009-08-184-5/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'affecd7714e14fabff011ad61d436df3698bf7eb' into eclair * commit 'affecd7714e14fabff011ad61d436df3698bf7eb': Cleanup CTS core failing tests.
| * Cleanup CTS core failing tests.Brett Chabot2009-08-144-5/+5
| | | | | | | | BUG 2053939
* | Continuing evolution of Thumb2 support.Bill Buzbee2009-08-130-0/+0
| | | | | | | | | | Bug fix for local optimization Enable partial floating point store sinking (with significant perf gain!)
* | Be more POSIXly correct in the use of expr.Dan Bornstein2009-08-120-0/+0
| |
* | Update Luni to Harmony r802921.Jesse Wilson2009-08-1146-855/+1273
| | | | | | | | | | | | | | | | | | | | | | | | Notable changes: - replaced StringBuffer with StringBuilder in several places - fixed a problem with BufferedInputStream's newline characters (EBCDIC) - cleanup Timer's finalizer helper object - new cache for the canonical path of a file - fixed concurrency issue with ArrayList - floating point parsing now trims length for very small numbers - encoding specified "UTF-8" when converting some byte[]s to strings (JarURLConnection, Util, OSFileSystem) - Harmony now implements floor and ceil in Java. We continue to use native code.
* | Merge change 8107Android (Google) Code Review2009-08-100-0/+0
|\ \ | | | | | | | | | | | | * changes: First parts of enabling a host Dalvik build.
| * | First parts of enabling a host Dalvik build.Dan Bornstein2009-08-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this is just factoring out common make defs to include both on the host and device side, though there is a little bit of code change to be slightly POSIX friendlier and to avoid unnecessary sanity checks when compiling without an asm version of the interpreter. This patch should cause no difference in build results, except if you turn on the newly-defined WITH_HOST_DALVIK build flag. If you do turn it on, at this point you should probably expect the build to fail due to insufficient dependencies, which I of course expect to address in upcoming patches.
* | | merge from open-source masterJean-Baptiste Queru2009-08-100-0/+0
|\ \ \ | |/ / |/| |
| * | Change strategy for freeing objects in the sweep.Barry Hayes2009-08-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dlfree() in dlmalloc.c is fairly expensive. It checks the previous and next block to see if the curent block can be merged into one of the free blocks, and if it does merge, that involves manipulating the internal free lists. The sweep phase of the GC is already visiting free objects in address order, and has a list of objects to be freed. The new strategy is: Loop over the list of objects to be freed, merging when possible, and only calling free() when a either the list has run out or a non-adjacent free object is found.
| * | merge from donutJean-Baptiste Queru2009-08-0343-552/+1397
| |\ \ | | |/
| * | merge from donutJean-Baptiste Queru2009-07-293-13/+45
| |\ \
| * \ \ Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-25121-1570/+5825
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libcore/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java vm/oo/Class.c
| * \ \ \ Merge change 10723Android Code Review2009-07-200-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix variable names related to bytecode tracing.
generated by cgit v1.1 at 2025-03-29 17:23:36 +0000