summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "vold: Reboot if vold failure"HEADmasterKeith Mok2021-10-161-0/+1
|\
| * vold: Reboot if vold failureKeith Mok2021-10-061-0/+1
* | Merge "Create the checkin subdirectory under misc_ce"Tianjie Xu2021-10-151-0/+1
|\ \
| * | Create the checkin subdirectory under misc_ceTianjie2021-10-051-0/+1
| |/
* | Merge "Fix vold dump"Keun-young Park2021-10-141-3/+3
|\ \
| * | Fix vold dumpKeun young Park2021-10-131-3/+3
|/ /
* | Merge "Merge Android 12"Xin Li2021-10-075-9/+29
|\ \ | |/ |/|
| * Merge Android 12Xin Li2021-10-065-9/+29
|/|
| * Merge "Pre-create userdata metadata encryption device." am: eb3182f040David Anderson2021-09-273-2/+32
| |\ | |/ |/|
* | Merge "Pre-create userdata metadata encryption device."David Anderson2021-09-273-2/+32
|\ \
| * | Pre-create userdata metadata encryption device.David Anderson2021-09-213-2/+32
| | * Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577Howard Chen2021-09-221-1/+3
| | |\ | |_|/ |/| |
* | | Merge "Make the deleteAllKey feature aware of the DSU mode"Howard Chen2021-09-221-1/+3
|\ \ \ | |/ / |/| |
| * | Make the deleteAllKey feature aware of the DSU modeHoward Chen2021-09-151-1/+3
| | * Merge "Fix the incorrect parameter quota when userdata is formatted with EXT4...Daniel Rosenberg2021-09-201-1/+1
| | |\ | |_|/ |/| |
* | | Merge "Fix the incorrect parameter quota when userdata is formatted with EXT4"Daniel Rosenberg2021-09-201-1/+1
|\ \ \ | |/ / |/| |
| * | Fix the incorrect parameter quota when userdata is formatted with EXT4lin.gui2021-09-141-1/+1
| | * Merge "Replace security_context_t type" am: 530329222fThiébaud Weksteen2021-09-102-11/+11
| | |\ | |_|/ |/| |
* | | Merge "Replace security_context_t type"Thiébaud Weksteen2021-09-102-11/+11
|\ \ \
| * | | Replace security_context_t typeThiébaud Weksteen2021-09-102-11/+11
|/ / /
| | * Merge "Set a property if seed binding is enabled." am: cc63a93fd6Keith Mok2021-09-021-0/+1
| | |\ | |_|/ |/| |
* | | Merge "Set a property if seed binding is enabled."android-s-beta-5android-s-beta-5Keith Mok2021-09-011-0/+1
|\ \ \ | |/ / |/| |
| * | Set a property if seed binding is enabled.Keith Mok2021-09-011-0/+1
|/ /
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-145-9/+29
| |\
| | * [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" ...Shawn Willden2021-08-120-0/+0
| | |\
| | | * Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-devShawn Willden2021-08-123-27/+0
| | | |\
| | | | * Revert "Detect factory reset and deleteAllKeys"Shawn Willden2021-08-123-27/+0
| | * | | Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3TreeHugger Robot2021-08-111-1/+4
| | |\| |
| | | * | Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-devandroid12-devTreeHugger Robot2021-08-111-1/+4
| | | |\ \ | | | | |/ | | | |/|
| | | | * Add ROLLBACK_RESISTANCE tag to key usage[6;7~2021-08-111-1/+4
| | * | | [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -s...Paul Crowley2021-08-110-0/+0
| | |\| |
| | | * | Detect factory reset and deleteAllKeysPaul Crowley2021-08-113-0/+27
| | | |/
| | * | Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386 am: 85961f7a9cPaul Crowley2021-08-113-0/+27
| | |\ \ | | |/ / | |/| |
| * | | Merge "Detect factory reset and deleteAllKeys" am: 407b2c2386Paul Crowley2021-08-113-0/+27
| |\ \ \ | |/ / / |/| | |
* | | | Merge "Detect factory reset and deleteAllKeys"Paul Crowley2021-08-113-0/+27
|\ \ \ \
| * | | | Detect factory reset and deleteAllKeysPaul Crowley2021-08-113-0/+27
|/ / / /
| | * | Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86 am: ...Treehugger Robot2021-07-281-6/+6
| | |\ \ | | |/ / | |/| |
| * | | Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86Treehugger Robot2021-07-281-6/+6
| |\ \ \ | |/ / / |/| | |
* | | | Merge "Remove ndk_platform backend. Use the ndk backend."Treehugger Robot2021-07-281-6/+6
|\ \ \ \
| * | | | Remove ndk_platform backend. Use the ndk backend.Jiyong Park2021-07-271-6/+6
| | | * | Merge "Remove vold logs related to block devices" am: cbf82ffa29 am: 9bf8553f8dNikita Ioffe2021-07-283-5/+1
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge "Remove vold logs related to block devices" am: cbf82ffa29Nikita Ioffe2021-07-283-5/+1
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge "Remove vold logs related to block devices"Nikita Ioffe2021-07-283-5/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove vold logs related to block devicesNikita Ioffe2021-07-283-5/+1
|/ / / /
| | * | Merge "Add command for setting the key binding seed" am: 2d76731968 am: 7aec2...Keith Mok2021-07-152-1/+30
| | |\ \ | | |/ / | |/| |
| * | | Merge "Add command for setting the key binding seed" am: 2d76731968Keith Mok2021-07-152-1/+30
| |\ \ \ | |/ / / |/| | |
* | | | Merge "Add command for setting the key binding seed"Keith Mok2021-07-152-1/+30
|\ \ \ \
| * | | | Add command for setting the key binding seedSean Keys2021-07-132-1/+30
|/ / / /
| | * | [automerger skipped] Ignore too-early earlyBootEnded on FDE devices am: 2ddc1...Eric Biggers2021-06-250-0/+0
| | |\|
| | | * Ignore too-early earlyBootEnded on FDE devicesEric Biggers2021-06-251-0/+33
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-06 14:13:13 +0000