Merge "Make Settings aware of legacy user keys with secret key prefix"

2017-12-15 23:48:55 +00:00
parent c27b072724 b705e1a691
commit 7bc0236cc7
2 changed files with 53 additions and 27 deletions
--- a/tests/unit/src/com/android/settings/UserCredentialsTest.java
+++ b/tests/unit/src/com/android/settings/UserCredentialsTest.java
@@ -40,7 +40,7 @@ public class UserCredentialsTest extends InstrumentationTestCase {
        Credential c = new Credential(alias, Process.SYSTEM_UID);

        c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
-        c.storedTypes.add(Credential.Type.USER_SECRET_KEY);
+        c.storedTypes.add(Credential.Type.USER_KEY);

        Parcel p = Parcel.obtain();
        c.writeToParcel(p, /* flags */ 0);