summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4f10651f: Merge "Suppress broken apache-harmony logging CTS tests"Neil Fuller2014-09-021-0/+49
|\ | | | | | | | | * commit '4f10651fff7200d688e5dda1508448f8b34e4d9f': Suppress broken apache-harmony logging CTS tests
| * Merge "Suppress broken apache-harmony logging CTS tests"Neil Fuller2014-09-021-0/+49
| |\
| | * Suppress broken apache-harmony logging CTS testsNeil Fuller2014-09-021-0/+49
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test suppression entries for differences known to be caused by Android changes and failures that involve java code fixes. Some failures are the result of the test code being newer than the libcore code. Android took its last libcore update from apache-harmony some time after r820767 but before r929953 and its test-code update at r1097236. This explains a few things. java package fixes will be applied via a separate commit. Bug: 13882147 Change-Id: Ie5f3d1e5bb80a6aa8e3341a3bceacc65a58b2ca3
* | am 8d1a9652: Merge "Suppressing broken java.sql apache harmony tests."Neil Fuller2014-09-011-0/+31
|\ \ | |/ | | | | | | * commit '8d1a96527f86493c56022f64bf38752ff0dc1fa5': Suppressing broken java.sql apache harmony tests.
| * Merge "Suppressing broken java.sql apache harmony tests."Neil Fuller2014-09-011-0/+31
| |\
| | * Suppressing broken java.sql apache harmony tests.Neil Fuller2014-09-011-0/+31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | These are long-standing failures that we don't intend to fix in the foreseeable future. Developers have been encouraged to use android classes for database access. Bug: 17342415 Bug: 17321262 Bug: 17320961 Bug: 17093235 Change-Id: I30ed5576471253f58a63162347966dc11056cb31
* | am e4ed84bd: am fb8887c2: am ac90c351: am 17b9c57b: am 14d20299: am ↵Neil Fuller2014-08-290-0/+0
|\ \ | | | | | | | | | | | | | | | | | | d6aa6177: am 008b2de6: Add additional field checks for deserialization. * commit 'e4ed84bd1a5a28b41d03eec775b66be75827adf8': Add additional field checks for deserialization.
| * \ am fb8887c2: am ac90c351: am 17b9c57b: am 14d20299: am d6aa6177: am ↵Neil Fuller2014-08-290-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 008b2de6: Add additional field checks for deserialization. * commit 'fb8887c2b0dc838854e735bf0ee6e971904cf037': Add additional field checks for deserialization.
| | * \ am ac90c351: am 17b9c57b: am 14d20299: am d6aa6177: am 008b2de6: Add ↵Neil Fuller2014-08-290-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional field checks for deserialization. * commit 'ac90c3512ac80df0f50415c8220515423ed9dbe7': Add additional field checks for deserialization.
| | | * \ am 17b9c57b: am 14d20299: am d6aa6177: am 008b2de6: Add additional field ↵Neil Fuller2014-08-294-18/+129
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checks for deserialization. * commit '17b9c57b2534bb1d9c7cda3d5178ca1292621c16': Add additional field checks for deserialization.
| | | | * \ am 14d20299: am d6aa6177: am 008b2de6: Add additional field checks for ↵Neil Fuller2014-08-294-18/+129
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deserialization. * commit '14d202995c64ca96ae6e91143fb7224bce5b1e19': Add additional field checks for deserialization.
| | | | | * \ am d6aa6177: am 008b2de6: Add additional field checks for deserialization.Neil Fuller2014-08-294-18/+129
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6aa6177c90a84620e79b65009129c985b1913d4': Add additional field checks for deserialization.
| | | | | | * \ am 008b2de6: Add additional field checks for deserialization.Neil Fuller2014-08-294-18/+129
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '008b2de6760bc98b9651bb0e97e45ea76c22f65b': Add additional field checks for deserialization.
| | | | | | | * | Add additional field checks for deserialization.Neil Fuller2014-08-284-18/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that a field is not static when deserializing. Contains some additional tests to confirm and document behavior and prevent regressions for field deserialization. (cherry picked from commit f4d72bcf5a9caa1d6cac74a018ab68dd87ec6d83) Bug: 17202597 Change-Id: I72456a8b45ca0de1d3dd2b0f9515548b02e0a7be
* | | | | | | | | am 7f9653f5: am 55848681: Add additional field checks for deserialization.Neil Fuller2014-08-284-18/+129
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f9653f5d02beff35b8704b3a075f2e581db6135': Add additional field checks for deserialization.
| * | | | | | | | am 55848681: Add additional field checks for deserialization.Neil Fuller2014-08-284-18/+129
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55848681427721532161c63b43b3f99e912d071c': Add additional field checks for deserialization.
| | * | | | | | | Add additional field checks for deserialization.Neil Fuller2014-08-284-18/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that a field is not static when deserializing. Contains some additional tests to confirm and document behavior and prevent regressions for field deserialization. Bug: 17202597 Change-Id: I80fe0f1f15b36852de09320a4daa89333e753903 (cherry picked from commit f4d72bcf5a9caa1d6cac74a018ab68dd87ec6d83)
* | | | | | | | | am bb872da1: Merge "Make explicit that ISA names are used in some sys ↵Calin Juravle2014-08-271-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties" * commit 'bb872da194e54a6f59a3fa90aeeaf3da8b5202f4': Make explicit that ISA names are used in some sys properties
| * | | | | | | | Merge "Make explicit that ISA names are used in some sys properties"Calin Juravle2014-08-271-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make explicit that ISA names are used in some sys propertiesCalin Juravle2014-08-261-0/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0620c33972e061ba18504579430d2ac02656d17a
* | | | | | | | | am a828dd0d: am 0d9d7216: Merge "Rearrange a few of our MIME type ↵Elliott Hughes2014-08-262-6/+13
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registrations." into lmp-dev * commit 'a828dd0d222956774ca77db08b1c7e40de3faa94': Rearrange a few of our MIME type registrations.
| * | | | | | | | am 0d9d7216: Merge "Rearrange a few of our MIME type registrations." into ↵Elliott Hughes2014-08-262-6/+13
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '0d9d721694762218aeb26472a208057d72efc97c': Rearrange a few of our MIME type registrations.
| | * | | | | | | Merge "Rearrange a few of our MIME type registrations." into lmp-devElliott Hughes2014-08-262-6/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | Rearrange a few of our MIME type registrations.Elliott Hughes2014-08-222-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on looking at IANA and wikipedia. Bug: 16978217 Change-Id: I0d28c6d53ec26c7d5501f722b66dd50595e2a6b4
* | | | | | | | | | am 1a350cb2: am b0b81dfb: Move preference tests over from ↵Narayan Kamath2014-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/apache-harmony. * commit '1a350cb2103434af20c4f89a10d4be3b767e3896': Move preference tests over from external/apache-harmony.
| * | | | | | | | | am b0b81dfb: Move preference tests over from external/apache-harmony.Narayan Kamath2014-08-2617-0/+3228
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0b81dfb681cf401b3fc108b9abe432ee6736164': Move preference tests over from external/apache-harmony.
| | * | | | | | | | Move preference tests over from external/apache-harmony.Narayan Kamath2014-08-2617-0/+3228
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes all remaining failures. Most of them were due to us not setting "user.dir" and "user.home" correctly. Android has traditionally left those values blank. To fix these tests, we need to change the default prefs factory to one rooted at a temporary directory. Note that this change attempts the minimal possible cleanup (mainly style, commented code formatting etc.) to these files. bug: 13881847 (cherry picked from commit a152f62d4d81ef6500b3e02dbc381e2414f9a11f) Change-Id: Ie32a61e1b911dcd317c688f86e487f9ea778b31f
* | | | | | | | | am 73157cac: Merge "Fix the Turkish Lira test."Elliott Hughes2014-08-230-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '73157cacca0948d867a38c4fb91c9b4193bc3ee6': Fix the Turkish Lira test.
| * | | | | | | | Merge "Fix the Turkish Lira test."Elliott Hughes2014-08-231-5/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix the Turkish Lira test.Elliott Hughes2014-08-221-5/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turkey switched from "123,45 TL" to "₺123,45" in 2012. It's taken a while for our font to catch up, but now it has. (cherry-pick of c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.) Bug: 16727554 Change-Id: I3c80f95d5f620c905247c9f227171717180106b4
* | | | | | | | | am 0048cede: am 8f16ce1e: Merge "Fix the Turkish Lira test." into lmp-devElliott Hughes2014-08-231-5/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '0048cedeee39348a30bbb12dcf723f9ba2f5ab31': Fix the Turkish Lira test.
| * | | | | | | | am 8f16ce1e: Merge "Fix the Turkish Lira test." into lmp-devElliott Hughes2014-08-231-5/+7
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '8f16ce1e62f93defc80308c3ee3cdb22ab4953c1': Fix the Turkish Lira test.
| | * | | | | | | Merge "Fix the Turkish Lira test." into lmp-devElliott Hughes2014-08-231-5/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix the Turkish Lira test.Elliott Hughes2014-08-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turkey switched from "123,45 TL" to "₺123,45" in 2012. It's taken a while for our font to catch up, but now it has. Bug: 16727554 Change-Id: I3c80f95d5f620c905247c9f227171717180106b4
* | | | | | | | | | am 200f125b: Merge "Work around the snappily-titled ICANN "Name Collision ↵Elliott Hughes2014-08-230-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurrence Management Framework"." * commit '200f125b9f99ef5bdff03d9a8e2f762640bd14e5': Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
| * | | | | | | | | Merge "Work around the snappily-titled ICANN "Name Collision Occurrence ↵Elliott Hughes2014-08-232-4/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Management Framework"."
| | * | | | | | | | | Work around the snappily-titled ICANN "Name Collision Occurrence Management ↵Elliott Hughes2014-08-222-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework". Using a non-existent TLD is now a Bad Idea. (cherry-pick of a7d651e95e38974fa0de19247e8341df98a0b1b1.) Bug: 17146413 Change-Id: I6a68b4609d59a6d56ba780d03ffcf24a2759db48
* | | | | | | | | | am 5bd44cf9: am a7d651e9: Work around the snappily-titled ICANN "Name ↵Elliott Hughes2014-08-232-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collision Occurrence Management Framework". * commit '5bd44cf9f4ea68ee648b56321665e6b644283035': Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
| * | | | | | | | | am a7d651e9: Work around the snappily-titled ICANN "Name Collision ↵Elliott Hughes2014-08-232-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurrence Management Framework". * commit 'a7d651e95e38974fa0de19247e8341df98a0b1b1': Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
| | * | | | | | | | Work around the snappily-titled ICANN "Name Collision Occurrence Management ↵Elliott Hughes2014-08-222-4/+4
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework". Using a non-existent TLD is now a Bad Idea. Bug: 17146413 Change-Id: I6a68b4609d59a6d56ba780d03ffcf24a2759db48
* | | | | | | | | am ec494368: Merge "Avoid wrapping Class in WeakReference when class loader ↵Ian Rogers2014-08-221-7/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is null." * commit 'ec494368f467ca5235a6a52ff6b03b97141fa17d': Avoid wrapping Class in WeakReference when class loader is null.
| * | | | | | | | Merge "Avoid wrapping Class in WeakReference when class loader is null."Ian Rogers2014-08-221-7/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Avoid wrapping Class in WeakReference when class loader is null.Ian Rogers2014-08-221-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a missing case from one constructor by delegating to another. Change-Id: I8b85c97586dde2d72c9ac21216c594aa810d761b
* | | | | | | | | | am ec222f69: Merge "Support narrow am/pm markers in LocaleData."Elliott Hughes2014-08-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec222f69bf2a0ec8115582b01c7a5fdb9c2ae39a': Support narrow am/pm markers in LocaleData.
| * | | | | | | | | Merge "Support narrow am/pm markers in LocaleData."Elliott Hughes2014-08-223-2/+44
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-223-2/+44
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of ebe417d7808ac5bce5bc14d36d6af4c31218326d.) Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881
* | | | | | | | | | am 2d6b952b: am 014531bf: Merge "Support narrow am/pm markers in ↵Elliott Hughes2014-08-223-2/+44
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocaleData." into lmp-dev * commit '2d6b952b2a8fbc3f2637bd6b8ede1f3e931b2e1a': Support narrow am/pm markers in LocaleData.
| * | | | | | | | | am 014531bf: Merge "Support narrow am/pm markers in LocaleData." into lmp-devElliott Hughes2014-08-223-2/+44
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '014531bf3d38103d860f942f5bec45bdf31c75fa': Support narrow am/pm markers in LocaleData.
| | * | | | | | | | Merge "Support narrow am/pm markers in LocaleData." into lmp-devElliott Hughes2014-08-223-2/+44
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-223-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881