summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use icu4jni_error more consistently.Elliott Hughes2009-10-052-110/+79
| | | | | | | | In BidiWrapperInterface.c, replace check_fail with icu4jni_error for better error reporting. In CollationInterface.c, make sure we call icu4jni_error *after* calling the function that may or may not return an error.
* Merge change Idc84bb2bAndroid (Google) Code Review2009-10-020-0/+0
|\ | | | | | | | | * changes: Fix trace builder to not confuse self-verification.
| * Fix trace builder to not confuse self-verification.Ben Cheng2009-10-020-0/+0
| |
* | Make sure res is NULL if getaddrinfo fails.Lorenzo Colitti2009-10-021-2/+5
|/
* Merge change I4bf8618fAndroid (Google) Code Review2009-10-020-0/+0
|\ | | | | | | | | * changes: Add back missing shared libraries used by executable in link command. These libraries are linked though dependencies of other libraries. While that works, it is not the right thing to do.
| * Add back missing shared libraries used by executable in link command. TheseDoug Kwan2009-10-020-0/+0
| | | | | | | | | | libraries are linked though dependencies of other libraries. While that works, it is not the right thing to do.
* | Remove adb networking support from dalvik/libcore.Elliott Hughes2009-10-022-128/+21
| | | | | | | | | | | | | | There's more to be removed from other projects, but this should probably come out first. Bug: 1122968
* | Merge change Id5ccf4bcAndroid (Google) Code Review2009-10-020-0/+0
|\ \ | | | | | | | | | | | | * changes: Catch bad getStackTrace() calls.
| * | Catch bad getStackTrace() calls.Andy McFadden2009-10-010-0/+0
| | | | | | | | | | | | | | | | | | Normally Throwable.getStackTrace() can't be called until after there's a stack trace, but with a debugger you can call it during construction. We weren't expecting that and the VM went boom.
* | | Merge change I9d8f66aaAndroid (Google) Code Review2009-10-012-34/+33
|\ \ \ | | | | | | | | | | | | | | | | * changes: Switch java_net_NetworkInterface.c to C++.
| * | | Switch java_net_NetworkInterface.c to C++.Elliott Hughes2009-10-012-34/+33
| | | | | | | | | | | | | | | | | | | | (I have a bigger change to make to this file, but the web claims that it's best to keep renames in minimally small patches so git doesn't get confused.)
* | | | Merge change I3bc71eabAndroid (Google) Code Review2009-10-011-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * changes: :: is a valid local address on a newly-created socket if IPv6 is preferred.
| * | | :: is a valid local address on a newly-created socket if IPv6 is preferred.Lorenzo Colitti2009-10-011-1/+1
| | | |
* | | | am ae8d0254: am 0c0cfd5c: Merge change I96cd6f5b into eclairLorenzo Colitti2009-10-011-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef' * commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef': Make the socket test accept ::1 as a valid result for
| * \ \ \ am 0c0cfd5c: Merge change I96cd6f5b into eclairLorenzo Colitti2009-09-301-1/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp * commit '0c0cfd5ce4a26187fb910ba701d0021989103a25': Make the socket test accept ::1 as a valid result for
| | * \ \ \ Merge change I96cd6f5b into eclairAndroid (Google) Code Review2009-09-301-1/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Make the socket test accept ::1 as a valid result for InetAddress.getByName(null) if the system is set to prefer IPv6 addresses.
| | | * | | | Make the socket test accept ::1 as a valid result forLorenzo Colitti2009-09-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InetAddress.getByName(null) if the system is set to prefer IPv6 addresses. Change-Id: I96cd6f5b632994b73af13e341cf6f684f6eee4cd
* | | | | | | am 1507c7ce: am f94c5d77: More multicast fixes.Lorenzo Colitti2009-10-013-5/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1507c7ce4fc88f7bdf5e89ba10839809693eeefb' * commit '1507c7ce4fc88f7bdf5e89ba10839809693eeefb': More multicast fixes.
| * | | | | | am f94c5d77: More multicast fixes.Lorenzo Colitti2009-09-303-5/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f94c5d77ab659bfc1644b524fc006f24cbf6f694' into eclair-plus-aosp * commit 'f94c5d77ab659bfc1644b524fc006f24cbf6f694': More multicast fixes.
| | * | | | | More multicast fixes.Lorenzo Colitti2009-09-303-5/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make native code properly set network interface indexes that are used for new-style multicast socket options. 2. For IP_MULTICAST_IF, check that the address is IPv4, not the socket. 3. Remove a @KnownFailure annotation for a test that now passes. This removes one test error and changes it into a more benign failure. The remaining test failures seem to be due to Linux bening permissive about which interfaces you can receive multicast traffic on, which is probably good enough for now. Change-Id: Id1fddee338addcfce821672b983485c7dd4983d4
* | | | | | am 003d7f8d: am e851c562: Merge change Iea75a523 into eclairLorenzo Colitti2009-10-011-21/+72
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '003d7f8da66ec53b5dbece36308197dc7a932e3e' * commit '003d7f8da66ec53b5dbece36308197dc7a932e3e': Fixes for socket options on multicast sockets.
| * | | | | am e851c562: Merge change Iea75a523 into eclairLorenzo Colitti2009-09-301-21/+72
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp * commit 'e851c562ee5eb514135b5066553fcef6b0e5c333': Fixes for socket options on multicast sockets.
| | * | | | Merge change Iea75a523 into eclairAndroid (Google) Code Review2009-09-301-21/+72
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixes for socket options on multicast sockets.
| | | * | | | Fixes for socket options on multicast sockets.Lorenzo Colitti2009-09-301-21/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Properly pass get/setsockopt the pointer to the socket option instead of the pointer to the pointer to the option. This was not caught at compile time because it's a void *. 2. Handle IPv4 multicast addresses on IPv6 sockets. This is important because current devices create IPv6 sockets by default. 3. Use the proper options for IPv6 multicast (i.e., IPV6_{ADD,DROP}_MEMBERSHIP instead of IP_{ADD,DROP}_MEMBERSHIP) 4. Use integers instead of bytes when getting or setting the multicast TTL because that's what the Linux kernel uses. These fix 10 of the 11 MulticastSocketTest failures. Also, minor changes: 1. Add ifdefd-out logging functions for get/setsockopt. 2. Change all instances of IPPROTO_{IP,IPv6} to SOL_{IP,IPV6} in get/setsockopt calls. Even though the values are the same (so the code worked), this way is more correct. Change-Id: Iea75a523d7e71f0b361a42c0e39d3ef075dc7ff4
* | | | | | | Merge change I2cdad38aAndroid (Google) Code Review2009-10-011-13/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update archive to Harmony r820767.
| * | | | | | | Update archive to Harmony r820767.Jesse Wilson2009-10-011-13/+1
| | | | | | | |
* | | | | | | | am aa4320a4: am 1131d3da: Merge change Ie2e14dde into eclairJesse Wilson2009-10-012-41/+18
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa4320a4fb27684bd70cfb4d82feca3845ad272e' * commit 'aa4320a4fb27684bd70cfb4d82feca3845ad272e': Remove @KnownFailure tags for tests that pass.
| * | | | | | | am 1131d3da: Merge change Ie2e14dde into eclairJesse Wilson2009-09-304-43/+18
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1131d3da4e3d3df7f608fb0078ec67d14035ff25' into eclair-plus-aosp * commit '1131d3da4e3d3df7f608fb0078ec67d14035ff25': Remove @KnownFailure tags for tests that pass.
| | * | | | | | Merge change Ie2e14dde into eclairAndroid (Google) Code Review2009-09-304-43/+18
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove @KnownFailure tags for tests that pass.
| | | * | | | | | Remove @KnownFailure tags for tests that pass.Jesse Wilson2009-09-304-43/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleanup tests.api.java.io.SerializationStressTest4#test_writeObject_Proxy
* | | | | | | | | am 2b791cc2: am 910363bd: Merge change Ib5dc3f1f into eclairJesse Wilson2009-10-011-10/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b791cc256e80f93fef7db2157f1cee202133201' * commit '2b791cc256e80f93fef7db2157f1cee202133201': Fixing a lame test that was relying on hashmap iteration order.
| * | | | | | | | am 910363bd: Merge change Ib5dc3f1f into eclairJesse Wilson2009-09-301-10/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '910363bd8d50c2a5558a71e47377928265c1219e' into eclair-plus-aosp * commit '910363bd8d50c2a5558a71e47377928265c1219e': Fixing a lame test that was relying on hashmap iteration order.
| | * | | | | | | Merge change Ib5dc3f1f into eclairAndroid (Google) Code Review2009-09-301-10/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixing a lame test that was relying on hashmap iteration order.
| | | * | | | | | | Fixing a lame test that was relying on hashmap iteration order.Jesse Wilson2009-09-301-10/+5
| | | |/ / / / / /
* | | | | | | | | am a20c6d23: am b5b7f4ba: Merge change I9899be9d into eclairJesse Wilson2009-10-011-1/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a20c6d2347224d89dced471e61a36610699b7e71' * commit 'a20c6d2347224d89dced471e61a36610699b7e71': Fixing a Harmony regression in ObjectInputStream.
| * | | | | | | | am b5b7f4ba: Merge change I9899be9d into eclairJesse Wilson2009-09-301-1/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99' into eclair-plus-aosp * commit 'b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99': Fixing a Harmony regression in ObjectInputStream.
| | * | | | | | | Merge change I9899be9d into eclairAndroid (Google) Code Review2009-09-301-1/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixing a Harmony regression in ObjectInputStream.
| | | * | | | | | | Fixing a Harmony regression in ObjectInputStream.Jesse Wilson2009-09-301-1/+7
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We check the field type against the instance being populated and not the field descriptor on the wire. The root cause is a bug in Harmony which we should send upstream.
* | | | | | | | | am 18ae1786: am ffa33efc: Merge change I75630000 into eclairJesse Wilson2009-10-012-13/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18ae1786b572d7385cbddd7da3167e190b952ded' * commit '18ae1786b572d7385cbddd7da3167e190b952ded': Fixing tests that exercise SecurityManager plus stack inspection.
| * | | | | | | | am ffa33efc: Merge change I75630000 into eclairJesse Wilson2009-09-302-13/+22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ffa33efc2cae574aefbc2867dd4a7e5413282e3c' into eclair-plus-aosp * commit 'ffa33efc2cae574aefbc2867dd4a7e5413282e3c': Fixing tests that exercise SecurityManager plus stack inspection.
| | * | | | | | | Merge change I75630000 into eclairAndroid (Google) Code Review2009-09-302-13/+22
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixing tests that exercise SecurityManager plus stack inspection.
| | | * | | | | | Fixing tests that exercise SecurityManager plus stack inspection.Jesse Wilson2009-09-302-13/+22
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were both broken previously. They both relied on having specific bootloader classes in their call stack.
* | | | | | | | Merge change I76ecf19cAndroid (Google) Code Review2009-10-017-130/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use jniThrowException instead of FindClass/ThrowNew.
| * | | | | | | | Use jniThrowException instead of FindClass/ThrowNew.Elliott Hughes2009-10-017-130/+44
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use our best-of-breed code for throwing exceptions. The remaining callers of Throw have good reason, and the only caller of ThrowNew is now JNIHelp.c (jniThrowException) itself.
* | | | | | | | am 4b304284: am 7f51bfee: Merge change I86898f45 into eclairJesse Wilson2009-10-011-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Merge commit '4b30428421d4ad93d9e6fc34bc0190a5097dc4a6' * commit '4b30428421d4ad93d9e6fc34bc0190a5097dc4a6': Fix BigInteger math bugs.
| * | | | | | am 7f51bfee: Merge change I86898f45 into eclairJesse Wilson2009-09-291-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f51bfee5fc5fb34fe89f3d74f7fd40d834c0fc2' into eclair-plus-aosp * commit '7f51bfee5fc5fb34fe89f3d74f7fd40d834c0fc2': Fix BigInteger math bugs.
| | * | | | | Merge change I86898f45 into eclairAndroid (Google) Code Review2009-09-301-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix BigInteger math bugs.
| | | * | | | | Fix BigInteger math bugs.Jesse Wilson2009-09-291-0/+3
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | This initializes the internal representation before doing left shifts. I'd originally missed this in the first Harmony update; change 20002.
* | | | | | | Fix a memory disambiguation and a SFP/DFP assembling bug in the JIT.Ben Cheng2009-09-300-0/+0
| |_|_|/ / / |/| | | | |
* | | | | | Simplify FileInputStream.skip to match the RI.Elliott Hughes2009-09-304-47/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RI throws IOException on any non-seekable stream, including stdin. This patch removes harmony's special-case hack for stdin, and the native cruft that wasn't even necessary if you did want a special hack for stdin. Bug: 1542253