| author | Dan Zhang <danielzhang@google.com> | 2020-11-12 06:34:17 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-11-12 06:34:17 (GMT) |
| commit | 5f71e2133f2953b24f4c76868ceb595bc55ad42c (patch) | |
| tree | c372ece7db8e0dba9cd6afb816282d02aab83c7e | |
| parent | 4a78b7a240bd55834d864273401efe511920cebd (diff) | |
| parent | eef7b90dbf32e1cb17c49bb24bacea51b455422a (diff) | |
| download | common-5f71e2133f2953b24f4c76868ceb595bc55ad42c.zip common-5f71e2133f2953b24f4c76868ceb595bc55ad42c.tar.gz common-5f71e2133f2953b24f4c76868ceb595bc55ad42c.tar.bz2 | |
Merge "Android S: bring up s [1/1]" into r-tv-dev
| -rw-r--r-- | core_amlogic.mk | 2 | ||||
| -rw-r--r-- | sepolicy/recovery.te | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 9745ac1..1771687 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -55,6 +55,8 @@ endif $(call inherit-product, device/google/atv/products/atv_base.mk) +PRODUCT_PRODUCT_VNDK_VERSION := current + # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te index d731340..d1bfc3c 100644 --- a/sepolicy/recovery.te +++ b/sepolicy/recovery.te @@ -90,7 +90,6 @@ allow recovery sysfs_remote:dir search; allow recovery sysfs_display:dir search; -allow recovery ffs_prop:property_service set; allow recovery bluetooth_prop:file { getattr open }; allow recovery boottime_prop:file { getattr open }; |