summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-27 03:06:48 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-27 03:06:48 +0000
commit50b4af6ee02c758df6cdb6d1b067125172c11116 (patch)
tree08b00bfb4f3d76cba1e41e93a6338f669a0bc158
parent96e05ac4dbd53f669025dee8cb88b7e0d02f3a30 (diff)
parentc3d1532e89dd203949470be0f457afa879230293 (diff)
downloadandroid_device_generic_goldfish-50b4af6ee02c758df6cdb6d1b067125172c11116.tar.gz
android_device_generic_goldfish-50b4af6ee02c758df6cdb6d1b067125172c11116.tar.bz2
android_device_generic_goldfish-50b4af6ee02c758df6cdb6d1b067125172c11116.zip
Snap for 4916303 from c3d1532e89dd203949470be0f457afa879230293 to pi-qpr1-release
Change-Id: I0bea200cd7d6d130f557e23fd242d8bd00527c29
-rw-r--r--sepolicy/common/hal_fingerprint_default.te5
-rw-r--r--vendor.mk2
2 files changed, 2 insertions, 5 deletions
diff --git a/sepolicy/common/hal_fingerprint_default.te b/sepolicy/common/hal_fingerprint_default.te
deleted file mode 100644
index e5b06f1..0000000
--- a/sepolicy/common/hal_fingerprint_default.te
+++ /dev/null
@@ -1,5 +0,0 @@
-# TODO(b/36644492): Remove data_between_core_and_vendor_violators once
-# hal_fingerprint no longer directly accesses fingerprintd_data_file.
-typeattribute hal_fingerprint_default data_between_core_and_vendor_violators;
-allow hal_fingerprint_default fingerprintd_data_file:file create_file_perms;
-allow hal_fingerprint_default fingerprintd_data_file:dir rw_dir_perms;
diff --git a/vendor.mk b/vendor.mk
index 958b309..328b847 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -17,6 +17,8 @@
# This file is to configure vendor/data partitions of emulator-related products
#
+PRODUCT_SHIPPING_API_LEVEL := 24
+
# Device modules
PRODUCT_PACKAGES += \
gralloc.goldfish \