Merge "Add keystore_key:attest_unique_id to priv_app." into oc-dev
diff --git a/private/access_vectors b/private/access_vectors
index dcd86c2..6b08d9e 100644
--- a/private/access_vectors
+++ b/private/access_vectors
@@ -702,6 +702,7 @@
clear_uid
add_auth
user_changed
+ gen_unique_id
}
class drmservice {
diff --git a/private/domain.te b/private/domain.te
index 6f8814e..d37a0bd 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -13,3 +13,6 @@
-system_server
userdebug_or_eng(`-perfprofd')
} self:capability sys_ptrace;
+
+# Limit ability to generate hardware unique device ID attestations to priv_apps
+neverallow { domain -priv_app } *:keystore_key gen_unique_id;
diff --git a/private/priv_app.te b/private/priv_app.te
index 38ce673..a703ba8 100644
--- a/private/priv_app.te
+++ b/private/priv_app.te
@@ -114,6 +114,9 @@
# TODO: narrow this to just MediaProvider
allow priv_app mnt_media_rw_file:dir search;
+# Allow privileged apps (e.g. GMS core) to generate unique hardware IDs
+allow priv_app keystore:keystore_key gen_unique_id;
+
read_runtime_log_tags(priv_app)
###