Migrated dumpstate to C++.
am: 435ecb273b
* commit '435ecb273b07cc8f2a49a1de5701eb13aa30aaac':
Migrated dumpstate to C++.
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 5d8bea3..b2a8522 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -569,6 +569,7 @@
mvno_match_data="U.S. Cellular"
type="mms,fota,default,supl"
protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
/>
<apn carrier="KPN Mobiel Internet"
@@ -2532,7 +2533,7 @@
apn="vipmobile.mms"
user="vipmobile"
password="vipmobile"
- mmsc="http://mmsc.vipmobile.rs"
+ mmsc="http://mms.vipmobile.rs"
authtype="1"
type="mms"
/>
@@ -3707,6 +3708,17 @@
mvno_type="gid"
/>
+ <apn carrier="IMS"
+ mcc="234"
+ mnc="30"
+ apn="ims"
+ user="eesecure"
+ password="secure"
+ authtype="1"
+ type="ims"
+ protocol="IPV6"
+ />
+
<apn carrier="EE Internet"
mcc="234"
mnc="30"
@@ -3851,6 +3863,17 @@
type="mms"
/>
+ <apn carrier="IMS"
+ mcc="234"
+ mnc="33"
+ apn="ims"
+ user="eesecure"
+ password="secure"
+ authtype="1"
+ type="ims"
+ protocol="IPV6"
+ />
+
<apn carrier="EE Internet"
mcc="234"
mnc="33"
@@ -6147,26 +6170,10 @@
type="mms"
/>
- <apn carrier="LUXGSM MMS"
+ <apn carrier="POST Internet"
mcc="270"
mnc="01"
- apn="mms.pt.lu"
- user="mms"
- password="mms"
- mmsc="http://mmsc.pt.lu"
- mmsproxy="194.154.192.88"
- mmsport="8080"
- type="mms"
- />
-
- <apn carrier="LUXGSM WAP"
- mcc="270"
- mnc="01"
- apn="wap.pt.lu"
- user="wap"
- password="wap"
- proxy="194.154.192.98"
- port="8080"
+ apn="web.pt.lu"
type="default,supl"
/>
@@ -10306,74 +10313,6 @@
type="mms"
/>
- <apn carrier="T-Mobile US 580"
- mcc="310"
- mnc="580"
- apn=""
- type="ia"
- protocol="IPV6"
- roaming_protocol="IP"
- mtu="1440"
- />
-
- <apn carrier="T-Mobile US 580"
- mcc="310"
- mnc="580"
- apn="fast.t-mobile.com"
- mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
- type="default,supl,mms"
- protocol="IPV6"
- roaming_protocol="IP"
- mtu="1440"
- />
-
- <apn carrier="T-Mobile US 580 IMS"
- mcc="310"
- mnc="580"
- apn="ims"
- type="ims"
- protocol="IPV6"
- roaming_protocol="IPV6"
- mtu="1440"
- />
-
- <apn carrier="MetroPCS 580"
- mcc="310"
- mnc="580"
- apn=""
- type="ia"
- protocol="IPV6"
- roaming_protocol="IP"
- mvno_match_data="6D"
- mvno_type="gid"
- mtu="1440"
- />
-
- <apn carrier="MetroPCS 580"
- mcc="310"
- mnc="580"
- apn="fast.metropcs.com"
- mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
- type="default,supl,mms,hipri"
- protocol="IPV6"
- roaming_protocol="IP"
- mvno_match_data="6D"
- mvno_type="gid"
- mtu="1440"
- />
-
- <apn carrier="MetroPCS 580 IMS"
- mcc="310"
- mnc="580"
- apn="ims"
- type="ims"
- mvno_match_data="6D"
- mvno_type="gid"
- protocol="IPV6"
- roaming_protocol="IPV6"
- mtu="1440"
- />
-
<apn carrier="inland"
mcc="310"
mnc="580"
diff --git a/device.mk b/device.mk
index af30d75..c2e9e7c 100644
--- a/device.mk
+++ b/device.mk
@@ -102,6 +102,7 @@
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml \
+ frameworks/native/data/etc/android.software.verified_boot.xml:system/etc/permissions/android.software.verified_boot.xml \
frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml
# For SPN display
@@ -402,16 +403,18 @@
PRODUCT_PACKAGES += \
power.bullhead
-# Modem debugger
+# Modem debugger/misc
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
QXDMLogger
PRODUCT_COPY_FILES += \
- device/lge/bullhead/init.bullhead.diag.rc.userdebug:root/init.bullhead.diag.rc
+ device/lge/bullhead/init.bullhead.diag.rc.userdebug:root/init.bullhead.diag.rc \
+ device/lge/bullhead/init.bullhead.misc.rc.userdebug:root/init.bullhead.misc.rc
else
PRODUCT_COPY_FILES += \
- device/lge/bullhead/init.bullhead.diag.rc.user:root/init.bullhead.diag.rc
+ device/lge/bullhead/init.bullhead.diag.rc.user:root/init.bullhead.diag.rc \
+ device/lge/bullhead/init.bullhead.misc.rc.user:root/init.bullhead.misc.rc
endif
# setup dm-verity configs.
diff --git a/dumpstate/dumpstate.cpp b/dumpstate/dumpstate.cpp
index 410311f..82ac468 100644
--- a/dumpstate/dumpstate.cpp
+++ b/dumpstate/dumpstate.cpp
@@ -26,6 +26,7 @@
dump_file("SMD PKT Log", "/d/ipc_logging/smd_pkt/log");
dump_file("IPC Router Log", "/d/ipc_logging/ipc_router/log");
run_command("ION HEAPS", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for d in $(ls -d /d/ion/*); do for f in $(ls $d); do echo --- $d/$f; cat $d/$f; done; done", NULL);
+ dump_file("dmabuf info", "/d/dma_buf/bufinfo");
dump_file("Battery Type", "/sys/class/power_supply/bms/battery_type");
run_command("Temperatures", 5, SU_PATH, "root", "/system/bin/sh", "-c", "for f in emmc_therm msm_therm pa_therm0 xo_therm ; do echo -n \"$f : \" ; cat /sys/class/hwmon/hwmon2/device/$f ; done ; for f in `ls /sys/class/thermal` ; do type=`cat /sys/class/thermal/$f/type` ; temp=`cat /sys/class/thermal/$f/temp` ; echo \"$type: $temp\" ; done", NULL);
dump_file("dmesg-ramoops-0", "/sys/fs/pstore/dmesg-ramoops-0");
diff --git a/init.bullhead.misc.rc.user b/init.bullhead.misc.rc.user
new file mode 100644
index 0000000..800a435
--- /dev/null
+++ b/init.bullhead.misc.rc.user
@@ -0,0 +1,4 @@
+# This file gets copied as /init.bullhead.misc.rc
+
+on early-boot
+ write /sys/module/lge_handle_panic/parameters/use_hardreset 1
diff --git a/init.bullhead.misc.rc.userdebug b/init.bullhead.misc.rc.userdebug
new file mode 100644
index 0000000..744b5fb
--- /dev/null
+++ b/init.bullhead.misc.rc.userdebug
@@ -0,0 +1,4 @@
+# This file gets copied as /init.bullhead.misc.rc
+
+on early-boot
+ write /sys/module/lge_handle_panic/parameters/use_hardreset 0
diff --git a/init.bullhead.rc b/init.bullhead.rc
index d6974de..5130d38 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -19,6 +19,7 @@
import init.bullhead.fp.rc
import init.bullhead.sensorhub.rc
import init.bullhead.ramdump.rc
+import init.bullhead.misc.rc
on early-init
mount debugfs debugfs /sys/kernel/debug
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc30/strings.xml b/overlay/frameworks/base/core/res/res/values-mcc234-mnc30/strings.xml
new file mode 100644
index 0000000..cbb6fcf
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc234-mnc30/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Template for showing cellular network operator name while WFC is active -->
+ <string name="wfcSpnFormat">%s Wi-Fi Calling</string>
+
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc234-mnc33/strings.xml b/overlay/frameworks/base/core/res/res/values-mcc234-mnc33/strings.xml
new file mode 100644
index 0000000..cbb6fcf
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc234-mnc33/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Template for showing cellular network operator name while WFC is active -->
+ <string name="wfcSpnFormat">%s Wi-Fi Calling</string>
+
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
index 7218fa7..465184b 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml
@@ -24,5 +24,22 @@
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/R5LkS9d9_LIAeJ1_/Nexus5X-M10.xml</string>
+ <!-- Values for TELUS GPS configuration -->
+ <string-array translatable="false" name="config_gpsParameters">
+ <item>SUPL_HOST=supl.telusmobility.com</item>
+ <item>SUPL_PORT=7275</item>
+ <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin</item>
+ <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin</item>
+ <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin</item>
+ <item>NTP_SERVER=north-america.pool.ntp.org</item>
+ <item>SUPL_MODE=1</item>
+ <item>SUPL_VER=0x20000</item>
+ <item>LPP_PROFILE=0</item>
+ <item>NMEA_PROVIDER=0</item>
+ <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
+ <item>ERR_ESTIMATE=0</item>
+ <item>INTERMEDIATE_POS=0</item>
+ <item>SUPL_ES=0</item>
+ </string-array>
</resources>
diff --git a/spn-conf.xml b/spn-conf.xml
index 942e8b1..3c6fa35 100644
--- a/spn-conf.xml
+++ b/spn-conf.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<spnOverrides>
+ <spnOverride numeric="23430" spn="EE"/>
+ <spnOverride numeric="23433" spn="EE"/>
<spnOverride numeric="310160" spn="T-Mobile"/>
<spnOverride numeric="310200" spn="T-Mobile"/>
<spnOverride numeric="310210" spn="T-Mobile"/>
