diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-01-14 00:52:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-14 00:52:37 +0000 |
| commit | 5bf384cae96a9384248af127b643173e2997c1c1 (patch) | |
| tree | 4051113d0312d585bf2329954ecd5db5fc08bd1d /services/java/com/android/server/SystemServer.java | |
| parent | 7ae76a2f3f2635457568411cd9e13ae5a73a5595 (diff) | |
| parent | f4c1cf66670e3f4962802ed59b22691736902176 (diff) | |
Merge changes Id0e18bef,Ie2b5f559
* changes:
Wrap the escrow data with key from keystore
Load and generate key from keystore in reboot escrow
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions