Merge commit '0f25aa8903549bf46e1c8d7c0659769b7196ecde' into remote

Conflicts:
	vintf.xml

Change-Id: I413d1914c41c2d860a3cb8c8e93f6ef7d77780c8
This commit is contained in:
Abhilash Kumar Subhash 2017-07-13 14:00:24 +05:30
commit 329f08d63d
2 changed files with 29 additions and 0 deletions

View file

@ -22,6 +22,7 @@ DEVICE_PROVISIONED=1
# #
ro.telephony.default_network=22,20 ro.telephony.default_network=22,20
debug.sf.enable_hwc_vds=1
debug.sf.hw=1 debug.sf.hw=1
debug.gralloc.enable_fb_ubwc=1 debug.gralloc.enable_fb_ubwc=1
dalvik.vm.heapsize=36m dalvik.vm.heapsize=36m

View file

@ -367,6 +367,34 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<instance>slot2</instance> <instance>slot2</instance>
</interface> </interface>
</hal> </hal>
<!-- improveTouch Service-->
<hal format="hidl">
<name>vendor.qti.hardware.improvetouch.touchcompanion</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>ITouchCompanion</name>
<instance>TouchCompanionService</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.improvetouch.gesturemanager</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IGestureManager</name>
<instance>GestureManagerService</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.improvetouch.blobmanager</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBlobManager</name>
<instance>BlobManagerService</instance>
</interface>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>vendor.qti.hardware.fm</name> <name>vendor.qti.hardware.fm</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>