summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-04-30 00:14:35 +0000
committerPavel Zhamaitsiak <pavelz@google.com>2015-04-30 00:15:00 +0000
commit5e754d76bba061a23c2101ac1f8806a6da469452 (patch)
tree5ac13a3605dfee6e7ea22a5ad0d64b455fadf23d
parent630e2d94bb2d71aa1cab5689e722448a8e280692 (diff)
downloadshamu-5e754d76bba061a23c2101ac1f8806a6da469452.tar.gz
Revert "Temporary disable WiFi Calling"
This reverts commit 13ea3f1523e10deb58e0677db570682b5c788eef. Change-Id: I7ac0a9e544cf18964a59ba478ec7fd0c8969f301
-rw-r--r--init.shamu.rc7
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml3
2 files changed, 4 insertions, 6 deletions
diff --git a/init.shamu.rc b/init.shamu.rc
index 9ce9b7bb..9ee26850 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -624,7 +624,6 @@ service atfwd /system/bin/ATFWD-daemon
user system
group system radio
-# STOPSHIP: Required for WiFi Calling
-#service cnd /system/bin/cnd
-# class late_start
-# socket cnd stream 660 root inet
+service cnd /system/bin/cnd
+ class late_start
+ socket cnd stream 660 root inet
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 22f9ad18..a3232c8e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -274,8 +274,7 @@
<bool name="config_device_volte_available">true</bool>
<!-- Flag specifying whether WFC over IMS is availasble on device -->
- <!-- STOPSHIP if disabled -->
- <bool name="config_device_wfc_ims_available">false</bool>
+ <bool name="config_device_wfc_ims_available">true</bool>
<!-- Configure mobile tcp buffer sizes in the form:
rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max