diff options
| author | Rubin Xu <rubinxu@google.com> | 2017-04-12 18:02:44 +0100 |
|---|---|---|
| committer | Rubin Xu <rubinxu@google.com> | 2017-04-20 12:07:16 +0100 |
| commit | 308f30b8e633bc808a1df675e76fca0c4ee58484 (patch) | |
| tree | 698d4eaa4b8ed41ece053f2f56297914fce5ba8d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 017f5df1e7b47acde9d922eccae6b9894f95fd3e (diff) | |
Do not check user escrow state if synthetic password is not enabled yet
1. when adding escrow tokens, do not throw SecurityException if the user hasn't
migrated to synthetic password yet.
2. during migration, activate any pending escrow tokens.
3. Disable escrow before attempting to activate escrow tokens, this currently
includes whenever the user authenticates, and when synthetic password
migration happens.
Also, add some comments in SyntheticPasswordManager and remove an invalid call
to destroy escrow data.
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Bug: 36776133
Change-Id: If4b9d385fb43e09d90b6dde6d25b4fcc0c6b7ddc
Merged-In: If4b9d385fb43e09d90b6dde6d25b4fcc0c6b7ddc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions