summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Clean-up the monitor unlock routine. Remove the comment adjacent toCarl Shapiro2010-04-060-0/+0
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mon NULL check. As we know, that condition can occur if there was a mishandling of the lock word. Also, remove the format statement that attempted to print out the monitor state. In non-assert builds this may cause a SIGSEGV as the monitor pointer may be invalid. Change-Id: Ic4eb2d4180ac51b606a728ec7cd781af46f7b47e
* | | | | | | | Merge "Rewrite JSSE code to use one openssl SSL per SSLSocket an one SSL_CTX ↵Brian Carlstrom2010-04-0615-1588/+1341
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | per SSLSessionContext" into dalvik-dev
| * | | | | | | | Rewrite JSSE code to use one openssl SSL per SSLSocket an one SSL_CTX per ↵Brian Carlstrom2010-04-0615-1588/+1341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSLSessionContext Summary: b/1758225: Revisit OpenSSL locking Removed the locking original put in to address b/1678800 which had been causing problems for the HeapWorker thread which was timing out waiting for the lock in the finalizers while other threads were connecting. b/1678800: Reliability tool: Crash in libcrypto @ https://opac.ntu.ac.uk Properly fixed the native crash by avoid sharing SSL_SESSION objects between SSL_CTX objects Testing: - adb shell run-core-tests --verbose tests.xnet.AllTests - adb shell run-core-tests --verbose javax.net.ssl.AllTests - Test app that reloads https://opac.ntu.ac.uk Details: Each AbstractSessionContext now has an associated SSL_CTX, referenced through the sslCtxNativePointer. SSL_CTX on the native side defines the scope of SSL_SESSION caching, and this brings the Java SSLSessionContext caching into alignment with the native code. OpenSSLSessionImpl now uses AbstractSessionContext instead of SSLSessionContext for access to the underlying SSL_CTX. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java Added AbstractSessionContext.putSession so OpenSSLSocketImpl/OpenSSLSessionImpl can directly assign to the current AbstractSessionContext (whether it be a ClientSessionContext or a ServerSessionContext) without casting. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java Cleaning up use of SSL_CTX and SSL instances in SSLSocket/SSLServerSocket implementation The major change is that openssl SSL instances are allocated for the life of the matching Java object, replacing the SSL_CTX and the SSL objects that had previously been allocated only starting at handshake time. We should never have been sharing SSL_SESSION instances between SSL_CTX instances, which was the source of the native crashes dating back to cupcake which the OpenSSLSocket.class locking had been preventing. - NativeCrypto now has better defined and independant wrappers on openssl functionality. A followon checkin should move the remaining openssl JNI code here with the intent of being able to write and end-to-end test of the openssl code using NativeCrypto without the JSSE implementation classes. The following gives a list of the new native functions with a mapping to the old implementation code. The new code has a more functional style where SSL_CTX and SSL instances are passed and returned as arguments, not extracted from Java instances SSL_CTX_new OpenSSLSocketImpl.nativeinit, OpenSSLServerSocketImpl.nativeinit, SSLParameters.nativeinitsslctx SSL_CTX_get_ciphers_list OpenSSLSocketImpl.nativeGetEnabledCipherSuites SSL_CTX_free OpenSSLSocketImpl.nativefree, OpenSSLServerSocketImpl.nativefree SSL_new OpenSSLSocketImpl.nativeinit, OpenSSLSocketImpl.init, OpenSSLServerSocketImpl.nativeinit, OpenSSLServerSocketImpl.init SSL_get_options OpenSSLSocketImpl.nativesetenabledprotocols SSL_set_options OpenSSLSocketImpl.nativesetenabledprotocols SSL_get_ciphers OpenSSLSocketImpl.nativeGetEnabledCipherSuites SSL_set_cipher_list OpenSSLSocketImpl.nativeSetEnabledCipherSuites SSL_free OpenSSLSocketImpl.nativefree, OpenSSLServerSocketImpl.nativefree - While the focus in NativeCrypto is on native code, it also contains some helpers/wrappers especially for code that doesn't depend on specific SSL_CTX, SSL instances or that needs to do massaging of data formats between Java and OpenSSL. Some of these had previously been duplicated in the client and server versions of the code. For example: getSupportedCipherSuites OpenSSLSocketImpl.nativegetsupportedciphersuites, OpenSSLServerSocketImpl.nativegetsupportedciphersuites getSupportedProtocols OpenSSLSocketImpl.getSupportedProtocols, OpenSSLServerSocketImpl.getSupportedProtocols getEnabledProtocols OpenSSLSocketImpl.getEnabledProtocols,OpenSSLServerSocketImpl.getEnabledProtocols setEnabledProtocols OpenSSLSocketImpl.setEnabledProtocols setEnabledCipherSuites OpenSSLSocketImpl.setEnabledCipherSuites - Moved JNI initialization from OpenSSLSocketImpl to NativeCrypto which is the future home of all the openssl related native code. clinit OpenSSLSocketImpl.nativeinitstatic - NativeCrypto.CertificateChainVerifier is a new interface to decouple callbacks from openssl from a specific dependence on a OpenSSLSocketImpl.verify_callback method. Changed to return boolean instead of int. - Renamed OpenSSLSocketImpl.ssl to OpenSSLSocketImpl.sslNativePointer for consistency - Changed OpenSSLSocketImpl nativeconnect, nativegetsslsession, nativecipherauthenticationmethod, nativeaccept, nativeread, nativewrite, nativeinterrupt, nativeclose, nativefree to take arguments instead of inspect object state in preparation for moving to NativeCrypto - other notable NativeCrypto changes included * adding SSL_SESSION_get_peer_cert_chain, SSL_SESSION_get_version, and SSL_get_version (and get_ssl_version) which are "missing methods" in openssl * ssl_msg_callback_LOG callback and get_content_type for handshake debugging * removing jfieldID's for our classes now that we pass in values in arguments * changed aliveAndKicking to be volative since we poll on it to communicate between threads * changed from C style declarations at beginning of block to C++ at first use on methods with major changes * stop freeing SSL instances on error, only SSL_clear it * improved session reuse logging when reproducing b/1678800 * change verify_callback to return verifyCertificateChain result x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java When we accept a server socket, we pass the existing SSL state instance from the server socket to the newly accepted socket via the constructor where it is copied with SSL_dup, instead of through both the constructor and later the accept method. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java Cleaned up nativesetclientauth from using SSL_CTX to SSL, passing ssl as argument in preparation for future movement to NativeCrypto. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java Removed ssl_op_no cache for rarely used enabled protocol methods so that code could more easily be shared in NativeCrypto between client and server. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Changed public getId, getCreationTime, getPeerCertificates, getCipherSuite, getProtocol from being instance methods that looked at the OpenSSLSessionImpl object state to be static mthods that take the native pointers as arguments in preparation for moving to NativeCrypto. Rename session -> sslSessionNativePointer for consistency. Inlined initializeNative, which wasn't really the native code. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java Removed lock on OpenSSLSocketImpl.class lock from around OpenSSLSocketImpl's use of nativeconnect, nativegetsslsession, and nativecipherauthenticationmethod as well as OpenSSLSessionImpl's use of freeImpl, fixing b/1758225: Revisit OpenSSL locking x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java Unrelated changes Removed unused ssl_ctx, nativeinitsslctx, getSSLCTX x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java Fix bug in both putSession implementations where we cached sessions with zero length id. Also change indexById to pass in id in client implementation. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java Make sure we clone SSLParameters passed to the SSLSocketFactory and SSLServerSocketFactory so that muting the client instance does not change the server instance and vice versa. Explicitly set setUseClientMode(false) on the server SSLParameters. These changes are to bring things more into alignment with the original harmony classes which properly support client/server role switching during handshaking. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java Make locks object fields final x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Moved updateInstanceCount(1) logic and sslParameters assignment to init method x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Changed getCachedClientSession to respect getUseClientMode x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Spelling of listensers to listeners in javadoc x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Spelling SSLInputStream to SSLOutputStream in comment x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Changed shutdownInput and shutdownOutput to call to the underlying socket x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Set sslNativePointer to 0 when freeing underlying SSL object x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Removed IOException logging in getSession, which is expected to simply return SSL_NULL_WITH_NULL_NULL when there are problems. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java Disabled "Using factory" message on successful creation of SocketFactory which was a bit noisy running tests. However, added logging in failure case including the related exception: x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java Disabled logging of OpenSSL session deallocation x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Register SSLContextImpl as a source of SSL and SSL3 SSLContexts, not just TLS and TLSv1. x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java Fix whitespace in comment x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java Change-Id: I99975ae22599c7df0d249fa013ae7ea7c9c08051
* | | | | | | | | Merge "Minor code clean-up. Fix a placeholder comment that I left in the ↵Carl Shapiro2010-04-060-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code. Change a comment that was added at my request to be less verbose. At the same time, repurpose an unused variable to hold the field offset so the field access code flows without wrapping." into dalvik-dev
| * | | | | | | | | Minor code clean-up. Fix a placeholder comment that I left in theCarl Shapiro2010-04-050-0/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code. Change a comment that was added at my request to be less verbose. At the same time, repurpose an unused variable to hold the field offset so the field access code flows without wrapping. Change-Id: I27d10c26b76620eb7d5ace55b4e6f76e5e4c44d6
* | | | | | | | | Rename the objBits to the more descriptive liveBits.Carl Shapiro2010-04-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1a2915f943cb9541fcc52c6b6a6d9d3b7354b5f
* | | | | | | | | Reference class handling overhaul.Carl Shapiro2010-04-050-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not mark through soft-reachable referents when scanning f- reachable objects. * Make the SoftReference clearing policy local to better conform to developer expecataions. * Eliminate SCHEDULED_REFERENCE_MAGIC, a hold-over from a previous reference management algorithm. * Move soft, weak and phantom reference processing into their own subroutines. Change-Id: I992788d58f10fa08336e6ac3f0a4dbfa3fc2086f
* | | | | | | | Merge "Unlock the monitor mutex before destroying it. This resolves an ↵Carl Shapiro2010-04-050-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | issue with simulator builds where, unlike bionic, libc checks whether a mutex is in the unlocked state before a destroy and returns EBUSY if the check fails. Until similar checks are added to bionic we now do a trylock, unlock sequence in the assert statements so as not to confuse the simulator build." into dalvik-dev
| * | | | | | | | Unlock the monitor mutex before destroying it. This resolves an issueCarl Shapiro2010-04-050-0/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with simulator builds where, unlike bionic, libc checks whether a mutex is in the unlocked state before a destroy and returns EBUSY if the check fails. Until similar checks are added to bionic we now do a trylock, unlock sequence in the assert statements so as not to confuse the simulator build. Change-Id: Iafa3c52edddb17b9a8a2c648c5fd3a58d5d77988
* | | | | | | | resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-0518-158/+70
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
| * | | | | | am f3c7fd52: Merge "Froyo InputStream.available documentation improvement." ↵Elliott Hughes2010-04-0518-158/+70
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | into froyo
| | * | | | | Merge "Froyo InputStream.available documentation improvement." into froyoElliott Hughes2010-04-0518-158/+70
| | |\ \ \ \ \
| | | * | | | | Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-0518-158/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
* | | | | | | | Merge "Fix two issues with the partial gc code." into dalvik-devCarl Shapiro2010-04-050-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix two issues with the partial gc code.Carl Shapiro2010-04-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Eliminate a fence error in bitmap aliasing. The heap structure uses asymetric bounds but the bitmap structure uses symmetric bounds. Bias accordingly. * Explicitly covert the immune limit to a uintptr_t to muffle a compiler warning. Change-Id: I05e74ab57035ee06eb6d88e773b1d680531a7e2f
* | | | | | | | | Merge "Fix vogar host mode." into dalvik-devJesse Wilson2010-04-0527-100/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix vogar host mode.Jesse Wilson2010-04-0527-100/+84
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also addressing bdc's comments from change Ibc7cbc81, most notably an import-ordering issues that impact many files.
* | | | | | | | | Merge "Remove unnecessary final local variables and arguments from ↵Brian Carlstrom2010-04-054-157/+157
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javax.net.ssl tests" into dalvik-dev
| * | | | | | | | | Remove unnecessary final local variables and arguments from javax.net.ssl testsBrian Carlstrom2010-04-054-157/+157
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4cbad9335e37f785edab9a76c42c229a1d40f57
* | | | | | | | | Merge "Removing APIs from dalvik.system that shouldn't have been published." ↵Jesse Wilson2010-04-059-18/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dalvik-dev
| * | | | | | | | | Removing APIs from dalvik.system that shouldn't have been published.Jesse Wilson2010-04-019-18/+9
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These APIs were deprecated in Eclair and should disappear in Gingerbread. See bug 2553600.
* | | | | | | | | am 14af5a09: am 54df4ecc: Added a note about android:vmSafeMode.Andy McFadden2010-04-050-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '14af5a09123df1aa766fb1ab286601fc592e4770' into dalvik-dev * commit '14af5a09123df1aa766fb1ab286601fc592e4770': Added a note about android:vmSafeMode.
| * | | | | | | am 54df4ecc: Added a note about android:vmSafeMode.Andy McFadden2010-04-050-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Added a note about android:vmSafeMode.Andy McFadden2010-04-050-0/+0
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like a good thing to note here, along with the system properties that accomplish the same thing system-wide. (This is a minor documentation change only.) Change-Id: Ib9adbd612d662fd2da3a02f49e730040fba8a7f3
* | | | | | | Merge "More Charset/ICU cleanup." into dalvik-devElliott Hughes2010-04-035-723/+168
|\ \ \ \ \ \ \
| * | | | | | | More Charset/ICU cleanup.Elliott Hughes2010-04-025-723/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've been feeling guilty about leaving broken double-checked locking (missing the "volatile") in harmony's Charset code. A quick investigation showed that the method that it's intended to optimize is basically never called, and the RI's documentation explicitly says "don't call this; it's slow". So this patch fixes that. I've also improved our documentation. I've also deleted a bunch of dead code. I've also tidied up some dodgy native string handling. Change-Id: Iad69ebb3459d9cc4c4ff37b255d458b83fe40132
* | | | | | | | Merge "New "from scratch" Junit tests for javax.net.ssl" into dalvik-devBrian Carlstrom2010-04-039-1/+1703
|\ \ \ \ \ \ \ \
| * | | | | | | | New "from scratch" Junit tests for javax.net.sslBrian Carlstrom2010-04-039-1/+1703
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new tests focusi on areas where I am making OpenSSL implementation chages, where I found differences from the RI when working on that code, and places where we were missing functionality compared to the spec. They all work on the RI, many fail on Dalvik luni/src/test/java/javax/net/ssl/AllTests.java luni/src/test/java/javax/net/ssl/SSLContextTest.java luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java luni/src/test/java/javax/net/ssl/SSLSessionTest.java luni/src/test/java/javax/net/ssl/SSLSocketFactoryTest.java luni/src/test/java/javax/net/ssl/SSLSocketTest.java Adding my javax.net.ssl.AllTests to the main list luni/src/test/java/tests/AllTests.java Adding Bouncy Castle provider /usr/share/java/bcprov.jar to host classpath for testing with --java-home /usr/lib/jvm/java-6-openjdk tools/runner/java/dalvik/runner/JavaVm.java Fix usage comment to reboot to bootloader run-core-tests Change-Id: I7a7998fc7bedc7a00b1836517d043c6a27c8bd4d
* | | | | | | | am 67050d11: am bd1326d0: Clean up the codegen for invoking helper callout ↵Ben Cheng2010-04-020-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions. Merge commit '67050d11e5afa7c2396bb0fc4f8d455ea2616f95' into dalvik-dev * commit '67050d11e5afa7c2396bb0fc4f8d455ea2616f95': Clean up the codegen for invoking helper callout functions.
| * | | | | | | am bd1326d0: Clean up the codegen for invoking helper callout functions.Ben Cheng2010-04-020-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Clean up the codegen for invoking helper callout functions.Ben Cheng2010-04-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All invoked functions are documented in compiler/codegen/arm/CalloutHelper.h Bug: 2567981 Change-Id: Ia7cd4107272df1b0b5588fbcc0aafcc6d0723d60
* | | | | | | | am 85948576: am 4ff253ff: Remove JSON License from NOTICE fileBrian Carlstrom2010-04-021-28/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '85948576f0270265ebeca795f41447ad4f549c11' into dalvik-dev * commit '85948576f0270265ebeca795f41447ad4f549c11': Remove JSON License from NOTICE file
| * | | | | | | am 4ff253ff: Remove JSON License from NOTICE fileBrian Carlstrom2010-04-021-28/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove JSON License from NOTICE fileBrian Carlstrom2010-04-021-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
* | | | | | | | am bf4d95ea: am 76cacb1f: Merge "Accept the "-Xjitdisableopt" flag as ↵Ben Cheng2010-04-020-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advertised." into froyo Merge commit 'bf4d95ea7d2e86e93ab372f261baa348c03ef188' into dalvik-dev * commit 'bf4d95ea7d2e86e93ab372f261baa348c03ef188': Accept the "-Xjitdisableopt" flag as advertised.
| * | | | | | | am 76cacb1f: Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyoBen Cheng2010-04-010-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyoBen Cheng2010-04-010-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Accept the "-Xjitdisableopt" flag as advertised.Ben Cheng2010-04-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2542212 Change-Id: I6819bbbaf43ccb9a1e35cc576cfd6e5440b9578b
* | | | | | | | | am 1071056d: am a497359a: Fix a race condition in JIT state refresh under ↵Ben Cheng2010-04-020-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging / misc code cleanup. Merge commit '1071056dace973442293b718bf12e328935126f1' into dalvik-dev * commit '1071056dace973442293b718bf12e328935126f1': Fix a race condition in JIT state refresh under debugging / misc code cleanup.
| * | | | | | | | am a497359a: Fix a race condition in JIT state refresh under debugging / ↵Ben Cheng2010-03-310-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | misc code cleanup.
| | * | | | | | | Fix a race condition in JIT state refresh under debugging / misc code cleanup.Ben Cheng2010-03-310-0/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2561283 Change-Id: I9fd94928f3e661de97098808340ea92b28cafa07
* | | | | | | | am 3d82ade7: Merge "Have certimport.sh list certificates in BKS keystore ↵Brian Carlstrom2010-04-021-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after importing for verification/debugging" Merge commit '3d82ade7a9b764695bad89d2476a73441118411b' into dalvik-dev * commit '3d82ade7a9b764695bad89d2476a73441118411b': Have certimport.sh list certificates in BKS keystore after importing for verification/debugging
| * | | | | | | Merge "Have certimport.sh list certificates in BKS keystore after importing ↵Brian Carlstrom2010-03-311-0/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | for verification/debugging"
| | * | | | | | Have certimport.sh list certificates in BKS keystore after importing for ↵Brian Carlstrom2010-03-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification/debugging Change-Id: Ic336f10d96bbf93b1dc5cfd8b64a4c9eaa4f3a68
* | | | | | | | am d4b07831: Merge "Fix misuse of ALLOC_DONT_TRACK." into froyoAndy McFadden2010-04-020-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd4b078315ae7335c385f70b32810959bd228d976' into dalvik-dev * commit 'd4b078315ae7335c385f70b32810959bd228d976': Fix misuse of ALLOC_DONT_TRACK.
| * | | | | | | Merge "Fix misuse of ALLOC_DONT_TRACK." into froyoAndy McFadden2010-03-310-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix misuse of ALLOC_DONT_TRACK.Andy McFadden2010-03-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal String creation function doesn't allow ALLOC_DONT_TRACK. This changes the call to use ALLOC_DEFAULT and then explicitly release the tracked allocation. For bug 2558142. Change-Id: I57dfa4824578c3a3a33f6836b75f51391cc73746
* | | | | | | | am ea527bc0: Remove debug message from OpenSSL JNI codeBrian Carlstrom2010-04-021-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ea527bc08f4d7128eb9d927a16723d20b9d1d217' into dalvik-dev * commit 'ea527bc08f4d7128eb9d927a16723d20b9d1d217': Remove debug message from OpenSSL JNI code
| * | | | | | | Remove debug message from OpenSSL JNI codeBrian Carlstrom2010-03-301-1/+0
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I70c68087b7d109634eb3240dca1f27e6f20d3da6
* | | | | | | am 6e138297: Add an @KnownFailure annotation.Elliott Hughes2010-04-021-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6e138297538fb632944ae1a81f346aec75137399' into dalvik-dev * commit '6e138297538fb632944ae1a81f346aec75137399': Add an @KnownFailure annotation.
generated by cgit v1.1 at 2025-03-14 22:23:48 +0000