summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-08Merge "Snap for 6948038 from e5fb8f461bcc7e1e38bd002cd22b7be546b34127 to ↵android11-gsiAutomerger Merge Worker
rvc-platform-release am: c1367197f4" into android11-gsi
2020-12-08Snap for 6948038 from e5fb8f461bcc7e1e38bd002cd22b7be546b34127 to ↵android-build-team Robot
rvc-platform-release am: c1367197f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/12979201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a3af72431db070a7b86fe317ac0a2a00b7da298
2020-11-03Snap for 6948038 from e5fb8f461bcc7e1e38bd002cd22b7be546b34127 to ↵android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android11-platform-releaseandroid-build-team Robot
rvc-platform-release Change-Id: I02c16cb82184afb944efab3f7f1b8ebefc63c0e9
2020-10-06Merge commit 'fefd3bcbd0dbe8ca5401208c7f418a673be74609' into HEADYimin Li
Change-Id: I82efa701a5519db7a6dc355565c9f22cc8e4a2fd
2020-09-03Snap for 6812348 from b35a59eb33bb335baddf367208f5c684b66d3c85 to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid-build-team Robot
rvc-qpr1-release Change-Id: Ib7dcdcb8537b4ce3b22f13a894f5984b445447e2
2020-09-03ext4_utils: add declaration for ext4_bg_has_super_block()Will Shiu
Add a declaration for ext4_bg_has_super_block() so that the encrypt-in-place code in vold can use it to determine whether a backup superblock is present in a block group. Bug: 162479411 Bug: 161871210 Merged-In: Ic090bf4e88193b289b04c5254ddf661ef40b037e Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-08-12ext4_utils: add declaration for ext4_bg_has_super_block()android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseWill Shiu
Add a declaration for ext4_bg_has_super_block() so that the encrypt-in-place code in vold can use it to determine whether a backup superblock is present in a block group. Bug: 162479411 Bug: 161871210 Merged-In: Ic090bf4e88193b289b04c5254ddf661ef40b037e Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-07-15Snap for 6680390 from 6cbcea87a648bc236c8ec97914e342f4a0c4e8a5 to ↵android-build-team Robot
rvc-release am: 8524862f32 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/12154090 Change-Id: I456aa9ca21dcb967a3c30af4dbd03ea378fa2605
2020-07-15Snap for 6680390 from 6cbcea87a648bc236c8ec97914e342f4a0c4e8a5 to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-security-releaseandroid11-s1-releaseandroid11-releaseandroid-build-team Robot
Change-Id: I3cece9a2e4de9f09e946f76b00fb277fca02633b
2020-07-14Snap for 6680110 from b2dccf1e0de430806f6cd55a809143435b7e857b to ↵android-build-team Robot
rvc-qpr1-release Change-Id: Ie224cbfaed2ec99e62018b76d7a2f5c556940ccc
2020-07-14Make bootctl work on devices that does not have v1.1 API am: 6cbcea87a6 am: ↵Håkan Kvist
07e09a6ba3 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/12128008 Change-Id: I81a7887d7274c2fc93904d119f7d5b48cc6714ce
2020-07-14Make bootctl work on devices that does not have v1.1 API am: 6cbcea87a6android-11.0.0_r16android11-d1-b-releaseHåkan Kvist
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/12128008 Change-Id: Ifde03a5f1d91740c4b353d7ee6a71f48eaa5e45d
2020-07-14Make bootctl work on devices that does not have v1.1 APIandroid-cts-11.0_r2android11-devHåkan Kvist
Execute the commands with the API version where the command was introduced. This makes it possible to run the v1.0 HAL commands on a device where v1.1 HAL implementation is not available. Without this patch, on devices that only support bootcontrol v1.0 API, bootctl would just fail with error message. Bug: 160405575 Test: Execute command on device that only implements v1.0 API adb shell bootctl hal-info Change-Id: I56e9a81bcae49b6859b04394d571b5151a235675 Signed-off-by: Håkan Kvist <hakan.kvist@sony.com> Signed-off-by: Alessio Balsini <balsini@google.com>
2020-06-12Snap for 6582636 from 9f0e7264b2c7cd7f20c7ce559e1692b93c67a430 to ↵android-build-team Robot
rvc-release am: 4888e1aa48 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11845091 Change-Id: I3716ff90c3dc5495a0e90954e60fdc6670901791
2020-06-12Snap for 6582636 from 9f0e7264b2c7cd7f20c7ce559e1692b93c67a430 to rvc-releaseandroid-build-team Robot
Change-Id: Ia633872d63a12c43ee6d492eee2aea252ddbc827
2020-06-11Fixing bug in bootanalyze when the event time is 0 am: 9f0e7264b2 am: 4f61898bd2Jyoti Bhayana
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11829463 Change-Id: Ieb7defcfe0e15ee413eea8573ae2ea3d913388cd
2020-06-11Fixing bug in bootanalyze when the event time is 0 am: 9f0e7264b2Jyoti Bhayana
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11829463 Change-Id: I8dce95af33f6704e287a72849c6846f37dfce346
2020-06-11Fixing bug in bootanalyze when the event time is 0Jyoti Bhayana
Bug:158702468 Test: Run bootanalyze and see there is no error when the event time is 0 Change-Id: If3efa4c33a70cf6168a777f0f442fe1557b600b4
2020-06-08Snap for 6564423 from 756a972f99ed337c3a5b4735969596708861cf64 to ↵android-build-team Robot
rvc-release am: 8a673868f8 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11764517 Change-Id: I5e5fb6aeff835638bc0feaa136e777cc986dd45f
2020-06-06Snap for 6564423 from 756a972f99ed337c3a5b4735969596708861cf64 to rvc-releaseandroid-build-team Robot
Change-Id: Iad7d55ba99cd81a867ede44fd7b46472881a94d2
2020-06-05simpleperf: add Broadcom STB into whitelist, omit tests requiring hw ↵Natalie Chiu
counters. am: 756a972f99 am: edbaad6e8f Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11735563 Change-Id: Ifc9655287544bc309ee1ea875e7813cb8c265456
2020-06-05simpleperf: add Broadcom STB into whitelist, omit tests requiring hw ↵Natalie Chiu
counters. am: 756a972f99 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/11735563 Change-Id: Ibf73c7aca5e698ce98b4e7a3a955ab746e8d1121
2020-06-04simpleperf: add Broadcom STB into whitelist, omit tests requiring hw counters.Natalie Chiu
Some Socs like Broadcom STB will not be available when disable jtag(non-invasive debug), so omit tests requiring hw counters on them. Bug: 158095412 Bug: 154157678 Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters Test: hw counters. Change-Id: Iddfb34bfa1d66e37398bb162f8e1cfa645d756f4 Merged-In: Iddfb34bfa1d66e37398bb162f8e1cfa645d756f4 (cherry picked from commit 572c226db410b2c3b20e3a63cc6c5e9f0aeed65c)
2020-05-31Snap for 6546046 from 9760d1a21d405d944fc093f434d093023832b367 to ↵android-build-team Robot
rvc-release am: 9e5220d6a2 Change-Id: Ib847c8ef15a2c5a1bc9f350957859c491f45f247
2020-05-31Snap for 6546046 from 9760d1a21d405d944fc093f434d093023832b367 to rvc-releaseandroid-build-team Robot
Change-Id: I2d5c65ba6b7c8c34d8606a3584d7936251e4973d
2020-05-31Fix the parsing of images without hashtree descriptor am: 9760d1a21d am: ↵Tianjie
187881e596 Change-Id: I789e6a0ee79ed14cd6b6e9ec0776004aa1f5c80e
2020-05-31Fix the parsing of images without hashtree descriptor am: 9760d1a21dTianjie
Change-Id: I53fc8b07ab20aea0378553f1e523e3d2abfa67d8
2020-05-29Fix the parsing of images without hashtree descriptorTianjie
It's possible that the an image doesn't contain a hashtree descriptor. And the current raises a segfault when we attempt to validate and copy a non existing descriptor. Bug: 157778739 Test: call fec_open on dtbo image. Change-Id: Ieb5acf016ceeb547f2b23de43d4276ea4d013a6f (cherry picked from commit 90e7155bdd10039448bbc5ee4636f14c0119718e)
2020-05-24Snap for 6523887 from 20a5aa5fdedf81f9b415e92bc09fdfa59bfb583c to ↵android-build-team Robot
rvc-release am: 44c75910d1 Change-Id: I6025e389eb044cba4d496802f0f7e9fc9c9f4462
2020-05-24Snap for 6523887 from 20a5aa5fdedf81f9b415e92bc09fdfa59bfb583c to rvc-releaseandroid-build-team Robot
Change-Id: Ia5b0f65b2245a11c36e30688cb73df569f65f122
2020-05-23Add emmc_optimized flag am: 20a5aa5fde am: dc112f4f91Paul Crowley
Change-Id: I507ad23ff46287a7feed950da7fb7d22ea0dfbc6
2020-05-23Add emmc_optimized flag am: 20a5aa5fdePaul Crowley
Change-Id: Iea606c456f5c57043069c0d39a6d8efbf39a075a
2020-05-21Add emmc_optimized flagPaul Crowley
Bug: 144046242 Test: atest libfscrypt_unit_test Test: Change fstab on Cuttlefish with patched kernel, check dir policy Cherry-Picked-From: 476ce0a30615c1249969bedba0f1fb084d8ef193 Merged-In: I362f9a55fa28bb25afe992c8b0bae48546fc9ab0 Change-Id: I362f9a55fa28bb25afe992c8b0bae48546fc9ab0
2020-04-24Snap for 6424828 from 901a08a73484b0989530fb9fc7de0829d13d6757 to rvc-releaseandroid-build-team Robot
Change-Id: I3bbfe4f5d361406b4fd073014ca47a25eb2a931f
2020-04-23simpleperf: adjust based on opencsd change. am: 901a08a734 am: f282db15a7Yabin Cui
Change-Id: I38e7747833b8dcd798b10cefc6cb5ee4a9694465
2020-04-23simpleperf: add MapLocator for etm decoding. am: 10f527cb16 am: 785ed62a9aYabin Cui
Change-Id: Iddb46d6eb93d97d3100015dc4485f1d6dafacac2
2020-04-23simpleperf: add class interface to read elf files. am: ba4e42a893 am: 38568ac7cfYabin Cui
Change-Id: I4a3d7262d80244f10b927dd74ea3060cc16b089a
2020-04-23simpleperf: adjust based on opencsd change. am: 901a08a734Yabin Cui
Change-Id: I8d4abf72e13a709deb28debf93ed60dd95c0fbbe
2020-04-23simpleperf: add MapLocator for etm decoding. am: 10f527cb16Yabin Cui
Change-Id: If6529f8519e710ca35f48694ae93c59834751aef
2020-04-23simpleperf: add class interface to read elf files. am: ba4e42a893Yabin Cui
Change-Id: Ib33f81c7962ab0a61f191a3795abfcc01b2486f3
2020-04-24simpleperf: adjust based on opencsd change.Yabin Cui
Currently, simpleperf gets branch_addr from instruction decoder. But OpenCSD is changed to cache InstrRange elements. Thus when simpleperf gets an InstrRange element, the instruction decoder may point to an instruction executed later. Fix it by using the start_addr of the next InstrRange element as the branch_addr of the current InstrRange element. Also add a test. Also use recorded binary path in output to help test. Bug: 153039105 Test: run simpleperf manually so the inject result doesn't Test: change for a 10s system wide recording data. Test: run simpleperf_unit_test. Change-Id: I6fdf32d3bac18ed3762c944c282ec881d09395b4 Merged-In: I6fdf32d3bac18ed3762c944c282ec881d09395b4 (cherry picked from commit 2c294914c1eeb30754a8a2449795b296bd2176e9)
2020-04-24simpleperf: add MapLocator for etm decoding.Yabin Cui
Add MapLocator as a packet callback. It is then used to find maps in MemAccess and InstrRangeParser. MapLocator uses a separate cache for each trace id. It also fix a bug that let a kernel map override following user maps. Bug: 153039105 Test: run simpleperf_unit_test. Change-Id: Ic285f81ac05c3e65b481fb97a5355282639692e4 Merged-In: Ic285f81ac05c3e65b481fb97a5355282639692e4 (cherry picked from commit 418ba0d37570172c4ee5e24fc452b3a5ef9ae665)
2020-04-24simpleperf: add class interface to read elf files.Yabin Cui
This is to keep file mapping memory buffer. And support reading more than one content in one open instance in the future. It also supports embedded elf files in apks as normal elf files. Bug: 153039105 Test: run simpleperf_unit_test. Change-Id: Ia424926d112cbcd9970f11ffa56d047ff6df7872 Merged-In: Ia424926d112cbcd9970f11ffa56d047ff6df7872 (cherry picked from commit 02e2033f9ef34be0189e151bf6fef60b1285afd9)
2020-04-21Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: ↵Jiyong Park
0a3eb7e28b am: 1b52bd6fb2 Change-Id: Ifa360e7a2bdd773d903fa990fbf847e8ed5ef281
2020-04-21Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: 0a3eb7e28bJiyong Park
Change-Id: Ie6271dccf7788d7ecdcbe134f73bc755a750f63d
2020-04-21Snap for 6412615 from 0a3eb7e28bafafce2dcf396fee86f75f7897b9df to rvc-releaseandroid-build-team Robot
Change-Id: Ic37d96b92df1340182e3d8200e6feebde0428cd8
2020-04-20Merge "Mark some aidl_interface modules as unstable" into rvc-devJiyong Park
2020-04-18Snap for 6406367 from fe83faa0694153c4eb5558afee0b2de7b6658f25 to rvc-releaseandroid-build-team Robot
Change-Id: Icea7e7c534461e77ecd891fa53f713c091f9b9ab
2020-04-17simpleperf: Fix record_java_app test. am: fe83faa069 am: 5cfe1ca798Yabin Cui
Change-Id: Ibe94bca6217a84cd48ae321f6b2d0cf3886a2fd6
2020-04-17simpleperf: Fix record_java_app test. am: fe83faa069Yabin Cui
Change-Id: Ibc1f192780f0d15720c06a9c1d77dbd66a8dca68