summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 3a113341: am 4e95d23e: Introduce checks for integer overflow during division.Neil Fuller2014-09-110-0/+0
|\ | | | | | | | | * commit '3a113341fb95aa8fce3fbb4d1198cdd4a42ad783': Introduce checks for integer overflow during division.
| * am 4e95d23e: Introduce checks for integer overflow during division.Neil Fuller2014-09-111-0/+8
| |\ | | | | | | | | | | | | * commit '4e95d23e24ff6fd2810ee5cff409a9f1764eb003': Introduce checks for integer overflow during division.
| | * Introduce checks for integer overflow during division.Neil Fuller2014-09-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically, Android would refuse to perform calculations on memory grounds for large values or would cast to an int and produce incorrect result for diffScales outside of the int range. This change adds a check to prevent scale overflow for large scale division. Bug: 17393664 (cherry picked from commit f7cf74a44b2f5ff863de0d82d2efb6d17240ab3e) Change-Id: I94c829f184804a4fcbed67a180b7ce9684652311
* | | am 43edd425: Merge "Introduce checks for integer overflow during division."Neil Fuller2014-09-111-0/+8
|\ \ \ | | | | | | | | | | | | | | | | * commit '43edd4252569280730d7e81f6209df0adac23dda': Introduce checks for integer overflow during division.
| * \ \ Merge "Introduce checks for integer overflow during division."Neil Fuller2014-09-111-0/+8
| |\ \ \
| | * | | Introduce checks for integer overflow during division.Neil Fuller2014-09-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically, Android would refuse to perform calculations on memory grounds for large values or would cast to an int and produce incorrect result for diffScales outside of the int range. This change adds a check to prevent scale overflow for large scale division. Bug: 17393664 Change-Id: I090c271bb02379f35d3c4392aa38be2bb0cf431f
* | | | | am 226c3a99: Merge "Remove referenceStaticOffsets from Class.java since ↵Mingyao Yang2014-09-101-3/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | it\'s not needed anymore." * commit '226c3a99e6a28c274634a0102dd690798ea0ad0e': Remove referenceStaticOffsets from Class.java since it's not needed anymore.
| * | | | Merge "Remove referenceStaticOffsets from Class.java since it's not needed ↵Mingyao Yang2014-09-101-3/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | anymore."
| | * | | | Remove referenceStaticOffsets from Class.java since it's not needed anymore.Mingyao Yang2014-09-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16236588 Change-Id: Icebdf0febee72a5dbbebc1906b069d52bf756e80
* | | | | | am 6131de83: am 8806710d: High CPU load in java.nio using pollPrzemyslaw Jakwert2014-09-100-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '6131de83ed14d3149fc06c3fc55a345649e00621': High CPU load in java.nio using poll
| * | | | | am 8806710d: High CPU load in java.nio using pollPrzemyslaw Jakwert2014-09-101-1/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '8806710d7a5cd6a168f2463de21498c58f70948a': High CPU load in java.nio using poll
| | * | | | High CPU load in java.nio using pollPrzemyslaw Jakwert2014-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes when phone goes out of coverage CPU is stuck at high load when it should not. System.os.poll() returns the number of file descriptors ready to be processed, but since they all have revent=POLLERR, they are not handled/sent to the application. Next time application does Selector.select(), native will not block since there are FDs which have to be processed and Java will discard them again. As a result, Selector.select() gets called again and again, producing 100% CPU load per thread that polls for FDs with POLLERR set. The fix is to add POLLERR handling (POLLHUP is being handled already). Bug: 17456151 (cherry picked from commit f41df4f9710dafffdedb5fa6c40550532069036a) Change-Id: I3de249f5cac575da76cc16cdc7b986fb66417e04
* | | | | | am 3de4fce3: Merge "High CPU load in java.nio using poll"Elliott Hughes2014-09-101-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '3de4fce30986f4c1af6637e2fff51cdd99c795f0': High CPU load in java.nio using poll
| * | | | | Merge "High CPU load in java.nio using poll"Elliott Hughes2014-09-101-1/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | High CPU load in java.nio using pollPrzemyslaw Jakwert2014-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes when phone goes out of coverage CPU is stuck at high load when it should not. System.os.poll() returns the number of file descriptors ready to be processed, but since they all have revent=POLLERR, they are not handled/sent to the application. Next time application does Selector.select(), native will not block since there are FDs which have to be processed and Java will discard them again. As a result, Selector.select() gets called again and again, producing 100% CPU load per thread that polls for FDs with POLLERR set. The fix is to add POLLERR handling (POLLHUP is being handled already). Bug: 17456151 Change-Id: I04bbb8e64bf64aee1e95ea7a1a2e1d16c6e1c990
* | | | | | am f5ed8cb6: am 959e126e: Merge "Add Reference.getReferent for reference ↵Mathieu Chartier2014-09-100-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | intrinsic." into lmp-dev * commit 'f5ed8cb6387b3588c268a790ac30df37a27a85c4': Add Reference.getReferent for reference intrinsic.
| * | | | | am 959e126e: Merge "Add Reference.getReferent for reference intrinsic." into ↵Mathieu Chartier2014-09-101-1/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '959e126e5ec51670d35ab84e90720f82f54c8eaf': Add Reference.getReferent for reference intrinsic.
| | * | | | Merge "Add Reference.getReferent for reference intrinsic." into lmp-devMathieu Chartier2014-09-101-1/+13
| | |\ \ \ \
| | | * | | | Add Reference.getReferent for reference intrinsic.Mathieu Chartier2014-09-091-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference intrinsic was incorrectly inlining PhantomReference.get(). We get around this by adding a layer of indirection. Reference.get() now calls getReferent() which is intrinsified and inlined. Bug: 17429865 (cherry picked from commit ee1ba6114921065ff4629cdaee207e2960dadd63) Change-Id: I305686d76e0e03856a46b85955622939718c8d85
* | | | | | | am e3c2ce0b: Merge "Add Reference.getReferent for reference intrinsic."Mathieu Chartier2014-09-091-1/+13
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'e3c2ce0b26d1698929651380577afe11c71a465d': Add Reference.getReferent for reference intrinsic.
| * | | | | | Merge "Add Reference.getReferent for reference intrinsic."Mathieu Chartier2014-09-091-1/+13
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add Reference.getReferent for reference intrinsic.Mathieu Chartier2014-09-091-1/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference intrinsic was incorrectly inlining PhantomReference.get(). We get around this by adding a layer of indirection. Reference.get() now calls getReferent() which is intrinsified and inlined. Bug: 17429865 Change-Id: I39803506c7bd800500ca3632a6cdf1077e382bff
* | | | | | am dab346f4: am 1aec3841: Merge "libcore changes to support ConnectionPool ↵Neil Fuller2014-09-093-0/+184
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cache flushing" into lmp-dev * commit 'dab346f402594d3833676518a53f3b2f9e587227': libcore changes to support ConnectionPool cache flushing
| * | | | | am 1aec3841: Merge "libcore changes to support ConnectionPool cache ↵Neil Fuller2014-09-093-0/+184
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | flushing" into lmp-dev * commit '1aec38412faac75e65e65ea6a128768a8e513ebe': libcore changes to support ConnectionPool cache flushing
| | * | | | Merge "libcore changes to support ConnectionPool cache flushing" into lmp-devNeil Fuller2014-09-093-0/+184
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | libcore changes to support ConnectionPool cache flushingNeil Fuller2014-09-093-0/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A set of observer / listener components for network events. Party A, e.g. the Android ConnectivityManager, can make changes to network configuration that impacts the java network objects (e.g. connection pools, caches, etc.). Party B, e.g. Android libcore network components are interested in network configuration changes. The NetworkEventDispatcher enables Party A to communicate with Party B without hardcoding their details. Additional parties like B can be added. Bug: 17314604 Change-Id: I175bdf28662bafcf0c91acb51a3da5cbc2b69086
* | | | | | Remove an erroneous double-merge in the knownfailures.txt fileNeil Fuller2014-09-091-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original change in AOSP/master and the patch of the same change in lmp-dev created a monster. Change-Id: Ib6644022384e03b0dc9a268bb3926505adfccfd6
* | | | | | am bcc98757: am d4bbc220: Merge "Suppress broken apache-harmony beans CTS ↵Neil Fuller2014-09-091-0/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests" into lmp-dev * commit 'bcc9875756c27187ff332f855102657411346cd7': Suppress broken apache-harmony beans CTS tests
| * | | | | am d4bbc220: Merge "Suppress broken apache-harmony beans CTS tests" into lmp-devNeil Fuller2014-09-091-0/+17
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'd4bbc2208c1e951e8338b2fdf04b78f6352b9275': Suppress broken apache-harmony beans CTS tests
| | * | | | Merge "Suppress broken apache-harmony beans CTS tests" into lmp-devNeil Fuller2014-09-091-0/+17
| | |\ \ \ \
| | | * | | | Suppress broken apache-harmony beans CTS testsNeil Fuller2014-09-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the apache-harmony serialization tests is package-sensitive. The other tests suppressed probably broke due to a fix in the Android fork of harmony (commit 19a270e90b1e992c1f6639f355ae13564c2f3a6a). The code may be incorrect but if so it has been broken subtly since Dec 2010. Bug 17433734 has been created to investigate. Bug: 17394106 (cherry picked from commit e9121d6ce39668597349e818135214adc92285e5) Change-Id: Ia53e9390c153f8fc7110c360ac635b4ef8fd783c
* | | | | | | am c08326f1: am 8d1751d2: Merge "Suppress one more apache-harmony sql test" ↵Neil Fuller2014-09-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c08326f193b862a3533887f91f3c96f71a1bedc8': Suppress one more apache-harmony sql test
| * | | | | | am 8d1751d2: Merge "Suppress one more apache-harmony sql test" into lmp-devNeil Fuller2014-09-091-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8d1751d2a1209ace0d09a2d340ce4f494a8dd142': Suppress one more apache-harmony sql test
| | * | | | | Merge "Suppress one more apache-harmony sql test" into lmp-devNeil Fuller2014-09-091-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Suppress one more apache-harmony sql testNeil Fuller2014-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is broken and is being suppressed: com.android.org.apache.harmony.sql.tests.java.sql.DataTruncationTest Bug: 17342415 (cherry picked from commit 51ff72e84d7f862fc4193dbc747de07cd30e5226) Change-Id: I811a6c032d7c73e77c67d94d47639a6d806b7238
* | | | | | | am a7714ae5: am 8e993fc0: Re-apply: Relax KeyPairGeneratorTestNeil Fuller2014-09-091-8/+43
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a7714ae5e1becaecc6a479fe83386826570f120f': Re-apply: Relax KeyPairGeneratorTest
| * | | | | | am 8e993fc0: Re-apply: Relax KeyPairGeneratorTestNeil Fuller2014-09-091-8/+43
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8e993fc06f66f95caf5e9fbb6444053b6d82a67d': Re-apply: Relax KeyPairGeneratorTest
| | * | | | | Re-apply: Relax KeyPairGeneratorTestNeil Fuller2014-09-091-8/+43
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing KeyPairGeneratorTest to handle different number of providers. This change has been reapplied: it was undone by a bad merge. This is a re-application of commit 11d630b19f9f3f7db427823b347aff09ab4cfb69 Bug: 5513723 Bug: 17377106 (cherry picked from commit ea1843890fbcefbd907dfbe5fed4afb8cfa6b21f) Change-Id: I781d4017770570a5c3d9672cc55eab51b75c0368
* | | | | | am a306da74: am b249fdd5: Merge "Removing differences between AOSP and ↵Neil Fuller2014-09-092-24/+31
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal" into lmp-dev * commit 'a306da74769656dc066982aff16cde78a735e5d0': Removing differences between AOSP and internal
| * | | | | am b249fdd5: Merge "Removing differences between AOSP and internal" into lmp-devNeil Fuller2014-09-092-24/+31
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b249fdd553dbe82a85917b1520ad5e3a59b01d17': Removing differences between AOSP and internal
| | * | | | Merge "Removing differences between AOSP and internal" into lmp-devNeil Fuller2014-09-092-24/+31
| | |\ \ \ \
| | | * | | | Removing differences between AOSP and internalNeil Fuller2014-09-042-24/+31
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These commits were equivalent but not exactly the same: AOSP commit: adb19b9b603ba83ba49b1a10b6301e396132bf3b Internal commit: 18e74061b760389a94439f4b14acb376809a44ce This commit makes the internal files the same as AOSP to make future diffs easier. Change-Id: Ie2dcdd3940244c6dd18334b58037d2e8cca93920
* | | | | | am 2ead7d19: Merge "Suppress one more apache-harmony sql test"Neil Fuller2014-09-091-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '2ead7d19c4fe15fbe4dff32866204de6d4c9835c': Suppress one more apache-harmony sql test
| * | | | | Merge "Suppress one more apache-harmony sql test"Neil Fuller2014-09-091-0/+1
| |\ \ \ \ \
| | * | | | | Suppress one more apache-harmony sql testNeil Fuller2014-09-091-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is broken and is being suppressed: com.android.org.apache.harmony.sql.tests.java.sql.DataTruncationTest Bug: 17342415 Change-Id: I5dd2f506400fff7c290e27adf4d3bd34f0624044
* | | | | | am b7ddd5ec: Merge "Suppress broken apache-harmony beans CTS tests"Neil Fuller2014-09-091-0/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b7ddd5ec95ffc8fb698bbcf5cf07aadf528c2cac': Suppress broken apache-harmony beans CTS tests
| * | | | | Merge "Suppress broken apache-harmony beans CTS tests"Neil Fuller2014-09-091-0/+17
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Suppress broken apache-harmony beans CTS testsNeil Fuller2014-09-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the apache-harmony serialization tests is package-sensitive. The other tests suppressed probably broke due to a fix in the Android fork of harmony (commit 19a270e90b1e992c1f6639f355ae13564c2f3a6a). The code may be incorrect but if so it has been broken subtly since Dec 2010. Bug 17433734 has been created to investigate. Bug: 17394106 Change-Id: I654d82b607e5487e0e6614ec4bcc5be98a9394e9
* | | | | | am 93a9f4ec: am 8ed3c715: Merge "Libcore: Add parameter to zygote hook" into ↵Andreas Gampe2014-09-090-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '93a9f4eca6327ff25d62de090dd970e81e554a3d': Libcore: Add parameter to zygote hook
| * | | | | am 8ed3c715: Merge "Libcore: Add parameter to zygote hook" into lmp-devAndreas Gampe2014-09-091-4/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '8ed3c7157273af3e3b4cbd8eae501bc94f03c038': Libcore: Add parameter to zygote hook