Merge 785502c4df23d03c3bde14877e41736ef6b74840 on remote branch

Change-Id: I99dfcf1a16651f07d85f11fffdbfaf8db9f3d64d

5 files changed, 21 insertions, 19 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8f356ff..76a4443 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,7 +31,6 @@ TARGET_USES_UEFI := true
 TARGET_NO_KERNEL := false
 
 -include $(QCPATH)/common/sdm660_64/BoardConfigVendor.mk
-MINIMAL_FONT_FOOTPRINT := true
 
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
diff --git a/init.target.rc b/init.target.rc
index 1dd036c..debfccb 100755
--- a/init.target.rc
+++ b/init.target.rc
@@ -70,19 +70,14 @@ on post-fs-data
     mkdir /data/misc/seemp 0700 system system
     mkdir /data/misc/tloc 0700 system drmrpc
 
-# For cpusets initialize for Silver Only first and then Silver + Gold
-# Silver Only configuration cannot work with 0-7
 on boot
     start rmt_storage
     start rfs_access
-    write /dev/cpuset/top-app/cpus 0-3
-    write /dev/cpuset/foreground/cpus 0-3
-    write /dev/cpuset/foreground/boost/cpus 0-3
-    write /dev/cpuset/background/cpus 0-3
-    write /dev/cpuset/system-background/cpus 0-3
     write /dev/cpuset/top-app/cpus 0-7
     write /dev/cpuset/foreground/cpus 0-7
     write /dev/cpuset/foreground/boost/cpus 0-7
+    write /dev/cpuset/background/cpus 0-7
+    write /dev/cpuset/system-background/cpus 0-7
     ####Regionalization config and prop files####
     chmod 0644 /persist/speccfg/spec
     chmod 0644 /persist/speccfg/devicetype
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 49576de..449cc90 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -89,7 +89,7 @@ WLAN_CHIPSET := qca_cld3
 
 #Android EGL implementation
 PRODUCT_PACKAGES += libGLES_android
-#PRODUCT_BOOT_JARS += tcmiface
+PRODUCT_BOOT_JARS += tcmiface
 PRODUCT_BOOT_JARS += telephony-ext
 
 PRODUCT_PACKAGES += telephony-ext
diff --git a/system.prop b/system.prop
index 993b86a..840b0da 100755
--- a/system.prop
+++ b/system.prop
@@ -49,12 +49,12 @@ persist.mm.enable.prefetch=true
 
 #property to enable narrow search range for video encoding
 vidc.enc.target_support_bframe=1
-vidc.enc.disable_bframes=1
-vidc.dec.enable.downscalar=1
+vendor.vidc.enc.disable_bframes=1
+vendor.vidc.dec.enable.downscalar=1
 video.disable.ubwc=1
 
 # enable PQ feature by default
-vidc.enc.disable.pq=false
+vendor.vidc.enc.disable.pq=false
 
 # Additional buffers shared between Camera and Video
 vidc.enc.dcvs.extra-buff-count=2
@@ -162,19 +162,19 @@ ro.sys.fw.bg_apps_limit=60
 
 #Settings to enable sensors
 #Device Orientation sensor
-ro.qti.sensors.dev_ori=true
+ro.vendor.sensors.dev_ori=true
 #Persistent Motion Detector
-ro.qti.sensors.pmd=true
+ro.vendor.sensors.pmd=true
 #Stationary Detector
-ro.qti.sensors.sta_detect=true
+ro.vendor.sensors.sta_detect=true
 #Motion Detector
-ro.qti.sensors.mot_detect=true
+ro.vendor.sensors.mot_detect=true
 #Facing
-ro.qti.sensors.facing=false
+ro.vendor.sensors.facing=false
 #CMC
-ro.qti.sensors.cmc=false
+ro.vendor.sensors.cmc=false
 #Gesture
-ro.qti.sdk.sensors.gestures=false
+ro.vendor.sdk.sensors.gestures=false
 
 #low power mode for camera
 camera.lowpower.record.enable=1
diff --git a/vintf.xml b/vintf.xml
index ee366e2..513ef46 100644
--- a/vintf.xml
+++ b/vintf.xml
@@ -60,6 +60,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <transport>hwbinder</transport>
         <impl level="generic"></impl>
         <version>1.0</version>
+        <interface>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <!-- /video omx hal -->
     <!-- display -->