commit b41f4985a9b12fa4ad658964a6a47074b68505f3
author Shawn Willden <swillden@google.com> Fri Dec 11 13:05:27 2020 +0000
committer Shawn Willden <swillden@google.com> Fri Dec 11 20:36:53 2020 +0000
tree 15c2706af0cbf815a8e25ac70d7a52924c4cc5d3
parent 7a3be4d80ef9530b88ae9638ab0b8c7c709b5643

Revert^2 "Move keymint to android.hardware.security."

16d61d038340c129b5d206ac3d41f1bdf3313b8a


Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I1352c6b46b007dba3448b3c9cbdf454d7862a176

private/compat/30.0/30.0.ignore.cil

diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 15e4c51..a19361c 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -26,6 +26,7 @@
     hal_dumpstate_config_prop
     hal_gnss_service
     hal_power_stats_service
+    hal_keymint_service
     keystore2_key_contexts_file
     legacy_permission_service
     location_time_zone_manager_service

private/service_contexts

diff --git a/private/service_contexts b/private/service_contexts
index 91da637..60890c4 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -3,6 +3,7 @@
 android.hardware.biometrics.fingerprint.IFingerprint/default         u:object_r:hal_fingerprint_service:s0
 android.hardware.gnss.IGnss/default                                  u:object_r:hal_gnss_service:s0
 android.hardware.identity.IIdentityCredentialStore/default           u:object_r:hal_identity_service:s0
+android.hardware.security.keymint.IKeyMintDevice/default             u:object_r:hal_keymint_service:s0
 android.hardware.light.ILights/default                               u:object_r:hal_light_service:s0
 android.hardware.power.IPower/default                                u:object_r:hal_power_service:s0
 android.hardware.power.stats.IPowerStats/default                      u:object_r:hal_power_stats_service:s0