Merge changes I74d1f01c,I687b8694,Ie82e5cb9
* changes:
sensors: Include proper sensor HAL per board
bt-wifi-firmware: Allow to accept any hikey960 target derivative
gralloc960: Remove explicit check for TARGET_PRODUCT == hikey960
diff --git a/installer/hikey/fip.bin b/installer/hikey/fip.bin
index 80fb102..d567402 100644
--- a/installer/hikey/fip.bin
+++ b/installer/hikey/fip.bin
Binary files differ
diff --git a/installer/hikey/l-loader.bin b/installer/hikey/l-loader.bin
index ac42148..d095465 100644
--- a/installer/hikey/l-loader.bin
+++ b/installer/hikey/l-loader.bin
Binary files differ
diff --git a/l-loader/recovery-fastboot.bin b/l-loader/recovery-fastboot.bin
index 193a128..fe56262 100755
--- a/l-loader/recovery-fastboot.bin
+++ b/l-loader/recovery-fastboot.bin
Binary files differ
diff --git a/sepolicy/hal_bluetooth_hikey.te b/sepolicy/hal_bluetooth_hikey.te
index 321f41d..4a58049 100644
--- a/sepolicy/hal_bluetooth_hikey.te
+++ b/sepolicy/hal_bluetooth_hikey.te
@@ -1,5 +1,5 @@
type hal_bluetooth_hikey, domain;
-type hal_bluetooth_hikey_exec, exec_type, file_type;
+type hal_bluetooth_hikey_exec, exec_type, vendor_file_type, file_type;
hal_server_domain(hal_bluetooth_hikey, hal_bluetooth)
diff --git a/sepolicy/hci_attach.te b/sepolicy/hci_attach.te
index d87f444..41f74cb 100644
--- a/sepolicy/hci_attach.te
+++ b/sepolicy/hci_attach.te
@@ -1,5 +1,5 @@
type hci_attach, domain;
-type hci_attach_exec, exec_type, file_type;
+type hci_attach_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hci_attach)
diff --git a/vr/manifest.xml b/vr/manifest.xml
index aae63a9..81ae071 100644
--- a/vr/manifest.xml
+++ b/vr/manifest.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.vr</name>
- <transport>hwbinder</transport>
+ <transport arch="32+64">passthrough</transport>
<version>1.0</version>
<interface>
<name>IVr</name>