summaryrefslogtreecommitdiffstats
path: root/luni/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge "Add libcore.net.NetworkSecurityPolicy."Alex Klyubin2015-03-254-2/+340
| |\ \ \ \ \ \ \
| | * | | | | | | Add libcore.net.NetworkSecurityPolicy.Alex Klyubin2015-03-244-2/+340
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hidden libcore API is to be used by bundled network stacks to determine whether cleartext network traffic is permitted. These stacks cannot directly use the public Android framework API android.security.NetworkSecurityPolicy because the framework package typically compile-time depends on the packages offering these bundled network stacks. As an example, this CL makes java.util.logging.SocketHandler and platform-provided URLConnection instances for the FTP protocol honor this new flag. To avoid duplication, the intention is that framework's android.security.NetworkSecurityPolicy implementaion will switch to this new libcore API to store/retrive the state of framework's NetworkSecurityPolicy class. Bug: 19215516 Change-Id: I78e348458975d69c52918582a43db25df87e2a15
* | | | | | | | am fc23db65: am 74b6f466: Merge "Fix for ftp:// invalid urls with ProxySelector"Neil Fuller2015-03-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc23db65f41c887963ce754e3a2cd350d5dad8e8': Fix for ftp:// invalid urls with ProxySelector
| * | | | | | | Merge "Fix for ftp:// invalid urls with ProxySelector"Neil Fuller2015-03-251-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix for ftp:// invalid urls with ProxySelectorNeil Fuller2015-03-251-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are currently no tests for FtpURLConnection. Future commits are planned that add tests that are based on the MockFTPServer open-source project. Thanks to pk.samson@ for the report. Bug: https://code.google.com/p/android/issues/detail?id=160725 Change-Id: I54fc2d5825f4e1b9681d537dd2c92b90659be5b5
* | | | | | | am be696823: am 00cbc7bc: Merge "Remove forced alignment code."Christopher Ferris2015-03-243-84/+260
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'be69682385a01039eb0cb488f15dc7144f30755d': Remove forced alignment code.
| * | | | | | Merge "Remove forced alignment code."Christopher Ferris2015-03-243-84/+260
| |\ \ \ \ \ \
| | * | | | | | Remove forced alignment code.Christopher Ferris2015-03-233-84/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The move from to gcc 4.8 to gcc 4.9 for arm32 introduced a bug in this code. The original code is trying to out smart the compiler by arch, but we got caught. Running benchmarks, the amount of time we save by doing this is in the nanosecond range, so just let the compiler figure things out on it's own. It turns out for aarch64, x86, x86_64, two of the functions produce exactly the same code. For swapLongs, x86/x86_64 produces slightly different code but is about the same performance. For arm32, letting the compiler optimize also leads to about the same performance. Adding unit tests and benchmark code for these. Bug: 19692084 Change-Id: I858eb3147ef1e9e2c1894ddb226cdddcc0baf933
* | | | | | | | am 94cc3faf: am 61ac7408: Merge "Fix the year display when formatting ↵Tao Bao2015-03-242-5/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | absolute date string" * commit '94cc3fafd50df1d5ab0fdb141db2e260efdc7831': Fix the year display when formatting absolute date string
| * | | | | | | Merge "Fix the year display when formatting absolute date string"Tao Bao2015-03-232-5/+79
| |\ \ \ \ \ \ \
| | * | | | | | | Fix the year display when formatting absolute date stringTao Bao2015-03-232-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In getRelativeDateTimeString(), when formatting the absolute date string with formatDateRange(), we need to explicitly specify the option to show / hide the year display based on the given arguments. Otherwise it would determine based on the current time and may gave wrong results. In getRelativeTimeSpanString(), it follows the same logic when user doesn't supply any option. Bug: 19822016 Change-Id: I0d4f01b7d15e0b8ea44f21b77309b1fc370b365b
* | | | | | | | | am dc746205: am 7cc1a6c4: Merge "Pass getDexPath to Runtime.nativeLoad"Dmitriy Ivanov2015-03-241-9/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc74620543a7983e8acff8527808a64437b93c57': Pass getDexPath to Runtime.nativeLoad
| * | | | | | | | Merge "Pass getDexPath to Runtime.nativeLoad"Dmitriy Ivanov2015-03-231-9/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Pass getDexPath to Runtime.nativeLoadDmitriy Ivanov2015-03-201-9/+10
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDexPath is used by Runtime.nativeLoad to open libraries directly from apk. Given that libraries are not compressed and are page-aligned. Bug: 8076853 Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* | | | | | | | | am 287c7008: am 8bed4516: Merge "Use compiler pragmas instead of flags."Narayan Kamath2015-03-242-3/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '287c7008ff7546bf4813339a06232d094c3d2b96': Use compiler pragmas instead of flags.
| * | | | | | | | Use compiler pragmas instead of flags.Narayan Kamath2015-03-232-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us turn off warnings for a small segment of the code instead of the entire project. bug: 19823499 Change-Id: I9309e9a33bddc33e8c100a49416e95b2a56e2385
* | | | | | | | | am cbfeeacd: am 349ff40b: Merge "ICU55: Update locale data dependent test ↵Narayan Kamath2015-03-242-33/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expectations." * commit 'cbfeeacd9749db6a5810a134ac7c31e59507d208': ICU55: Update locale data dependent test expectations.
| * | | | | | | | ICU55: Update locale data dependent test expectations.Fredrik Roubert2015-03-202-33/+33
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICU55 includes CLDR27 which has updated data for a number of locales, which affects libcore tests. Change-Id: I47c508a74945310dd7ad7abbb1dab1b77186a4e1
* | | | | | | | am bbfa813f: am 2254ea88: Merge "Set -Wno-deprecated-declarations to access ↵Narayan Kamath2015-03-191-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deprecated IDNA2003 API." * commit 'bbfa813f09176a08f977fbf04066bf5cb80c2dd8': Set -Wno-deprecated-declarations to access deprecated IDNA2003 API.
| * | | | | | | Merge "Set -Wno-deprecated-declarations to access deprecated IDNA2003 API."Narayan Kamath2015-03-191-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Set -Wno-deprecated-declarations to access deprecated IDNA2003 API.Fredrik Roubert2015-03-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libcore_icu_NativeIDN.cpp there are calls to the deprecated IDNA2003 API which means that this code as of ICU55 no longer will compile without specifying the -Wno-deprecated-declarations compiler flag. bug: 19823499 Change-Id: Id5cd5da0d6c3ce62a5c642c99364d29eaebe7709
* | | | | | | | | am 4d68a135: am 7417225f: Merge "Fix an ntohs/htons issue."Lorenzo Colitti2015-03-191-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d68a1353a52eea88bf422017385187fbdd59652': Fix an ntohs/htons issue.
| * | | | | | | | Merge "Fix an ntohs/htons issue."Lorenzo Colitti2015-03-191-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix an ntohs/htons issue.Lorenzo Colitti2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting between sockaddr_ll and PacketSocketAddress, we use ntohs in both directions. Converting from sockaddr_ll to PacketSocketAddress should use ntohs instead. This doesn't actually affect anything, because ntohs and htons identical, but it is conceptually wrong. Change-Id: Idd3cfcc11c4d6b7fed0c4b75a7935547f67eda12
* | | | | | | | | | am 84a7d6d4: am 70cc36f1: Merge "Remove a superfluous cast."Lorenzo Colitti2015-03-191-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '84a7d6d46227b1d7beb8eb48a334ecb52bc362aa': Remove a superfluous cast.
| * | | | | | | | | Merge "Remove a superfluous cast."Lorenzo Colitti2015-03-191-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Remove a superfluous cast.Lorenzo Colitti2015-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b4b9d9160a66d0ce9aa2449526041d1c75d545d
* | | | | | | | | am cd22429b: am 05c2be0d: Merge "Specify the base timestamp in ↵Tao Bao2015-03-181-40/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativeTimeSpanString tests" * commit 'cd22429b1d44b5c7de7275b3bf1947a208713283': Specify the base timestamp in RelativeTimeSpanString tests
| * | | | | | | | Specify the base timestamp in RelativeTimeSpanString testsTao Bao2015-03-181-40/+38
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to specify the timezone and the base time explicitly in RelativeTimeSpanString tests. Otherwise if using (base = System.currentTimeMillis()) with default timezone, it may not give a correct answer of "tomorrow" by adding 24 hours to base when it's around DST transitions. Bug: 19744876 Change-Id: I8fed9086ec8ebea6d837763fe7bc034fbd8e4181
* | | | | | | | am 7e8f4d94: am d51ee9f7: Merge "Remove executable permissions from ↵Narayan Kamath2015-03-171-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java_lang_StringToReal.cpp" * commit '7e8f4d94bfaf79a2ff7395f91a191441a8e6d577': Remove executable permissions from java_lang_StringToReal.cpp
| * | | | | | | Remove executable permissions from java_lang_StringToReal.cppNarayan Kamath2015-03-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e36d41a822db1b9607543a9033f190eed5363c8
* | | | | | | | am 4f295894: am 7b7fb78f: Merge "Add unit test for Timestamp#equals."Narayan Kamath2015-03-171-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f29589431468a882df99472d751eddd5c5be7ec': Add unit test for Timestamp#equals.
| * | | | | | | Add unit test for Timestamp#equals.Narayan Kamath2015-03-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19756610 Change-Id: I2654643fefcb0402e34ff409c0cad1e1355cadc3
* | | | | | | | am 8acc8d5e: am 79c17dc2: Merge "Libcore: Avoid double-checked locking"Andreas Gampe2015-03-163-70/+68
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8acc8d5ee4100828e579e2c3a18761ff0ed2b40a': Libcore: Avoid double-checked locking
| * | | | | | | Merge "Libcore: Avoid double-checked locking"Andreas Gampe2015-03-163-70/+68
| |\ \ \ \ \ \ \
| | * | | | | | | Libcore: Avoid double-checked lockingAndreas Gampe2015-03-153-70/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77605ad05ac5e9dfac07f40a2280221f9c641c65
* | | | | | | | | am b612f95a: am 464b9044: Merge "Late binding: specified Provider forces its ↵Kenny Root2015-03-1610-5/+220
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use" * commit 'b612f95a9f5db47863286570163e0c90afddcd3d': Late binding: specified Provider forces its use
| * | | | | | | | Merge "Late binding: specified Provider forces its use"Kenny Root2015-03-1610-5/+220
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Late binding: specified Provider forces its useKenny Root2015-03-1610-5/+220
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Provider is specified in a call to Signature#getInstance, Cipher#getInstance, KeyAgreement#getInstance, or Mac#getInstance, it should return that provider no matter if the properties on that provider say it should support it. Bug: 19730263 Change-Id: I56045e4cb470a0e1aa0e108a443e04043467c475
* | | | | | | | | am 0664c4e9: am 869c6f25: Merge "Libcore: Fix superfluous ternary in ↵Andreas Gampe2015-03-161-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferedInputStream" * commit '0664c4e9cdbaccb2e34e03bd6dcab36702f5fa6c': Libcore: Fix superfluous ternary in BufferedInputStream
| * | | | | | | | Merge "Libcore: Fix superfluous ternary in BufferedInputStream"Andreas Gampe2015-03-161-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Libcore: Fix superfluous ternary in BufferedInputStreamAndreas Gampe2015-03-151-1/+1
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the position, result is already checked to be positive. Change-Id: I3847022820294f76b944ce49d9ef8e8629ddb350
* | | | | | | | | Merge "Use uppercase for hex encoded strings."Narayan Kamath2015-03-162-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use uppercase for hex encoded strings.Narayan Kamath2015-03-162-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For backwards compatibility with the apache code this is replacing. Several callers compare encoded strings for byte equality. bug: 19731588 Change-Id: I2e96abcabd69ba6d48d341eafe1f8075fff880ee
* | | | | | | | | | am 5bf1fb2a: am 87409364: Merge "Libcore: Fix infinite loop"Andreas Gampe2015-03-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5bf1fb2add7eae7ee03ca3747a615967d3f152c0': Libcore: Fix infinite loop
| * | | | | | | | | Merge "Libcore: Fix infinite loop"Andreas Gampe2015-03-161-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Libcore: Fix infinite loopAndreas Gampe2015-03-151-1/+1
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly dispatch to wrapped object. Change-Id: Ia2789f92ddeb61f6b74789220f9a50dfdcf4fd3b
* | | | | | | | | | am 6ff8e03e: am ba6caa1c: Merge "Expose the SocketAddress variant to bundled ↵Lorenzo Colitti2015-03-161-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps." * commit '6ff8e03ef67c204565ceb3679029a0b88bdfaa62': Expose the SocketAddress variant to bundled apps.
| * | | | | | | | | Expose the SocketAddress variant to bundled apps.Lorenzo Colitti2015-03-161-0/+5
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b7985f23c1063c0cf68a12bf510da032bbd3e94
* | | | | | | | | am 29e698e3: am 71f07546: Merge "Also support IPv4 fallback in the ↵Lorenzo Colitti2015-03-162-11/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SocketAddress version of sendto." * commit '29e698e33247219311a98756833439a7a4f1e71a': Also support IPv4 fallback in the SocketAddress version of sendto.