summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am a4f2eac7: Merge "Add the harmony regex tests."Elliott Hughes2013-05-039-0/+4585
|\ | | | | | | | | * commit 'a4f2eac75586df51bb508a78d00cb353fa019a45': Add the harmony regex tests.
| * Merge "Add the harmony regex tests."Elliott Hughes2013-05-039-0/+4585
| |\
| | * Add the harmony regex tests.Elliott Hughes2013-05-039-0/+4585
| |/ | | | | | | Change-Id: Ia98563f4485ee13210f7fb02a08806e2ffd553e0
* | am 645c1562: Merge "Replace mentions of old JSSE package name"Kenny Root2013-05-034-4/+4
|\ \ | |/ | | | | | | * commit '645c15629a8abdb9f3a6e428ccb393eacd933552': Replace mentions of old JSSE package name
| * Merge "Replace mentions of old JSSE package name"Kenny Root2013-05-034-4/+4
| |\
| | * Replace mentions of old JSSE package nameKenny Root2013-05-034-4/+4
| |/ | | | | | | Change-Id: I7c90b08ee2b43c73e02512d0c6caaec098967e93
* | am aed4814b: Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
|\ \ | |/ | | | | | | * commit 'aed4814bb1d769e87bec04682489cc10b891518f': NativeCrypto: exit early when ssl_session is null
| * Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
| |\
| | * NativeCrypto: exit early when ssl_session is nullKenny Root2013-05-031-0/+3
| | | | | | | | | | | | | | | | | | | | | to_SSL_SESSION already throws NPE, so we should exit early. Otherwise we'll throw another NPE needlessly. Change-Id: I664340485e0b6335dc1ff7cca5343205894bc2fc
* | | am 6821dc7b: Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
|\ \ \ | |/ / | | | | | | | | | * commit '6821dc7ba87af1efe30b162614b4760ddaffcced': NativeCrypto: move key conversion to Java
| * | Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
| |\ \ | | |/
| | * NativeCrypto: move key conversion to JavaKenny Root2013-05-035-204/+83
| | | | | | | | | | | | | | | | | | | | | | | | Key type conversion in native code is from the legacy period before the OpenSSLKey class existed. Use that to hold PKEY reference instead of converting it in native code. Change-Id: I84e9a6e1f2e0f95d2f44c18fa9f65cd15e039d63
* | | am 603a9f11: Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
|\ \ \ | |/ / | | | | | | | | | * commit '603a9f111bab4635b6ddfd5c6a6ac8d44bb66d02': Move encoding method out of NativeCrypto
| * | Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
| |\ \ | | |/
| | * Move encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
| | | | | | | | | | | | | | | | | | | | | Move the encoding method for X.509 out of NativeCrypto to the class that uses it. Change-Id: I57198101553f309c04b5e757716d1d807eb99a90
* | | am 7977e59c: Merge "Add harmony java.nio.charset tests."Elliott Hughes2013-05-0337-0/+7009
|\ \ \ | |/ / | | | | | | | | | * commit '7977e59c21ec1597bcfcbca38b78d4bac051fcaf': Add harmony java.nio.charset tests.
| * | Merge "Add harmony java.nio.charset tests."Elliott Hughes2013-05-0337-0/+7009
| |\ \ | | |/ | |/|
| | * Add harmony java.nio.charset tests.Elliott Hughes2013-05-0337-0/+7009
| |/ | | | | | | Change-Id: I713069b35865cc01f5ed2f384dbc50b39d8a9346
* | am 4f5a2379: Merge "Add -host suffix for master changes"Brian Carlstrom2013-05-031-1/+1
|\ \ | |/ | | | | | | * commit '4f5a23794efbb123751239c66917ecae43c936be': Add -host suffix for master changes
| * Merge "Add -host suffix for master changes"Brian Carlstrom2013-05-031-1/+1
| |\
| | * Add -host suffix for master changesKenny Root2013-05-021-1/+1
| |/ | | | | | | | | | | (cherry picked from commit 518022767ec57e73205e5365de23a15076419364) Change-Id: I7a16bfd5213837a65062b7b7d78f610679cbf441
* | am 9eda20c2: Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-024-60/+138
|\ \ | |/ | | | | | | * commit '9eda20c27c0599c6c055c7887f41dd5a04c55935': NativeCrypto: build native library standalone
| * Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-024-60/+138
| |\
| | * NativeCrypto: build native library standaloneKenny Root2013-05-024-60/+138
| | | | | | | | | | | | Change-Id: I678f5c1b985d72ab1d41ae22dfcae35814c44e85
* | | am e2aa9af9: Merge "Fix BufferedReader.readLine to not read ahead after \'\r\'."Elliott Hughes2013-05-022-80/+159
|\ \ \ | |/ / | | | | | | | | | * commit 'e2aa9af94aeeab0e245c3f423f90c76b8cbe0229': Fix BufferedReader.readLine to not read ahead after '\r'.
| * | Merge "Fix BufferedReader.readLine to not read ahead after '\r'."Elliott Hughes2013-05-022-80/+159
| |\ \
| | * | Fix BufferedReader.readLine to not read ahead after '\r'.Elliott Hughes2013-05-022-80/+159
| | | | | | | | | | | | | | | | | | | | Bug: 8778372 Change-Id: I789d0ff5498cca48b16bb7b3b363014f7b6bcf95
* | | | am e16c809d: Merge "Tracking changes to *-host for host shared libraries"Brian Carlstrom2013-05-022-54/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e16c809d12fe57dc6521a5231368eaaabf66eb77': Tracking changes to *-host for host shared libraries
| * | | Merge "Tracking changes to *-host for host shared libraries"Brian Carlstrom2013-05-022-54/+10
| |\ \ \ | | |/ / | |/| |
| | * | Tracking changes to *-host for host shared librariesBrian Carlstrom2013-05-012-54/+10
| |/ / | | | | | | | | | Change-Id: I88dd48b09b9148246884a1c84b26787500c24569
* | | am 06ebe80b: Merge "Add the harmony BufferedReaderTest."Elliott Hughes2013-05-011-0/+592
|\ \ \ | |/ / | | | | | | | | | * commit '06ebe80bbc8a9108d6d7582561f855be78118f6c': Add the harmony BufferedReaderTest.
| * | Merge "Add the harmony BufferedReaderTest."Elliott Hughes2013-05-021-0/+592
| |\ \
| | * | Add the harmony BufferedReaderTest.Elliott Hughes2013-05-011-0/+592
| |/ / | | | | | | | | | | | | Bug: 8778372 Change-Id: I10145bdfd90320da7d3ecd08404c4625495cec32
* | | am 2b2224dd: Merge "Fix ScopedStringChars to behave like ScopedUtfChars."Elliott Hughes2013-05-014-54/+72
|\ \ \ | |/ / | | | | | | | | | * commit '2b2224dd923153293fcfa165931a774520317b47': Fix ScopedStringChars to behave like ScopedUtfChars.
| * | Merge "Fix ScopedStringChars to behave like ScopedUtfChars."Elliott Hughes2013-05-014-54/+72
| |\ \
| | * | Fix ScopedStringChars to behave like ScopedUtfChars.Elliott Hughes2013-05-014-54/+72
| |/ / | | | | | | | | | | | | | | | | | | Also reformat in Google C++ style and remove a couple of unnecessary #includes. Bug: https://code.google.com/p/android/issues/detail?id=45724 Change-Id: I6d1a78b3b1f72e7015baba64811d9749f330fba7
* | | am ad86c68a: Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'ad86c68a7ee81bc2f1c42d3c33364b2c74132803': More ICU.getDateFormatOrder tests.
| * | Merge "More ICU.getDateFormatOrder tests."Elliott Hughes2013-05-011-0/+4
| |\ \ | | |/ | |/|
| | * More ICU.getDateFormatOrder tests.Elliott Hughes2013-05-011-0/+4
| |/ | | | | | | | | Bug: 7207103 Change-Id: I93a09b67d26cb61626082516a05c4b9cdda642d2
* | am af8bffb1: Improve System.nanoTime documentation.Elliott Hughes2013-04-300-0/+0
|\ \ | | | | | | | | | | | | * commit 'af8bffb1e33737ede93acded30496b0b13254ab6': Improve System.nanoTime documentation.
| * | Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8733179 (cherry picked from commit 37f79a6eb5d4f378ff6b0b56e21d5d5d1f4cc9a2) Change-Id: I8e4a860909e3f21e45e13cf9937d851a8add38c7
* | | am e2c689ab: Merge "Improve System.nanoTime documentation."Elliott Hughes2013-04-301-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'e2c689ab581762cab6fdb70951b50458a30be1ee': Improve System.nanoTime documentation.
| * | Merge "Improve System.nanoTime documentation."Elliott Hughes2013-05-011-1/+1
| |\ \
| | * | Improve System.nanoTime documentation.Elliott Hughes2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8733179 Change-Id: I12cf7fba00736ff1e9b2d8b2a1f5e50cf1070353
* | | | am db4ebcbc: Merge "Fix an ugly bug where try/catch offsets weren\'t being ↵Brian Carlstrom2013-04-303-39/+99
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mapped properly" * commit 'db4ebcbc52f84708248cd4b773c4fc3063a615ef': Fix an ugly bug where try/catch offsets weren't being mapped properly
| * | | Merge "Fix an ugly bug where try/catch offsets weren't being mapped properly"Brian Carlstrom2013-04-303-39/+99
| |\ \ \
| | * | | Fix an ugly bug where try/catch offsets weren't being mapped properlyBenoit Lamarche2013-04-303-39/+99
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL comes from CL I3bdadf20899fdb5d4d074e69103b33c0404a31f8 in AOSP master. Modifications have been made to files that were in dalvik but are now in libcore. Here is the original commit message: In dex files, there are several places where one object refers to another object by its position in the file. The dex merger is generally very careful to adjust these mappings when combining dex files. Unfortunately one of these cases was broken. Each try_item refers to a corresponding encoded_catch_handler by its byte offset in a list. Most of the time this byte offset is the same in the input dex file and the output dex file. But encoded_catch_handlers are variable-length because they use a variable-length uleb128 encoding to address the type_idx being caught. When dex files are merged, some exception types may go from having a small index to having a large index, increasing the number of bytes required to encode that index. This breaks our ability to directly copy over offsets as we were doing previously. Change-Id: I61adb8fce6fa9b83cbfbe5eef7edea84664d7ea6 (cherry picked from commit b44450d600807ab130aa7c6d91b534fde52e0a21)
* | | | am c8bc5f77: Merge "*libcore* resolved conflicts for merge of bc23c4f3 to ↵Brian Carlstrom2013-04-301-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dalvik-dev" * commit 'c8bc5f77ee2a996e771fb1814a47cc5c8bf93d5e': *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev
| * | | Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"Brian Carlstrom2013-04-301-0/+8
| |\ \ \
| | * | | *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-devElliott Hughes2013-04-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DexBuffer became Dex, and moved to libcore. Change-Id: I32447f83c03dd18f2339e879d015134be9f4fc18 (cherry picked from commit 621d004d61b3eaca74fc045a3fba6afa14327a2e)
generated by cgit v1.1 at 2025-03-15 06:30:47 +0000