author | Tellen Yu <tellen.yu@amlogic.com> | 2020-11-12 02:47:42 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2020-11-26 01:36:46 (GMT) |
commit | 2be81bf829244bd651b67e662a9609c648c46266 (patch) | |
tree | 7bf643acf45ff4af29382a9ca176d0222e070ced | |
parent | 44342ec612d032b7dbf9e1dae48053885e3713bb (diff) | |
download | common-2be81bf829244bd651b67e662a9609c648c46266.zip common-2be81bf829244bd651b67e662a9609c648c46266.tar.gz common-2be81bf829244bd651b67e662a9609c648c46266.tar.bz2 |
atvprop: add an atvprop for BT pairing [1/1]
PD#SWPL-37290
Problem:
We can not see BT pairing screen, so we added a BT pairing
screen in DroidTvSettings, but it will have some conflicts
with Setup Wraith.
Solution:
add an atv property to enable setup wraith BT pairing and
disable DroidTvSettings BT pairing.
Verify:
Ohm
Change-Id: I55decc8749893f4d448abbf5e89d00697e1b374d
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
-rwxr-xr-x | core_amlogic.mk | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | sepolicy.mk | 3 | ||||
-rwxr-xr-x | sepolicy/product/private/property_contexts | 2 | ||||
-rwxr-xr-x | sepolicy/product/public/priv_app.te | 1 | ||||
-rwxr-xr-x | sepolicy/product/public/property.te | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | sepolicy/vendor_init.te | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 56ab84b..9f4ed97 100755 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -44,7 +44,12 @@ PRODUCT_PACKAGES += \ PlayAutoInstallStub \ DroidOverlay \ BlueOverlay \ - LauncherCustomization + LauncherCustomization \ + BtPairCustomization + +#use google bt setup screen +PRODUCT_PROPERTY_OVERRIDES += \ + atv.setup.bt_remote_pairing=true endif ifneq ($(TARGET_BUILD_KERNEL_4_9), true) @@ -550,3 +555,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ external_storage.projid.enabled=true endif + diff --git a/sepolicy.mk b/sepolicy.mk index 183bd77..bc4b0d5 100644..100755 --- a/sepolicy.mk +++ b/sepolicy.mk @@ -4,3 +4,6 @@ BOARD_SEPOLICY_DIRS += \ device/amlogic/common/sepolicy/aml_core BOARD_SEPOLICY_DIRS += device/amlogic/common/sepolicy/q +#add atv prop sepolicy +PRODUCT_PUBLIC_SEPOLICY_DIRS += device/amlogic/common/sepolicy/product/public +PRODUCT_PRIVATE_SEPOLICY_DIRS += device/amlogic/common/sepolicy/product/private diff --git a/sepolicy/product/private/property_contexts b/sepolicy/product/private/property_contexts new file mode 100755 index 0000000..bb53bc3 --- a/dev/null +++ b/sepolicy/product/private/property_contexts @@ -0,0 +1,2 @@ +ro.com.google.gmsversion u:object_r:atv_prop:s0 +atv.setup. u:object_r:atv_prop:s0 diff --git a/sepolicy/product/public/priv_app.te b/sepolicy/product/public/priv_app.te new file mode 100755 index 0000000..c2addce --- a/dev/null +++ b/sepolicy/product/public/priv_app.te @@ -0,0 +1 @@ +get_prop(priv_app, atv_prop) diff --git a/sepolicy/product/public/property.te b/sepolicy/product/public/property.te new file mode 100755 index 0000000..1fa26b4 --- a/dev/null +++ b/sepolicy/product/public/property.te @@ -0,0 +1 @@ +type atv_prop, property_type; diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor_init.te index 982cca4..d9e81e1 100644..100755 --- a/sepolicy/vendor_init.te +++ b/sepolicy/vendor_init.te @@ -50,3 +50,5 @@ get_prop(vendor_init, default_prop) allow vendor_init vendor_persist_prop:property_service {set}; allow vendor_init tee_vendor_file:dir { create relabelto }; + +set_prop(vendor_init, atv_prop) |