| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-11 11:10:35 (GMT) |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-11 11:10:35 (GMT) |
| commit | 94b041db8fcc085700b794fdc3b17f65e104e7a5 (patch) | |
| tree | 4e2fbbaca9247a7ac91a16904611fb87de39a177 | |
| parent | c347f9434cde421967724365451cfff2e5a12724 (diff) | |
| parent | b29c56883ddc88264fb6a99b355c3a2d85716d10 (diff) | |
| download | common-94b041db8fcc085700b794fdc3b17f65e104e7a5.zip common-94b041db8fcc085700b794fdc3b17f65e104e7a5.tar.gz common-94b041db8fcc085700b794fdc3b17f65e104e7a5.tar.bz2 | |
Merge "Provision: install tee_key_inject [1/1]" into r-tv-dev am: b29c56883d
Original change: undetermined
Change-Id: I3f5041ccb0bc0501bcbae1df89a1dbe5751f7cda
| -rw-r--r-- | core_amlogic.mk | 1 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 2 | ||||
| -rw-r--r-- | sepolicy/init.te | 1 | ||||
| -rw-r--r-- | sepolicy/tee.te | 3 | ||||
| -rwxr-xr-x | tdk_keys/pcpk.bin | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 2c2208b..9745ac1 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -311,6 +311,7 @@ PRODUCT_PACKAGES += \ tee_concurrent_ta \ tee_concurrent_large_ta \ tee_provision \ + tee_key_inject \ libprovision \ tee_provision_ta \ tee_hdcp \ diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 531c1f6..3ce2c9c 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -298,7 +298,7 @@ /param(/.*)? u:object_r:param_tv_file:s0 /mnt/vendor/tee(/.*)? u:object_r:tee_vendor_file:s0 /mnt/vendor/param(/.*)? u:object_r:param_tv_file:s0 -/mnt/vendor/factory(/.*)? u:object_r:factory_vendor_file:s0 +/mnt/vendor/factory(/.*)? u:object_r:vfat:s0 /dev/usb-ffs/fastboot(/.*)? u:object_r:fastboot_aml_file:s0 diff --git a/sepolicy/init.te b/sepolicy/init.te index d4916fd..b678aa6 100644 --- a/sepolicy/init.te +++ b/sepolicy/init.te @@ -48,3 +48,4 @@ allow init sysfs_display:file rw_file_perms; allow init drm_device:chr_file { setattr read write open ioctl }; allow init firmload_exec:file {getattr}; allow init param_tv_file:dir mounton; +allow init vfat:dir mounton; diff --git a/sepolicy/tee.te b/sepolicy/tee.te index bccdfbc..205f4fe 100644 --- a/sepolicy/tee.te +++ b/sepolicy/tee.te @@ -30,3 +30,6 @@ allow tee node:tcp_socket { node_bind }; allow tee factory_vendor_file:dir r_dir_perms; allow tee factory_vendor_file:file r_file_perms; + +allow tee vfat:dir rw_dir_perms; +allow tee vfat:file rw_file_perms; diff --git a/tdk_keys/pcpk.bin b/tdk_keys/pcpk.bin new file mode 100755 index 0000000..767ebda --- a/dev/null +++ b/tdk_keys/pcpk.bin @@ -0,0 +1 @@ +钆es mjg0
\ No newline at end of file |