Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0: Add namespace locksettings." am: 6bcd65c99e am: 965c7e3c91

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676196

Change-Id: Ib74fb9b45bd952dfaafd6f3dc65d4bcae304b418
This commit is contained in:
Treehugger Robot
2021-04-21 16:35:27 +00:00
committed by Automerger Merge Worker
parent 87a312952c 965c7e3c91
commit c40e1d5131
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystore/java/android/security/keystore/KeyProperties.java
View File

@@ -904,6 +904,7 @@ public abstract class KeyProperties {
@IntDef(prefix = { "NAMESPACE_" }, value = { @IntDef(prefix = { "NAMESPACE_" }, value = {
NAMESPACE_APPLICATION, NAMESPACE_APPLICATION,
NAMESPACE_WIFI, NAMESPACE_WIFI,
NAMESPACE_LOCKSETTINGS,
}) })
public @interface Namespace {} public @interface Namespace {}
@@ -924,6 +925,13 @@ public abstract class KeyProperties {
@SystemApi @SystemApi
public static final int NAMESPACE_WIFI = 102; public static final int NAMESPACE_WIFI = 102;
/**
* The namespace identifier for the LOCKSETTINGS Keystore namespace.
* This must be kept in sync with system/sepolicy/private/keystore2_key_contexts
* @hide
*/
public static final int NAMESPACE_LOCKSETTINGS = 103;
/** /**
* For legacy support, translate namespaces into known UIDs. * For legacy support, translate namespaces into known UIDs.
* @hide * @hide