summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-04-08Snap for 8426163 from 32de8f096284c67d90c8bb97cb7596d2b8256346 to mainline-tz...android-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100Android Build Coastguard Worker
2021-10-07Snap for 7803083 from 17171f422ad0cd7b21d54bdc08964bbecd10c64c to mainline-tz...Android Build Coastguard Worker
2021-08-13Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 156...android-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-releasePaul Crowley
2021-08-13Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-devPaul Crowley
2021-08-13Revert^2 "Detect factory reset and deleteAllKeys"Paul Crowley
2021-08-12Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c81...Shawn Willden
2021-08-12Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-devShawn Willden
2021-08-12Revert "Detect factory reset and deleteAllKeys"Shawn Willden
2021-08-11Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3TreeHugger Robot
2021-08-11Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-devandroid12-devTreeHugger Robot
2021-08-11Detect factory reset and deleteAllKeys am: 0f74bd4811Paul Crowley
2021-08-11Add ROLLBACK_RESISTANCE tag to key usage[6;7~
2021-08-11Detect factory reset and deleteAllKeysPaul Crowley
2021-06-25Ignore too-early earlyBootEnded on FDE devices am: 2ddc1338d7Eric Biggers
2021-06-25Ignore too-early earlyBootEnded on FDE devicesEric Biggers
2021-05-14Revert "Change mounting storage data and obb flag to on by default" am: 6cc9a...Wale Ogunwale
2021-05-14Revert "Change mounting storage data and obb flag to on by default"Wale Ogunwale
2021-05-13Merge "Fix bug with deferred commits for key upgrades in temporary directorie...Satya Tangirala
2021-05-13Merge "Fix bug with deferred commits for key upgrades in temporary directorie...Satya Tangirala
2021-05-13Merge "Fix bug with deferred commits for key upgrades in temporary directorie...Satya Tangirala
2021-05-13Merge "Fix bug with deferred commits for key upgrades in temporary directorie...Satya Tangirala
2021-05-13Merge "Fix bug with deferred commits for key upgrades in temporary directories"android-s-beta-2android-s-beta-1Satya Tangirala
2021-05-13Fix bug with deferred commits for key upgrades in temporary directoriesSatya Tangirala
2021-05-12Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bb am: 545a13a568...Satya Tangirala
2021-05-12Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bb am: 545a13a568...Satya Tangirala
2021-05-12Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bb am: 545a13a568Satya Tangirala
2021-05-12Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bbSatya Tangirala
2021-05-12Merge changes from topic "vold-keystore2-fixes"Satya Tangirala
2021-05-12Remove unused constants and cleanup KeyStorage.cppSatya Tangirala
2021-05-12Remove unused parameter "salt" from stretchSecret()Satya Tangirala
2021-05-11Use AServiceManager_waitForService() to connect to keystore2Satya Tangirala
2021-05-11Merge "[vold] pass along sysfs name in setOptions" into sc-dev am: 29a6d6bb46Songchun Fan
2021-05-11Merge "[vold] pass along sysfs name in setOptions" into sc-devSongchun Fan
2021-05-11Merge "Show names of processes killed by KillProcessesWithOpenFiles()" am: 93...Treehugger Robot
2021-05-11Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23...Eric Biggers
2021-05-11Merge "Show names of processes killed by KillProcessesWithOpenFiles()" am: 93...Treehugger Robot
2021-05-11Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23...Eric Biggers
2021-05-11Merge "Show names of processes killed by KillProcessesWithOpenFiles()" am: 93...Treehugger Robot
2021-05-11Merge "Show names of processes killed by KillProcessesWithOpenFiles()" am: 93...Treehugger Robot
2021-05-11Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23...Eric Biggers
2021-05-11Merge "Show names of processes killed by KillProcessesWithOpenFiles()"Treehugger Robot
2021-05-11Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23...Eric Biggers
2021-05-11Merge "cryptfs: kill processes more quickly in wait_and_unmount()"Eric Biggers
2021-05-11[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ...Xin Li
2021-05-10cryptfs: kill processes more quickly in wait_and_unmount()Eric Biggers
2021-05-10[vold] pass along sysfs name in setOptionsSongchun Fan
2021-05-10Show names of processes killed by KillProcessesWithOpenFiles()Eric Biggers
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ...Xin Li
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ...Xin Li
2021-05-08[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." ...Xin Li