Merge "Dont use FLAG_ENCRYPT for certificates"

This commit is contained in:
Chad Brubaker
2016-07-20 17:37:06 +00:00
committed by Android (Google) Code Review

View File

@@ -272,7 +272,7 @@ public final class CredentialStorage extends Activity {
} }
} }
int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED; int flags = KeyStore.FLAG_NONE;
if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) { if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME); String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);