Merge changes I1c0be5f8,Id837c19a
* changes:
gralloc960: Extend gralloc to use dmabuf heaps
hikey/hikey960: Add userland support for dmabuf heap dev dir
diff --git a/manifest.xml b/manifest.xml
index 63c1e9f..fd6f383 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -99,6 +99,15 @@
</interface>
</hal>
<hal format="hidl">
+ <name>android.hardware.health</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IHealth</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>android.hardware.keymaster</name>
<transport>hwbinder</transport>
<version>3.0</version>
@@ -139,6 +148,15 @@
</interface>
</hal>
<hal format="hidl">
+ <name>android.hardware.renderscript</name>
+ <transport arch="32+64">passthrough</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IDevice</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport arch="32">passthrough</transport>
<version>2.0</version>
@@ -165,22 +183,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.renderscript</name>
- <transport arch="32+64">passthrough</transport>
- <version>1.0</version>
- <interface>
- <name>IDevice</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.health</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>IHealth</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
deleted file mode 100644
index 54290ce..0000000
--- a/sepolicy/netd.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Triggers a sys_module denial, but kernel has CONFIG_MODULES=n.
-dontaudit netd self:capability sys_module;
-dontaudit netd kernel:system module_request;