Merge "Revert "Move keymint to android.hardware.security.""

This commit is contained in:
Orion Hodson 2020-12-11 12:29:46 +00:00 committed by Gerrit Code Review
commit c06806771d
7 changed files with 0 additions and 18 deletions

View file

@ -26,7 +26,6 @@
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

View file

@ -3,7 +3,6 @@ android.hardware.biometrics.face.IFace/default u:object_r:
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

View file

@ -334,7 +334,6 @@ hal_attribute(identity);
hal_attribute(input_classifier);
hal_attribute(ir);
hal_attribute(keymaster);
hal_attribute(keymint);
hal_attribute(light);
hal_attribute(lowpan);
hal_attribute(memtrack);

View file

@ -1,6 +0,0 @@
binder_call(hal_keymint_client, hal_keymint_server)
add_service(hal_keymint_server, hal_keymint_service)
binder_call(hal_keymint_server, servicemanager)
allow hal_keymint_client hal_keymint_service:service_manager find;

View file

@ -225,7 +225,6 @@ type hal_face_service, vendor_service, protected_service, service_manager_type;
type hal_fingerprint_service, vendor_service, protected_service, service_manager_type;
type hal_gnss_service, vendor_service, protected_service, service_manager_type;
type hal_identity_service, vendor_service, protected_service, service_manager_type;
type hal_keymint_service, vendor_service, protected_service, service_manager_type;
type hal_light_service, vendor_service, protected_service, service_manager_type;
type hal_power_service, vendor_service, protected_service, service_manager_type;
type hal_power_stats_service, vendor_service, protected_service, service_manager_type;

View file

@ -49,7 +49,6 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@3\.0-service u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@4\.0-service u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@4\.1-service u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.security\.keymint-service u:object_r:hal_keymint_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service-lazy u:object_r:hal_light_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.lights-service\.example u:object_r:hal_light_default_exec:s0

View file

@ -1,7 +0,0 @@
type hal_keymint_default, domain;
hal_server_domain(hal_keymint_default, hal_keymint)
type hal_keymint_default_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hal_keymint_default)
get_prop(hal_keymint_default, vendor_security_patch_level_prop);