Merge "Store sensor HAL properties in vendor partition" into oc-mr1-dev
diff --git a/default-permissions.xml b/default-permissions.xml
index 82a9389..5c37315 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -53,6 +53,8 @@
<exception
package="com.verizon.mips.services">
+ <!-- Call -->
+ <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/>
<!-- Phone -->
<permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
<!-- SMS -->
diff --git a/device.mk b/device.mk
index e575888..b0bbfd0 100755
--- a/device.mk
+++ b/device.mk
@@ -213,6 +213,7 @@
persist.radio.data_ltd_sys_ind=1 \
persist.radio.is_wps_enabled=true \
persist.radio.videopause.mode=1 \
+ persist.radio.sap_silent_pin=1 \
persist.radio.sib16_support=1 \
persist.radio.data_con_rprt=true \
persist.radio.always_send_plmn=true \
@@ -307,10 +308,6 @@
android.hardware.bluetooth@1.0-impl \
android.hardware.bluetooth@1.0-service
-# Neuralnetworks HAL
-PRODUCT_PACKAGES += \
- android.hardware.neuralnetworks@1.0-service-hvx
-
# DRM HAL
PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl \
diff --git a/manifest.xml b/manifest.xml
index 204bd58..c553bb3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -190,15 +190,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.neuralnetworks</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IDevice</name>
- <instance>hvx</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.0</version>