From 1abb7386ef8dc8bb7be3efd0a452187a856fbe5c Mon Sep 17 00:00:00 2001
From: Ravi Paluri <rpaluri@codeaurora.org>
Date: Mon, 8 Feb 2016 11:41:52 +0530
Subject: [PATCH 1/3] IMS-VT: Handle buttons display in InCall Screen

Change number of buttons to be displayed in
incall screen to 6

Change-Id: I995fb19e5c80ece4e686736db435e0f24081cee1
CRs-Fixed: 959132
---
 .../apps/InCallUI/res/values/config.xml       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 device/overlay/packages/apps/InCallUI/res/values/config.xml

diff --git a/device/overlay/packages/apps/InCallUI/res/values/config.xml b/device/overlay/packages/apps/InCallUI/res/values/config.xml
new file mode 100644
index 00000000..8624ceda
--- /dev/null
+++ b/device/overlay/packages/apps/InCallUI/res/values/config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+       * Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above
+         copyright notice, this list of conditions and the following
+         disclaimer in the documentation and/or other materials provided
+         with the distribution.
+       * Neither the name of The Linux Foundation nor the names of its
+         contributors may be used to endorse or promote products derived
+         from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+    <!-- Determines the maximum number of buttons visible on the call card.  Any buttons over this
+         count are put into the overflow menu. -->
+    <integer name="call_card_max_buttons">6</integer>
+</resources>

From 975dcef0b720125bdf8cedb6d390ed2bbafb4f15 Mon Sep 17 00:00:00 2001
From: Abinaya P <abinayap@codeaurora.org>
Date: Thu, 11 Feb 2016 11:18:37 +0530
Subject: [PATCH 2/3] ueventd: change permission for secure touch sysfs files

Change the permission and ownership of secure touch
sysfs files - secure_touch and secure_touch_enable so
that the secure touch app will be able to access these
sysfs files.

Change-Id: Id42deddc720318107b1ad15a11f0da715b0335c9
---
 rootdir/etc/ueventd.qcom.rc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index b29da0b2..d41a35a6 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -205,6 +205,10 @@
 /sys/devices/virtual/optical_sensors/lightsensor    ls_poll_delay  0660    input    system
 /sys/devices/virtual/input/input*                   poll           0660    input    system
 /sys/devices/virtual/input/input*                   pollrate_ms    0660    input    system
+/sys/devices/soc/78b7000.i2c/i2c-3/3-0020/input/input*    secure_touch         0440   system  drmrpc
+/sys/devices/soc/78b7000.i2c/i2c-3/3-0020/input/input*    secure_touch_enable  0660   system  drmrpc
+/sys/devices/soc/78b7000.i2c/i2c-3/3-0038/input/input*    secure_touch         0440   system  drmrpc
+/sys/devices/soc/78b7000.i2c/i2c-3/3-0038/input/input*    secure_touch_enable  0660   system  drmrpc
 
 # vm_bms
 /dev/vm_bms               0660   system     system

From 34853a5118a38f6f4292e8520eaba7cc4c00dbc0 Mon Sep 17 00:00:00 2001
From: Lalit Kansara <lkansara@codeaurora.org>
Date: Thu, 11 Feb 2016 15:51:24 +0530
Subject: [PATCH 3/3] Move commands from early-boot trigger handler to property
 trigger handler

Due to default encryption support, persist properties are not set before
early-boot trigger therefore execution of any command which is underlying
the early-boot trigger handler and using a persist property, is failing.
After decryption, /data is mounted and all persist properties are set.
Hence to run those commands which has dependency on any persist property,
need to be moved under the property trigger handler itself.

Change-Id: Ia2c37daeb3af4f0f87cd036e303409e413c54509
---
 rootdir/etc/init.qcom.rc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 rootdir/etc/init.qcom.rc

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
old mode 100644
new mode 100755
index d2225058..09c63a53
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -45,10 +45,6 @@ on early-boot
     # set RLIMIT_MEMLOCK to 64MB
     setrlimit 8 67108864 67108864
     # Allow subsystem (modem etc) debugging
-    write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug}
-    write /sys/module/pil_msa/parameters/pbl_mba_boot_timeout_ms ${persist.sys.mba_boot_timeout}
-    write /sys/module/pil_msa/parameters/modem_auth_timeout_ms ${persist.sys.modem_auth_timeout}
-    write /sys/module/peripheral_loader/parameters/proxy_timeout_ms ${persist.sys.pil_proxy_timeout}
     write /sys/kernel/boot_adsp/boot 1
     write /sys/kernel/boot_slpi/boot 1
     exec u:r:qti_init_shell:s0 -- /init.qcom.early_boot.sh
@@ -342,6 +338,18 @@ service ss_ramdump /system/bin/subsystem_ramdump
     group system
     disabled
 
+on property:persist.sys.ssr.enable_debug=*
+    write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug}
+
+on property:persist.sys.mba_boot_timeout=*
+    write /sys/module/pil_msa/parameters/pbl_mba_boot_timeout_ms ${persist.sys.mba_boot_timeout}
+
+on property:persist.sys.modem_auth_timeout=*
+    write /sys/module/pil_msa/parameters/modem_auth_timeout_ms ${persist.sys.modem_auth_timeout}
+
+on property:persist.sys.pil_proxy_timeout=*
+    write /sys/module/peripheral_loader/parameters/proxy_timeout_ms ${persist.sys.pil_proxy_timeout}
+
 on property:persist.sys.ssr.restart_level=*
     start ssr_setup