summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-11merge in nyc-mr1-release history after reset to nyc-mr1-devandroid-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasegitbuildkicker
2016-08-11Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-devandroid-cts-7.1_r2nougat-mr1-devNick Desaulniers
2016-08-10procrank: fix bounds check to prevent heap overflowNick Desaulniers
Bug: 30774296 Change-Id: I44005caaa3cc17fe829f375a4cfeb5a464c97fbe
2016-08-10merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker
2016-08-09Fix binderAddInts benchmarkJohn Reck
Bug: 30765667 Restores the fork() that was missed in a refactor causing the benchmark to no longer measure binder's IPC performance. Change-Id: Id79ab082f1d20e1d058f80bd43018c9737b8250b
2016-07-31merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker
2016-07-27Run preloads_copy.sh as system:systemFyodor Kupolov
Root is not required, and most importantly system_server won't be able delete preloads folder during cleanup. Bug: 30280710 Change-Id: I41890834467cc51b7b4ebd9c2918a47904f0b377
2016-07-26Optional script to copy preloads to data directoryFyodor Kupolov
Bug: 29940807 Change-Id: Iba4deaecb5a4055ad10b92829f37ecd3cf8a5ee0
2016-07-20merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker
2016-07-19cppreopts: parallel cppreopts to improve performanceWei Wang
Bug: 30118894 Bug: 30189706 Change-Id: I0ed0c69873313a3bfaf2e1ff217da59b0f8929c1
2016-07-13merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker
2016-07-12Basic A/B bootloader tests via bootctlJed Estep
Change-Id: Ie7868cc205859c657e905e60ab6928517f02edb8
2016-07-03merge in nyc-mr1-release history after reset to nyc-mr1-devThe Android Automerger
2016-06-29Copy preopted files from B partition.Alex Light
This translates from the preopted files in the system_other partition into the main dalvik-cache. This also has init scripts to allow this to run. We first copy to a temporary file before renaming them in order to make the copy atomic. Bug: 29278988 Change-Id: I8bf1b2d021998949fd9996a923be7db9691e6a1e
2016-06-29Merge "Copy preopted files from B partition." into nyc-mr1-devAlex Light
2016-06-29ANRdaemon: move trace result from /sdcard to /data am: d93aa41807 am: adfc967454Zhengyin Qian
am: 20e3c1bc94 Change-Id: Ib688c2e38c181d6fdc2ca901782934dc4726eb52
2016-06-29ANRdaemon: move trace result from /sdcard to /data am: d93aa41807Zhengyin Qian
am: adfc967454 Change-Id: I4f8d4551c3ab2f5430600af833ced564aa328a55
2016-06-29ANRdaemon: move trace result from /sdcard to /dataZhengyin Qian
am: d93aa41807 Change-Id: I487116b8261bcef0fc9b829eaf38408d8a47ee78
2016-06-29Copy preopted files from B partition.Alex Light
This translates from the preopted files in the system_other partition into the main dalvik-cache. This also has init scripts to allow this to run. We first copy to a temporary file before renaming them in order to make the copy atomic. Bug: 29278988 Change-Id: I8bf1b2d021998949fd9996a923be7db9691e6a1e
2016-06-28merge in nyc-mr1-release history after reset to nyc-mr1-devThe Android Automerger
2016-06-27Simpleperf: fix flaky tests.Yabin Cui
am: a486a4b8ae Change-Id: I194792e233c6ccdd695e04ed2a58f7f1034f0494
2016-06-27Simpleperf: fix flaky tests.nougat-devYabin Cui
Simpleperf stat/record command may need 1 second to set security.perf_harden property. So the monitored child threads should run longer than 1 second. Bug: 29763505 Change-Id: I9bf6dcba03f3fc5c91130f38a08ce0062e104103
2016-06-22ANRdaemon: move trace result from /sdcard to /dataZhengyin Qian
Bug: 28765756 Change-Id: Ic9461bc66c8ba4df1455d8b75c4fb6b544d0cf27
2016-06-19merge in nyc-mr1-release history after reset to nyc-mr1-devThe Android Automerger
2016-06-17libfec: pack the fec_header structureJeremy Compostella
The fec_header structure is generated build time and stored on disk. The fec_header might be build on a 64 bits machine while it is read per a 32 bits device or the other way around. In such situations, the fec_header fields are not aligned as expected by the device and it fails to read the fec_header structure. This patch makes the fec_header packed. Change-Id: I77546f850cea5559909971a1192e1a7616d22d50 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-06-16resolve merge conflicts of 041bdd8 to nyc-mr1-devMohamad Ayyash
Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e
2016-06-16Merge "libfec: pack the fec_header structure" into nyc-mr1-devThierry Strudel
2016-06-16libfec: pack the fec_header structureJeremy Compostella
The fec_header structure is generated build time and stored on disk. The fec_header might be build on a 64 bits machine while it is read per a 32 bits device or the other way around. In such situations, the fec_header fields are not aligned as expected by the device and it fails to read the fec_header structure. This patch makes the fec_header packed. Change-Id: I77546f850cea5559909971a1192e1a7616d22d50 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-06-16Merge "mksquashfsimage.sh: Make disable-4k-align a paramter" into nyc-devMohamad Ayyash
2016-06-15mksquashfsimage.sh: Make disable-4k-align a paramterMohamad Ayyash
BUG: 29388879 Change-Id: I6ede2273419ba986d08decc0540741c54ed736b1 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-15resolve merge conflicts of 7354c0e to nyc-mr1-devMohamad Ayyash
Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41
2016-06-15Merge changes from topic 'squashfs_ota_incrementals' into nyc-devMohamad Ayyash
* changes: Disable fragments and duplicates detection for squashfs mksquashfsimage.sh: Add support for passing block map files
2016-06-13Disable fragments and duplicates detection for squashfsMohamad Ayyash
They don't play nicely with generating block maps. Fragments reduce performance. A later patch will add workaround for duplicate detection. BUG: 22322817 Change-Id: I01c731202ef7a2450b5d1beca627a0158c9cc3b4 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-13mksquashfsimage.sh: Add support for passing block map filesMohamad Ayyash
BUG: 22322817 Change-Id: I7e17f6ad3a503ee97f7a81a1a8382cff47a913c6 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-11Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into ↵Yabin Cui
nyc-dev am: 4d9e9c66fb Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b
2016-06-11Merge "simpleperf: restore perf_harden after simpleperf cts test." into nyc-devYabin Cui
2016-06-10simpleperf: restore perf_harden after simpleperf cts test.Yabin Cui
Bug: 29264324 Change-Id: Ia78ef924f049630968d222729cf3c1f378105b8a (cherry picked from commit 5896132e00c7e49d2468d7ebd5372654df29b872)
2016-06-11simpleperf: check perf event limit.Yabin Cui
am: 92c688b1f7 Change-Id: Ia53e2043e66f91a791e97353e7937ef1a4050d69
2016-06-10simpleperf: check perf event limit.Yabin Cui
The property security.perf_harden is added in https://android-review.googlesource.com/#/c/233736/5. And simpleperf needs to notice that. Bug: 29054680 Change-Id: I5f1593f5b389d182a56c4bf3bd438a1dc2b66686 (cherry picked from commit ebf79f3a65c81ef0f8cd7a3b875771be88157fcc)
2016-06-07Do not build multinetwork tools when targeting the PDKErik Kline
am: 600c6341e6 * commit '600c6341e62c165c60f526174d965cc7f1b30c38': Do not build multinetwork tools when targeting the PDK Change-Id: I1475ee586faf10942e805c51290d83aa1998cb5e
2016-06-07Do not build multinetwork tools when targeting the PDKErik Kline
Bug: 29071416 Change-Id: Ie39cad3151907aabbf523895d6cde37b82ff29a2
2016-06-07libfec: return raw and corrected verity metadata signaturesSami Tolvanen
am: 65cbaeb020 * commit '65cbaeb020b209f3d75d594ebbe49a609dd3c7e7': libfec: return raw and corrected verity metadata signatures Change-Id: I77bb88a549c2da0ed69f36d80ca6d93ed91a163b
2016-06-06libfec: return raw and corrected verity metadata signaturesSami Tolvanen
Since it's not possible for libfec to identify whether the signature field was successfully corrected, return both and allow the caller to validate either signature. Bug: 28943429 Change-Id: Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19
2016-06-06Merge "Introduce squashfs compression threshold" into nyc-mr1-devMohamad Ayyash
2016-06-03Introduce squashfs compression thresholdMohamad Ayyash
If we can't beat that compression ratio for a single block then we leave it uncompressed. The choice of the threshold depends on the cost of I/O in a specific device which is determined from block I/O speed and CPU speed. BUG: 29058965 Change-Id: I8d17a4551c7d00ddb85687381b7cb0d6c60babf6 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-05-31Add multinetwork debugging tools, dnschk and httpurlErik Kline
am: 871e63d9b7 * commit '871e63d9b7e584bc398dd4aa983cf561a5e8394e': Add multinetwork debugging tools, dnschk and httpurl Change-Id: Iffea34208fb19daa3b1f2c015364dff3a6542498
2016-05-30Add multinetwork debugging tools, dnschk and httpurlErik Kline
Bug: 19537384 Bug: 27199751 Bug: 28719525 Change-Id: Ie983ec12ac6c550fa76c89cd44343220688a99b4
2016-05-27ANRdaemon: add README and a bash script to easily get trace. am: 9e90477a67 ↵Zhengyin Qian
am: 4b7f0b27a2 am: 27879586ff * commit '27879586fff26d5ac1864f57bf441a39f8ab9315': ANRdaemon: add README and a bash script to easily get trace. Change-Id: Ib39181c0fd9901619a8a300f8a358e8918471e5b
2016-05-27ANRdaemon: add a few new trace options and poke all userland services am: ↵Zhengyin Qian
5b42895d33 am: ecb5849a5d am: 90ce7ac45f * commit '90ce7ac45f183aad12151d691f82a4a9c9a78f2f': ANRdaemon: add a few new trace options and poke all userland services Change-Id: I31faaec8cfcc377ae4f7fc12cc94e634503df04a
2016-05-27ANRdaemon: increase the CPU threshold resolution to 0.01% am: 6d25c0bd81 am: ↵Zhengyin Qian
c33bbcd4c7 am: 05d982d4ed * commit '05d982d4edde37937c9a6fdb97e36a492e18f7d5': ANRdaemon: increase the CPU threshold resolution to 0.01% Change-Id: If7ad5c8aa7fa2b1314ed33ad0eb4f29d82ad4fa5