summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-11Merge "Snap for 5180536 from 9ec7ba8443caa905c2ebdf6eadd5e6148a348d37 to ↵pie-cuttlefish-testingAndroid Merger
pi-platform-release am: 971f83995e" into pie-cuttlefish-testing
2019-02-11Snap for 5180536 from 9ec7ba8443caa905c2ebdf6eadd5e6148a348d37 to ↵android-build-team Robot
pi-platform-release am: 971f83995e Change-Id: I793a82df6e6fe1c2c7f6941fc9a9b1627c9efca3
2019-02-09Snap for 5180536 from 9ec7ba8443caa905c2ebdf6eadd5e6148a348d37 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I671a68c64e83cb3e88bb12586858f7c41e5b18ed
2019-01-15Merge "Merge cherrypicks of [5929407, 5929627, 5929597, 5929598] into ↵Android Merger
pi-platform-release am: cc6534f8b1" into pie-cuttlefish-testing
2019-01-15Merge cherrypicks of [5929407, 5929627, 5929597, 5929598] into ↵android-build-team Robot
pi-platform-release am: cc6534f8b1 Change-Id: I4c95515534a4645dcbe3b2fc58afaf0a8737857d
2019-01-03Merge cherrypicks of [5929407, 5929627, 5929597, 5929598] into ↵android-build-team Robot
pi-platform-release Change-Id: If3e46dabb018bd841b657b8aafa60e399f5cf18b
2019-01-03libfscrypt: Add Adiantum supportGreg Kaiser
Adiantum is a crypto method Android is supporting for devices which don't have AES CPU instructions. See the paper "Adiantum: length-preserving encryption for entry-level processors" (https://eprint.iacr.org/2018/720.pdf) for more details. We add Adiantum to our list of supported encryption modes. Bug: 112010205 Test: Tested on a device Change-Id: I405ed454be1a447b7405417a05ddfd92a912bcb7 Merged-In: I405ed454be1a447b7405417a05ddfd92a912bcb7 (cherry picked from commit b56b389282b4805fac147c3fa36c2e27096ede97)
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi
Change-Id: I171c9c28f68e3f26e173dca9dc3fe0bb1bd68c95
2018-10-17Snap for 5073521 from 23fa94128f73282f62a410a37bdcd415265a62f7 to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: Ifd25050c008de078a60bfd28a6654ef9d5d658d7
2018-10-10Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1Bill Rassieur
Change-Id: I33214d649d8c198193394f9a1551c17485ce1f68 BUG: 117431430
2018-09-28libperfmgr: Update nodes in 2 passesandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devWei Wang
Some nodes have dependency in each other: e.g cpufreq min/max Bug: 116855734 Test: libperfmgr_test pass Change-Id: Ica639b94e78d40fd0f21fb8f241dc1887a6756fc
2018-08-16Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, ↵android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-releaseandroid-build-team Robot
4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2 Change-Id: I1c6f7313444440cb440c06018acc61841f919870
2018-08-16Revert "Support Speck encryption."Greg Kaiser
This is a partial revert of commit 6a0fa62dc71157f85b24ed15e39ada277f9b5201. Remove the Speck encryption support. It was eventually decided not to allow Speck in Android P, so this code is no longer needed and wasn't used outside of testing. We retain the e4crypt_get_policy_flags() changes from original commit, though. Bug: 112009351 Test: Confirmed AES continues to work with FBE. Change-Id: I53b091dd4c5392de7a00a8c168919fb55e527eaf (cherry picked from commit fa9ce0e4a240d50fde168369c2095d1e14241a97)
2018-08-08Snap for 4939496 from fa9ce0e4a240d50fde168369c2095d1e14241a97 to ↵android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releaseandroid-build-team Robot
pi-qpr1-release Change-Id: I07a2fb093806a835d82f109574cc774d4a487da5
2018-08-07Revert "Support Speck encryption."Greg Kaiser
This is a partial revert of commit 6a0fa62dc71157f85b24ed15e39ada277f9b5201. Remove the Speck encryption support. It was eventually decided not to allow Speck in Android P, so this code is no longer needed and wasn't used outside of testing. We retain the e4crypt_get_policy_flags() changes from original commit, though. Bug: 112009351 Test: Confirmed AES continues to work with FBE. Change-Id: I53b091dd4c5392de7a00a8c168919fb55e527eaf
2018-07-03simpleperf: fix test on APCT.pie-dr1-devYabin Cui
Bug: http://b/77470883 Test: run adb shell Test: /data/local/tmp/simpleperf_unit_test/simpleperf_unit_test. Change-Id: I640ad76b68842045f6ecdcb3cf686b7823d7d5db (cherry picked from commit 03a31c13168f6502883e8beb4dbc76bc064a54a0)
2018-05-24Snap for 4801384 from 932eb00d242d4bbb8fedbf07fe8cefd7b4b70ac9 to pi-releaseandroid-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r1android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r1security-pi-releasepie-security-releasepie-r2-s1-releasepie-r2-releaseandroid-build-team Robot
Change-Id: Iabfafb7b9a3201281abb56b7bc3f6e4e750ae0f1
2018-05-23Merge "Make logging much less verbose" into pi-devpie-devTreeHugger Robot
2018-05-22Make logging much less verbosePaul Crowley
On a broken device, this logging is much too verbose and obscures real information. Test: adb shell mkdir -p /data/media/10/foo, then create second Bug: 78592001 Change-Id: Idf235c65048187791a8e5f184a46ee802283de86
2018-05-22Snap for 4796401 from 27fdbce115dea066262333ef798980338a6d5c19 to pi-releaseandroid-build-team Robot
Change-Id: I37074d0d34ef5fd0708041b8fcdf3648a9687e5b
2018-05-20Snap for 4793185 from c4547885620f75af5c75c4bd59c2e9b6d36f35e3 to pi-releaseandroid-build-team Robot
Change-Id: I7be4492fc651976d69ba7071ece0d729320cc0a7
2018-05-19cppreopts: using /dev/block/by-name/system_{ab} for postinstallBowgo Tsai
/dev/block/bootdevice/by-name/system_{ab} should not be used because there is no requirement of a single boot device. Replace it with /dev/block/by-name/system_{ab}. Bug: 78613232 Test: factory wipe, reboot device to check logcat Change-Id: Ia3a476ef7a4b271eff90f44ef4e04fdbee17052b Merged-In: Ia3a476ef7a4b271eff90f44ef4e04fdbee17052b (cherry picked from commit 5ede0b2dc72585d14cc3ef09e6e8c5776dcac9a7)
2018-05-17Recursively list directories that break encryptionPaul Crowley
If we're unable to set or change encryption policy because the directory is not empty, log the contents that cause the problem Bug: 78592001 Test: adb shell mkdir -p /data/media/10/foo, then create second user Change-Id: I87cc46f09551728a7949659b21ae0401ae253e5e
2018-05-13Snap for 4778776 from 0db2d7b9dc463e4db33456b4944bb62d7281ba93 to pi-releaseandroid-build-team Robot
Change-Id: I806100e91a2940fa484164b05bbfb91166fe96ac
2018-05-11Merge changes I8fd41da0,I9a7ad445,I4e15cd4f,I896cfe8c,I5d80887a, ... into pi-devAndreas Gampe
* changes: Perfprofd: Minor fixes Perfprofd: Add string-based binder interface Perfprofd: Add ScopeGuard for file deletion Perfprofd: Fix binder interface Perfprofd: Use the right parameter Perfprofd: Expose more parameters in the simple binder interface Perfprofd: Add process to configreader Perfprofd: More scripts Perfprofd: Separate symbol offset in samples Perfprofd: Add parallel processing to stack script Perfprofd: Update perf_proto_stack
2018-05-09Snap for 4770446 from 34b5ed247cf41ff9889a9e9c3a413e017e690f58 to pi-releaseandroid-build-team Robot
Change-Id: Ib2efb29b68a13828199cc0840789af02b9edcee6
2018-05-08Append null byte to exPath.Rajeev Kumar
Note: Without this fix on Android Go device exPath gets some junk chars at the end of exPath because readlink() does not append a null byte to buf. Bug: 79430762 Test: Tested manually by running alloc-stress on Android Go device. Change-Id: I8e09d8c6d670b7d29e7f98c00dd8e9e9c5492169
2018-05-06Snap for 4765094 from 6f14272775fdf15ea8d7d616bc75ce6103a2226b to pi-releaseandroid-build-team Robot
Change-Id: I4e55ceca152e223f1e38afad5242296bb5654918
2018-05-03simpleperf: improve managing temp files.Yabin Cui
Instead of relying on callers to delete temp files, support managing all temp files in ScopedTempFiles. Bug: http://b/73127105 Test: run simpleperf_unit_test and simpleperf manually. Change-Id: Ib73065754657320ebd244f676e3f851544ff2718 (cherry picked from commit c68e66dcf067c052319c8da13a6a49ff06481fa5)
2018-05-03Perfprofd: Minor fixesAndreas Gampe
Set the allowed minimum for collection_interval to 0. Copy the sampling_frequency. Add "-m 8192" when call-stacks are requested. (cherry picked from commit 59a18215031faedc4bbee70baef363299cec0b69) Bug: 73175642 Test: mmma system/extras/perfprofd Test: perfprofd_test Merged-In: I8fd41da08eb14dadc98b85afe1e4dbed2d9bc9b1 Change-Id: I8fd41da08eb14dadc98b85afe1e4dbed2d9bc9b1
2018-05-03Perfprofd: Add string-based binder interfaceAndreas Gampe
Add a "weakly-typed" interface that works similar to the shellCommand implementation, encoding parameters into a string decoded by the ConfigReader. (cherry picked from commit 9301b6f524b8267f14c88b0e5e2ed64bbc186fd4) Bug: 73175642 Test: mmma system/extras/perfprofd Merged-In: I9a7ad4452ba7a040906e237a76b63e50fbe5aa24 Change-Id: I9a7ad4452ba7a040906e237a76b63e50fbe5aa24
2018-05-03Perfprofd: Add ScopeGuard for file deletionAndreas Gampe
Ensure that the temporary will be deleted. (cherry picked from commit 529af96ba77f26c1597d077ca55d051feeb5df3d) Bug: 73175642 Test: perfprofd_test Merged-In: I4e15cd4fa81a173a70126edaea5c0a0023b8c359 Change-Id: I4e15cd4fa81a173a70126edaea5c0a0023b8c359
2018-05-03Perfprofd: Fix binder interfaceAndreas Gampe
Actually forward to the right onTransact. (cherry picked from commit 109780d575f0776fca092b5a238a0bff21e3ece1) Bug: 73175642 Test: perfprofd_test Test: manual Merged-In: I896cfe8cf166c00bc49f4be5de8b19f913baad2d Change-Id: I896cfe8cf166c00bc49f4be5de8b19f913baad2d
2018-05-03Perfprofd: Use the right parameterAndreas Gampe
Fix a typo. (cherry picked from commit 51c08f9041648378717c79f787db773ac55e74b1) Bug: 73175642 Test: perfprofd_test Merged-In: I5d80887af08e3b3a1b19a1a303ca1c63bec75fbd Change-Id: I5d80887af08e3b3a1b19a1a303ca1c63bec75fbd
2018-05-03Perfprofd: Expose more parameters in the simple binder interfaceAndreas Gampe
Expose most interesting parameters. (cherry picked from commit 5a7181b3d3127660916e7a14057fdafa71c7d77b) Bug: 73175642 Test: mmma system/extras/perfprofd Merged-In: Ifab7f0a0c4a1e664a6b679c6f2d060f02eee232c Change-Id: Ifab7f0a0c4a1e664a6b679c6f2d060f02eee232c
2018-05-03Perfprofd: Add process to configreaderAndreas Gampe
So that it is exposed to the command line interface. (cherry picked from commit abc57274490870903f591140ad3a5cd509a0b372) Bug: 73175642 Test: mmma system/extras/perfprofd Test: perfprofd_test Test: manual Merged-In: I18903e860d91957dc53adeea9c1f12596fd7ff74 Change-Id: I18903e860d91957dc53adeea9c1f12596fd7ff74
2018-05-03Perfprofd: More scriptsAndreas Gampe
Add conversion of JSON files to a SQLite database, and aggregation of data in a SQLite database to a flamegraph. (cherry picked from commit 597f40df90fae8b89ce7672da6ab4825eb234d10) Bug: 73175642 Test: m Merged-In: I70827c7395b6a60a59ed420503434ad4b84a105f Change-Id: I70827c7395b6a60a59ed420503434ad4b84a105f
2018-05-03Perfprofd: Separate symbol offset in samplesAndreas Gampe
Separate out the offset from the start of the sample in the reporting struct. Parse the data from unwind_symbols. (cherry picked from commit b84d5fd0c6e67af069fe542149b0fc7d72844e50) Bug: 73175642 Test: manual Merged-In: I8910fa826cef0843dd9f98342df4203cb3ebf5c5 Change-Id: I8910fa826cef0843dd9f98342df4203cb3ebf5c5
2018-05-03Perfprofd: Add parallel processing to stack scriptAndreas Gampe
Allow to process multiple proto files in parallel. This will fork out each processed file into a subprocess, as making symbolization thread-safe is non-trivial. (cherry picked from commit 34c434d468d71e83b4ba9d69b1143c993ae1829e) Bug: 73175642 Test: manual Merged-In: I9bda1717e3f50569ad43f457413c7bc5831fd6a5 Change-Id: I9bda1717e3f50569ad43f457413c7bc5831fd6a5
2018-05-03Perfprofd: Update perf_proto_stackAndreas Gampe
Update the python script. Also clean it up. (cherry picked from commit afe71cfc8ce97887756aad613169358e28c45a62) Bug: 73175642 Test: manual: PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/development/scripts python -u system/extras/perfprofd/scripts/perf_proto_stack.py --syms /storage/perfprofd_symbols/out/target/product/walleye/symbols --skip-kernel-syms --print-samples --print-sym-histogram perf.data.encoded.0 Merged-In: I3d9c1eb0bca8818f53095d1410b5f95a0e93f24d Change-Id: I3d9c1eb0bca8818f53095d1410b5f95a0e93f24d
2018-04-29Snap for 4751833 from ca4e5e87e5bf18698638b43a4b0a954e1f900028 to pi-releaseandroid-build-team Robot
Change-Id: Idaef846e750b317ce347711bdef8bc77a7921b6d
2018-04-26Make the NOT_CONFIG_SYSVIPC test also exercise the syscallsLuis Hector Chavez
This change augments the NOT_CONFIG_SYSVIPC test, such that in addition to being evidence-based (by inspecting some paths in /proc), it also tries to invoke the syscalls. This is done because in some platforms like Chrome OS, the SYSVIPC kernel config is enabled (because some parts of the system require that to boot), but when Android is running, all SYSVIPC syscalls are blocked by an LSM in the kernel. It also changes the /proc/sysvipc path check from using access(2) and F_OK to R_OK, since the paths itself is present and visible. Bug: 77490033 Test: CtsKernelConfigTestCases Change-Id: I79df1816e0e5d3618da2a0e242c3d685352b7220 Merged-In: I79df1816e0e5d3618da2a0e242c3d685352b7220 (cherry picked from commit 687cd48d8bce5548c7bf1dcbbfd3fd770e452362)
2018-04-22Snap for 4736748 from 2381050555c065cb1b721d24c0ff511f027af1b5 to pi-releaseandroid-build-team Robot
Change-Id: I4f99bdc25e83ddb0615b5afc6363bf533f86d202
2018-04-21Merge "mkuserimg_mke2fs: Support passing reserved block percent" into pi-devTreeHugger Robot
2018-04-19libperfmgr: change to use Value directly in configWei Wang
Using Value directly is more clear and intuitive than using an index of Values. Bug: 77282526 Test: libperfmgr_test and boot wahoo Change-Id: I4414a2bb04be8bf3fc01c20695ebd6ac3c19df79
2018-04-15Snap for 4722539 from b3ebfaaeef2fa5fd3f1071b0fe8b9b92edbbdd2d to pi-releaseandroid-build-team Robot
Change-Id: Ifee7113065ba37d9696798b9dec18b2969c13758
2018-04-12Perfprofd: Add support for sampling frequencyAndreas Gampe
Allow sampling frequency (-f) besides sampling period (-c), and support simpleperf default values (when neither is set). (cherry picked from commit e4b2ed98a9a4a35ac4bb46c20b1599e0889eb3a3) Bug: 73175642 Test: mmma system/extras/perfprofd Test: perfprofd_test Merged-In: I40d7472bc45f5efd33687f9d8a5d6493343091c3 Change-Id: I40d7472bc45f5efd33687f9d8a5d6493343091c3
2018-04-11Snap for 4713750 from 0708cde464d97fc0a1b251f0431f6fe29f07b47d to pi-releaseandroid-build-team Robot
Change-Id: I3d4b832748ebe847799fa346e6ab5434a9aba33f
2018-04-06mkf2fsuserimg.sh: set fsverity feature bitJaegeuk Kim
Bug: 74604441 Bug: 67380979 Change-Id: I64800783437ed28054d0ada8cb6537bc6683b238 Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04Snap for 4698807 from 38e113b1496d22f09fcdb52139a56f541e0cbaf6 to pi-releaseandroid-build-team Robot
Change-Id: I6c23a9780d2df1d4d256f0473efe151b7901eded