summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-10-12Merge "cryptfs: Update the size of dm-crypt device according to sector size" ...android12-gsiEric Biggers
2022-10-10cryptfs: Update the size of dm-crypt device according to sector sizeHongyu Jin
2022-09-28Merge "KeyStorage: don't request rollback resistance for wrapped storage keys...Eric Biggers
2022-09-27KeyStorage: don't request rollback resistance for wrapped storage keysEric Biggers
2022-01-11Merge "Merge branch android12-platform-release" into android12-gsiSzuWei Lin
2022-01-06Merge branch android12-platform-releaseSzuWei Lin
2021-11-10Snap for 7901677 from 02cae1b59545e3b99e23bab596b3727c3642420b to sc-platform...android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r33android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android12-platform-releaseAndroid Build Coastguard Worker
2021-11-08Merge commit '6d07263a37060a2f5418c64f724ce8e3a572ca40' into sc-platform-mergeYimin Li
2021-09-02Snap for 7695811 from c0a46c81064dd9a632e446c4987145db61874b44 to sc-qpr1-rel...android-12.0.0_r28android-12.0.0_r26android-12.0.0_r16android12-qpr1-releaseAndroid Build Coastguard Worker
2021-08-30Revert "Add ROLLBACK_RESISTANCE tag to key usage"android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseHaiping Yang
2021-08-14Snap for 7641961 from eae11551bdcd1ee68402a389fce62790ddf840e8 to sc-qpr1-rel...Android Build Coastguard Worker
2021-08-13Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 156...Paul 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-13Snap for 7637474 from fb0d651988531c24a538276beb1f94453bb24ab9 to sc-qpr1-rel...Android Build Coastguard Worker
2021-08-12Snap for 7633965 from 8f19fd90e3c9c1fcb3056129f356f875c95b839c to sc-release ...Android Build Coastguard Worker
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-12Snap for 7633965 from 8f19fd90e3c9c1fcb3056129f356f875c95b839c to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r61android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseAndroid Build Coastguard Worker
2021-08-12Snap for 7634030 from 7c5c6d8b438a2dde1feaeb2c485d275ca480dcb2 to sc-qpr1-rel...Android Build Coastguard Worker
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-26Snap for 7495277 from 2ddc1338d7a400c972cc2bc46b4aa9a377c22a1e to sc-release ...Android Build Coastguard Worker
2021-06-26Snap for 7495277 from 2ddc1338d7a400c972cc2bc46b4aa9a377c22a1e to sc-releaseAndroid Build Coastguard Worker
2021-06-25Ignore too-early earlyBootEnded on FDE devicesEric Biggers
2021-05-15Snap for 7364021 from 6cc9a1d3ddddd59c08ef2e17298f935e59200126 to sc-release ...android-build-team Robot
2021-05-15Snap for 7364021 from 6cc9a1d3ddddd59c08ef2e17298f935e59200126 to sc-releaseandroid-build-team Robot
2021-05-14Revert "Change mounting storage data and obb flag to on by default"Wale Ogunwale
2021-05-14Snap for 7360053 from 6c0c4e8f948886758de985976d4a57e53133cc9c to sc-release ...android-build-team Robot
2021-05-14Snap for 7360053 from 6c0c4e8f948886758de985976d4a57e53133cc9c to sc-releaseandroid-build-team Robot
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-13Snap for 7357013 from 29a6d6bb463410de828a495266c1033c2bfdb33b to sc-release ...android-build-team Robot
2021-05-13Snap for 7357013 from 29a6d6bb463410de828a495266c1033c2bfdb33b to sc-releaseandroid-build-team Robot
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-12Snap for 7354453 from 85a78a5ad11d8bca54332833d3f65b6cb73e7a98 to sc-release ...android-build-team Robot
2021-05-12Snap for 7354453 from 85a78a5ad11d8bca54332833d3f65b6cb73e7a98 to sc-releaseandroid-build-team Robot