diff options
| -rw-r--r-- | shared/minidroid/init.rc | 4 | ||||
| -rw-r--r-- | shared/phone/device_vendor.mk | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/shared/minidroid/init.rc b/shared/minidroid/init.rc index 2fa564843..697b43f1d 100644 --- a/shared/minidroid/init.rc +++ b/shared/minidroid/init.rc @@ -184,7 +184,9 @@ service ueventd /system/bin/ueventd critical seclabel u:r:ueventd:s0 shutdown critical - capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID MKNOD NET_ADMIN SETGID SETUID SYS_MODULE SYS_RAWIO + user root + group root + capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID MKNOD NET_ADMIN SETGID SETUID SYS_MODULE SYS_RAWIO SYS_ADMIN service console /system/bin/sh class core diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk index 61bd37b64..f992362a0 100644 --- a/shared/phone/device_vendor.mk +++ b/shared/phone/device_vendor.mk @@ -38,12 +38,18 @@ TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop ifneq ($(LOCAL_PREFER_VENDOR_APEX),true) PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.biometrics.face.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.biometrics.face.xml \ frameworks/native/data/etc/android.hardware.faketouch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.faketouch.xml \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ + ifneq ($(TARGET_DISABLE_BIOMETRICS_FACE),true) + PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.biometrics.face.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.biometrics.face.xml \ + + endif endif + + # Runtime Resource Overlays ifeq ($(LOCAL_PREFER_VENDOR_APEX),true) PRODUCT_PACKAGES += com.google.aosp_cf_phone.rros |