merge in mnc-dr-release history after reset to mnc-dr-dev
diff --git a/audio_platform_info.xml b/audio_platform_info.xml
index 1ce5b58..e0dac14 100644
--- a/audio_platform_info.xml
+++ b/audio_platform_info.xml
@@ -48,5 +48,17 @@
<!-- If sound card name is not known, remove this entry -->
<param key="snd_card_name" value="msm8994-tomtom-snd-card"/>
<param key="input_mic_max_count" value="3"/>
+ <param key="operator_info" value="verizon;310004;311480"/>
+ <param key="operator_info" value="uscellular;311220;311580"/>
</config_params>
+ <operator_specific>
+ <device name="SND_DEVICE_IN_VOICE_DMIC" operator="verizon" mixer_path="voice-dmic-ef-vzwusc" acdb_id="130"/>
+ <device name="SND_DEVICE_IN_VOICE_DMIC" operator="uscellular" mixer_path="voice-dmic-ef-vzwusc" acdb_id="130"/>
+ <device name="SND_DEVICE_OUT_VOICE_HANDSET" operator="verizon" mixer_path="voice-handset-vzwusc" acdb_id="131"/>
+ <device name="SND_DEVICE_OUT_VOICE_HANDSET" operator="uscellular" mixer_path="voice-handset-vzwusc" acdb_id="131"/>
+ <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" operator="verizon" mixer_path="voice-headset-mic-vzwusc" acdb_id="132"/>
+ <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" operator="uscellular" mixer_path="voice-headset-mic-vzwusc" acdb_id="132"/>
+ <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" operator="verizon" mixer_path="voice-headphones-vzwusc" acdb_id="133"/>
+ <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" operator="uscellular" mixer_path="voice-headphones-vzwusc" acdb_id="133"/>
+ </operator_specific>
</audio_platform_info>
diff --git a/device.mk b/device.mk
index 0ce0f06..eeda7f3 100644
--- a/device.mk
+++ b/device.mk
@@ -1,4 +1,5 @@
#
+
# Copyright (C) 2015 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -336,8 +337,8 @@
# If data_no_toggle is 0 there are no reports if the screen is off.
# If data_no_toggle is 1 then dormancy indications will come with screen off.
-PRODUCT_PROPERTY_OVERRIDES += \
- persist.radio.data_no_toggle=1
+#PRODUCT_PROPERTY_OVERRIDES += \
+# persist.radio.data_no_toggle=1
# Set bluetooth soc to rome
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/init.bullhead.rc b/init.bullhead.rc
index e3bae13..d13dd1d 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -179,6 +179,9 @@
# Create /data/time folder for time-services
mkdir /data/time/ 0700 system system
+ # Create the directories used by CnE subsystem
+ mkdir /data/connectivity 0771 system system
+
# NFC: create data/nfc for nv storage
mkdir /data/nfc 0770 nfc nfc
mkdir /data/nfc/param 0770 nfc nfc
diff --git a/mixer_paths.xml b/mixer_paths.xml
index af67c50..5c96475 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -1702,6 +1702,12 @@
<path name="handset" />
</path>
+ <path name="voice-handset-vzwusc">
+ <path name="handset" />
+ <ctl name="RX1 Digital Volume" value="84" />
+ <ctl name="EAR PA Gain" value="POS_6_DB" />
+ </path>
+
<path name="voice-speaker">
<path name="speaker" />
<ctl name="COMP0 Switch" value="0" />
@@ -1724,12 +1730,26 @@
<ctl name="RX2 Digital Volume" value="84" />
</path>
+ <path name="voice-headphones-vzwusc">
+ <path name="headphones" />
+ <ctl name="COMP1 Switch" value="1" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
+ <ctl name="RX1 Digital Volume" value="84" />
+ <ctl name="RX2 Digital Volume" value="84" />
+ </path>
+
<path name="voice-headset-mic">
<path name="headset-mic" />
<ctl name="ADC2 Volume" value="10" />
<ctl name="DEC5 Volume" value="84" />
</path>
+ <path name="voice-headset-mic-vzwusc">
+ <path name="headset-mic" />
+ <ctl name="ADC2 Volume" value="10" />
+ <ctl name="DEC5 Volume" value="84" />
+ </path>
<path name="speaker-and-headphones">
<path name="headphones" />
@@ -1988,6 +2008,12 @@
<ctl name="DEC10 Volume" value="84" />
</path>
+ <path name="voice-dmic-ef-vzwusc">
+ <path name="dmic-endfire" />
+ <ctl name="DEC7 Volume" value="84" />
+ <ctl name="DEC10 Volume" value="84" />
+ </path>
+
<path name="voice-speaker-dmic-ef">
<path name="speaker-dmic-endfire" />
<ctl name="DEC10 Volume" value="84" />
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
index bfda3f1..7bdb9a5 100644
--- a/nfc/libnfc-nxp.conf
+++ b/nfc/libnfc-nxp.conf
@@ -49,6 +49,13 @@
NXP_SYS_CLOCK_TO_CFG=0x1A
###############################################################################
+# NXP TVDD configurations settings
+# Allow NFCC to configure External TVDD, There are currently three
+#configurations (1, 2 and 3) are supported, out of them only one can be
+#supported.
+NXP_EXT_TVDD_CFG=0x03
+
+###############################################################################
# NXP proprietary settings
NXP_ACT_PROP_EXTN={2F, 02, 00}
@@ -62,211 +69,99 @@
# 0x01 - Enabled
NXP_CORE_STANDBY={2F, 00, 01, 01}
-# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.11 ***
-NXP_RF_CONF_BLK_1={
- 20, 02, F6, 20,
- A0, 0D, 03, 00, 47, 02,
- A0, 0D, 03, 00, 40, 01,
- A0, 0D, 06, 00, FF, 05, 04, 06, 00,
- A0, 0D, 03, 04, 43, 20,
- A0, 0D, 06, 04, 35, F4, 01, F4, 01,
- A0, 0D, 06, 04, FF, 05, 00, 00, 00,
- A0, 0D, 06, 06, 44, A3, 90, 03, 00,
- A0, 0D, 06, 06, 34, F7, 7F, 00, 10,
- A0, 0D, 06, 06, 33, 07, 40, 00, 00,
- A0, 0D, 06, 06, 30, C8, 00, 64, 00,
- A0, 0D, 06, 06, 2F, AF, 05, 80, 17,
- A0, 0D, 04, 06, 03, 00, 6D,
- A0, 0D, 03, 06, 43, 20,
- A0, 0D, 06, 06, 42, 00, 02, FF, FF,
- A0, 0D, 03, 06, 41, 40,
- A0, 0D, 03, 06, 37, 08,
- A0, 0D, 03, 06, 16, 00,
- A0, 0D, 03, 06, 15, 00,
- A0, 0D, 06, 06, 35, 00, 02, 00, 02,
- A0, 0D, 03, 06, 3F, 04,
- A0, 0D, 03, 06, 80, 03,
- A0, 0D, 06, 06, FF, 05, 00, 00, 00,
- A0, 0D, 03, 07, 3F, 00,
- A0, 0D, 06, 18, 34, 00, 00, E1, 03,
- A0, 0D, 06, 18, 33, 0F, 83, 00, 00,
- A0, 0D, 06, 1C, 34, 00, 00, E1, 03,
- A0, 0D, 06, 1C, 33, 0F, 83, 00, 00,
- A0, 0D, 06, 20, 4A, 00, 00, 00, 00,
- A0, 0D, 06, 20, 42, 88, 10, FF, FF,
- A0, 0D, 03, 20, 16, 00,
- A0, 0D, 03, 20, 15, 00,
- A0, 0D, 04, 22, 44, 22, 00
-}
-
-# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.11 ***
-NXP_RF_CONF_BLK_2={
- 20, 02, FB, 20,
- A0, 0D, 06, 22, 2D, 50, 44, 0C, 00,
- A0, 0D, 04, 32, 03, 40, 3D,
- A0, 0D, 06, 32, 42, F8, 10, FF, FF,
- A0, 0D, 03, 32, 16, 00,
- A0, 0D, 03, 32, 15, 01,
- A0, 0D, 03, 32, 0D, 22,
- A0, 0D, 03, 32, 14, 22,
- A0, 0D, 06, 32, 4A, 33, 07, 00, 08,
- A0, 0D, 06, 34, 2D, 24, 47, 0C, 00,
- A0, 0D, 06, 34, 34, 00, 00, EC, 03,
- A0, 0D, 06, 34, 33, 0F, 01, 01, 70,
- A0, 0D, 04, 34, 44, 21, 00,
- A0, 0D, 06, 38, 4A, 33, 07, 00, 08,
- A0, 0D, 06, 38, 42, 68, 10, FF, FF,
- A0, 0D, 03, 38, 16, 00,
- A0, 0D, 03, 38, 15, 00,
- A0, 0D, 04, 3A, 44, 26, 00,
- A0, 0D, 06, 3A, 2D, 15, 47, 0D, 00,
- A0, 0D, 06, 3A, 34, 00, 00, E1, 03,
- A0, 0D, 06, 3A, 33, 0B, 83, 00, 00,
- A0, 0D, 06, 3C, 4A, 52, 07, 00, 1B,
- A0, 0D, 06, 3C, 42, 68, 10, FF, FF,
- A0, 0D, 03, 3C, 16, 00,
- A0, 0D, 03, 3C, 15, 00,
- A0, 0D, 04, 3E, 44, 26, 00,
- A0, 0D, 06, 3E, 2D, 15, 47, 0D, 00,
- A0, 0D, 06, 3E, 34, 00, 00, E1, 03,
- A0, 0D, 06, 3E, 33, 0B, 83, 00, 00,
- A0, 0D, 06, 40, 42, F0, 10, FF, FF,
- A0, 0D, 03, 40, 0D, 02,
- A0, 0D, 03, 40, 14, 02,
- A0, 0D, 06, 40, 4A, 12, 07, 00, 00
-}
-
-# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.11 ***
-NXP_RF_CONF_BLK_3={
- 20, 02, F7, 20,
- A0, 0D, 03, 40, 16, 00,
- A0, 0D, 03, 40, 15, 00,
- A0, 0D, 04, 42, 44, 26, 00,
- A0, 0D, 06, 42, 2D, 15, 47, 0D, 00,
- A0, 0D, 06, 42, 34, 00, 00, E1, 03,
- A0, 0D, 06, 42, 33, 0B, 83, 00, 00,
- A0, 0D, 04, 46, 44, 26, 00,
- A0, 0D, 06, 46, 2D, 15, 25, 0D, 00,
- A0, 0D, 06, 44, 4A, 21, 07, 00, 07,
- A0, 0D, 06, 44, 42, 88, 10, FF, FF,
- A0, 0D, 03, 44, 16, 00,
- A0, 0D, 03, 44, 15, 00,
- A0, 0D, 04, 4A, 44, 21, 00,
- A0, 0D, 06, 4A, 2D, 15, 9D, 0D, 00,
- A0, 0D, 06, 48, 4A, 21, 07, 00, 07,
- A0, 0D, 06, 48, 42, 88, 10, FF, FF,
- A0, 0D, 03, 48, 16, 00,
- A0, 0D, 03, 48, 15, 00,
- A0, 0D, 04, 4E, 44, 26, 00,
- A0, 0D, 06, 4E, 2D, 15, 25, 0D, 00,
- A0, 0D, 06, 4C, 4A, 21, 07, 00, 07,
- A0, 0D, 06, 4C, 42, 88, 10, FF, FF,
- A0, 0D, 03, 4C, 16, 00,
- A0, 0D, 03, 4C, 15, 00,
- A0, 0D, 04, 52, 44, 26, 00,
- A0, 0D, 06, 52, 2D, 15, 25, 0D, 00,
- A0, 0D, 06, 50, 42, 90, 10, FF, FF,
- A0, 0D, 06, 50, 4A, 21, 07, 00, 07,
- A0, 0D, 03, 50, 16, 00,
- A0, 0D, 03, 50, 15, 00,
- A0, 0D, 06, 56, 2D, 05, 9E, 0C, 00,
- A0, 0D, 04, 56, 44, 22, 00
-}
-
-# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.11 ***
-NXP_RF_CONF_BLK_4={
- 20, 02, FB, 1E,
- A0, 0D, 06, 5C, 2D, 05, 9E, 0C, 00,
- A0, 0D, 04, 5C, 44, 26, 00,
- A0, 0D, 06, 54, 42, 88, 10, FF, FF,
- A0, 0D, 06, 54, 4A, 33, 07, 01, 07,
- A0, 0D, 03, 54, 16, 00,
- A0, 0D, 03, 54, 15, 00,
- A0, 0D, 06, 5A, 42, 90, 10, FF, FF,
- A0, 0D, 06, 5A, 4A, 31, 07, 01, 07,
- A0, 0D, 03, 5A, 16, 00,
- A0, 0D, 03, 5A, 15, 00,
- A0, 0D, 06, 98, 2F, CF, 05, 80, 17,
- A0, 0D, 06, 9A, 42, 00, 00, FF, FF,
- A0, 0D, 06, 30, 44, 12, 90, 03, 00,
- A0, 0D, 06, 6C, 44, A3, 90, 03, 00,
- A0, 0D, 06, 6C, 30, CF, 00, 08, 00,
- A0, 0D, 06, 6C, 2F, 8F, 05, 80, 0C,
- A0, 0D, 06, 70, 2F, 8F, 05, 80, 12,
- A0, 0D, 06, 70, 30, CF, 00, 08, 00,
- A0, 0D, 03, 70, 2E, 40,
- A0, 0D, 03, 70, 45, 30,
- A0, 0D, 06, 74, 2F, 6F, 05, 80, 12,
- A0, 0D, 06, 74, 30, D5, 00, 40, 00,
- A0, 0D, 06, 78, 2F, 3F, 07, 80, C1,
- A0, 0D, 06, 78, 30, 50, 00, 10, 00,
- A0, 0D, 06, 78, 44, A3, 90, 03, 00,
- A0, 0D, 06, 7C, 2F, CF, 05, 80, 17,
- A0, 0D, 06, 7C, 30, C8, 00, 64, 00,
- A0, 0D, 06, 7C, 44, A3, 90, 03, 00,
- A0, 0D, 06, 80, 2F, CF, 05, 80, 17,
- A0, 0D, 06, 80, 30, C8, 00, 64, 00
-}
-
-# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.11 ***
-NXP_RF_CONF_BLK_5={
- 20, 02, D3, 1A,
- A0, 0D, 06, 80, 44, A3, 90, 03, 00,
- A0, 0D, 06, 84, 2F, CF, 05, 80, 17,
- A0, 0D, 06, 84, 30, C8, 00, 64, 00,
- A0, 0D, 06, 84, 44, A3, 90, 03, 00,
- A0, 0D, 06, 88, 2F, B1, 05, 80, 17,
- A0, 0D, 06, 88, 30, A8, 00, 64, 00,
- A0, 0D, 06, 88, 44, A3, 90, 03, 00,
- A0, 0D, 03, 10, 43, 20,
- A0, 0D, 06, 6A, 42, F8, 10, FF, FF,
- A0, 0D, 03, 6A, 16, 00,
- A0, 0D, 03, 6A, 15, 01,
- A0, 0D, 06, 6A, 4A, 30, 0F, 01, 1F,
- A0, 0D, 06, 8C, 42, 88, 10, FF, FF,
- A0, 0D, 06, 8C, 4A, 33, 07, 01, 07,
- A0, 0D, 03, 8C, 16, 00,
- A0, 0D, 03, 8C, 15, 00,
- A0, 0D, 06, 92, 42, 90, 10, FF, FF,
- A0, 0D, 06, 92, 4A, 31, 07, 01, 07,
- A0, 0D, 03, 92, 16, 00,
- A0, 0D, 03, 92, 15, 00,
- A0, 0D, 06, 0A, 30, C8, 00, 64, 00,
- A0, 0D, 06, 0A, 2F, AF, 05, 80, 17,
- A0, 0D, 03, 0A, 48, 10,
- A0, 0D, 06, 0A, 44, A3, 90, 03, 00,
- A0, 0D, 06, 0A, 34, 26, 65, E5, 03,
- A0, 0D, 06, 0A, 33, 0F, 01, 00, 70
-}
-
+# *** ALMSL(NO BOOSTER) FW VERSION = 10.01.17 ***
###############################################################################
# NXP RF configuration ALM/PLM settings
# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_6={ 20, 02, 57, 08,
+# New Features were added since FW10.1.13
+# A0, 0D, 06, 70, 44, A3, 90, 03, 00, RF_CLIF_CFG_BR_212_T_RXA CLIF_ANA_RX_REG
+# A0, 0D, 06, 74, 44, A3, 90, 03, 00 RF_CLIF_CFG_BR_424_T_RXA CLIF_ANA_RX_REG
+# A0, 0D, 06, 8E, 44, 12, 90, 03, 00, RF_CLIF_CFG_BR_212_T_RXF CLIF_ANA_RX_REG
+# A0, 0D, 06, 94, 44, 12, 90, 03, 00, RF_CLIF_CFG_BR_424_T_RXF CLIF_ANA_RX_REG
+# A0, 0D, 03, 24, 41, 40, RF_CLIF_CFG_TECHNO_T_TXA_P CLIF_ANA_TX_CLK_CONTROL_REG
+# A0, 0D, 06, 24, 42, 00, 02, FF, FF, RF_CLIF_CFG_TECHNO_T_TXA_P CLIF_ANA_TX_AMPLITUDE_REG
+# A0, 0D, 03, 28, 41, 40, RF_CLIF_CFG_TECHNO_T_TXB CLIF_ANA_TX_CLK_CONTROL_REG
+# A0, 0D, 06, 28, 42, 00, 02, FF, FF, RF_CLIF_CFG_TECHNO_T_TXB CLIF_ANA_TX_AMPLITUDE_REG
+# A0, 0D, 03, 8A, 41, 40, RF_CLIF_CFG_BR_212_T_TXF_P CLIF_ANA_TX_CLK_CONTROL_REG
+# A0, 0D, 03, 90, 41, 40, RF_CLIF_CFG_BR_424_T_TXF_P CLIF_ANA_TX_CLK_CONTROL_REG
+
+# legacy RF parameters.
+# A0, 0D, 03, 06, 37, 08, RF_CLIF_CFG_TARGET CLIF_TX_CONTROL_REG
+# A0, 0D, 06, 32, 42, F8, 20, FF, FF, RF_CLIF_CFG_BR_106_I_TXA CLIF_ANA_TX_AMPLITUDE_REG
+# A0, 0D, 06, 06, 42, 00, 03, F2, F4, RF_CLIF_CFG_TARGET CLIF_ANA_TX_AMPLITUDE_REG
+# A0, 0D, 06, 32, 4A, 33, 07, 00, 1C, RF_CLIF_CFG_BR_106_I_TXA CLIF_ANA_TX_SHAPE_CONTROL_REG
+# A0, 1D, 11, 55, ... CLK_MAN_Power ON
+# A0, 1E, 11, 1D, ... CLK_MAN_Power OFF
+# A0, 0D, 04, 06, 03, 00, 71, RF_CLIF_CFG_TARGET CLIF_TRANSCEIVE_CONTROL_REG
+# A0, 0D, 03, 00, 40, 05 RF_CLIF_CFG_BOOT CLIF_ANA_NFCLD_REG
+# A0, 0D, 06, 9A, 42, 00, 00, FF, FF, RF_CLIF_CFG_GTM_FELICA CLIF_ANA_TX_AMPLITUDE_REG
+##############################################################################################################
+##############################################################################################################
+# Please be noticed that below registers has to be set as same value !!!!!
+# x value should be set to 0x0
+# y value should be set as same value.
+# A0, 0D, 06, 06, 42, 00, 0x, Fy, F3,
+# A0, 0D, 06, 24, 42, 00, 0x, Fy, F3,
+# A0, 0D, 06, 98, 42, 00, 0x, Fy, F3,
+# A0, 0D, 06, 9A, 42, 00, 0x, Fy, F3,
+##############################################################################################################
+##############################################################################################################
+
+NXP_RF_CONF_BLK_1={ 20, 02, A6, 11,
A0, 0D, 03, 06, 37, 08,
+ A0, 0D, 06, 34, 2D, 24, 37, 0C, 00,
+ A0, 0D, 04, 34, 44, 22, 00,
A0, 0D, 06, 32, 42, F8, 20, FF, FF,
- A0, 0D, 06, 06, 42, 00, 03, F2, F2,
+ A0, 0D, 06, 06, 42, 00, 00, F1, F1,
+ A0, 0D, 06, 24, 42, 00, 00, F1, F1,
+ A0, 0D, 06, 98, 42, 00, 00, F1, F1,
+ A0, 0D, 06, 9A, 42, 00, 00, F1, F1,
A0, 0D, 06, 32, 4A, 33, 07, 00, 1C,
- A0, 1D, 11, 52, 33, 14, 17, 00, AA, 85, 00, 80, 55, 2A, 04, 00, 63, 00, 00, 00,
- A0, 1E, 11, 1A, 13, 14, 14, 00, 6F, 97, 00, 00, 00, 10, 04, 00, 63, 02, 00, 00,
- A0, 0D, 04, 06, 03, 00, 71,
- A0, 0D, 03, 00, 40, 05
+ A0, 1D, 11, 54, 33, 14, 17, 00, AA, 85, 00, 80, 55, 2A, 04, 00, 63, 00, 00, 00,
+ A0, 1E, 11, 1C, 13, 14, 14, 00, 6F, 97, 00, 00, 00, 10, 04, 00, 63, 02, 00, 00,
+ A0, 0D, 06, 06, 03, 00, 71, 00, 20,
+ A0, 0D, 03, 00, 40, 05,
+ A0, 0D, 06, 56, 2D, 05, 9F, 0C, 00,
+ A0, 0D, 04, 56, 44, 22, 00,
+ A0, 0D, 06, 54, 42, 88, 30, FF, FF,
+ A0, 0D, 06, 44, 42, 88, 20, FF, FF
}
-###############################################################################
+
# Core configuration extensions
# It includes
-# Wired mode settings A0ED, A0EE
-# Tag Detector A040, A041, A043
-# Low Power mode A007
-# Clock settings A002, A003
-# PbF settings A008
-NXP_CORE_CONF_EXTN={20, 02, 53, 13,
+# A002 - Clock Request
+# 0x00 - Disabled
+# 0x01 - Enabled
+# A003 - Clock Selection
+# Please refer to User Manual
+# A004 - Clock Time Out
+# Defined in ms
+# A00E - Load Modulation Mode
+# 0x00 - PLM
+# 0x01 - ALM
+# A012 - SWP interface 2 configuration
+# 0x00 - SWP
+# 0x02 - DWP
+# Please refer to User Manual
+# A040-A043 - Ultra Low Power Tag Detector
+# Please refer to Application Note of ULPTD
+# A05E - Jewel Reader
+# Please refer to User Manual
+# A0CD - SWP S1 line behavior
+# Defined S1 High time out during Activation sequence
+# A0EC - SWP1 interface
+# 0x00 - Disabled
+# 0x01 - Enabled
+# A0ED - SWP2 interface
+# 0x00 - Disabled
+# 0x01 - Enabled
+NXP_CORE_CONF_EXTN={20, 02, 49, 11,
A0, 02, 01, 01,
A0, 03, 01, 08,
A0, 04, 01, 0A,
A0, 06, 01, 01,
- A0, 80, 02, E8, 03,
+ A0, 80, 02, B0, 04,
A0, 11, 04, 14, B8, 0B, 14,
A0, 5E, 01, 01,
A0, CD, 01, 0F,
@@ -274,18 +169,16 @@
A0, ED, 01, 00,
A0, CB, 01, 0F,
A0, CE, 01, 7F,
- A0, 40, 01, 00,
- A0, 41, 01, 08,
+ A0, 40, 01, 01,
+ A0, 41, 01, 03,
A0, 42, 01, 19,
- A0, 43, 01, 04,
- A0, F2, 01, 00,
- A0, 0E, 03, 52, 64, 0A,
- A0, 66, 01, 01
+ A0, 43, 01, 00,
+ A0, F2, 01, 00
}
-###############################################################################
-# Core configuration rf field filter settings to enable set 01 ,to disable set to 00 last bit
-NXP_CORE_RF_FIELD={20, 02, 05, 01, A0, 62, 01, 01
+NXP_EXT_TVDD_CFG_3={20, 02, 0B, 02,
+ A0, 0E, 03, 52, 64, 0A,
+ A0, 66, 01, 01
}
###############################################################################
@@ -302,7 +195,7 @@
33, 04, 01, 02, 03, 04,
54, 01, 06,
50, 01, 00,
- 5B, 01, 02,
+ 5B, 01, 00,
60, 01, 0E,
80, 01, 01,
81, 01, 01,
diff --git a/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml b/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml
new file mode 100644
index 0000000..fe7661c
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml
@@ -0,0 +1,40 @@
+<?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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <string-array translatable="false" name="config_default_vm_number">
+ <!-- SBM -->
+ <item>09066517000</item>
+ </string-array>
+
+ <!-- MMS user agent prolfile url -->
+ <string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/20151004.xml</string>
+
+ <!-- Entitlement APP provisioning for Tethering -->
+ <string-array translatable="false" name="config_mobile_hotspot_provision_app">
+ <item>com.lge.entitlement</item>
+ <item>com.lge.entitlement.EntitlementDialogActivity</item>
+ </string-array>
+ <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
+ <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
+
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml b/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
index 5dc133a..fe7661c 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc440-mnc20/config.xml
@@ -21,9 +21,20 @@
for different hardware and product builds. -->
<resources>
- <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
- Please don't copy them, copy anything else. -->
+ <string-array translatable="false" name="config_default_vm_number">
+ <!-- SBM -->
+ <item>09066517000</item>
+ </string-array>
+
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/20151004.xml</string>
+ <!-- Entitlement APP provisioning for Tethering -->
+ <string-array translatable="false" name="config_mobile_hotspot_provision_app">
+ <item>com.lge.entitlement</item>
+ <item>com.lge.entitlement.EntitlementDialogActivity</item>
+ </string-array>
+ <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
+ <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
+
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml b/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml
new file mode 100644
index 0000000..fe7661c
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml
@@ -0,0 +1,40 @@
+<?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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <string-array translatable="false" name="config_default_vm_number">
+ <!-- SBM -->
+ <item>09066517000</item>
+ </string-array>
+
+ <!-- MMS user agent prolfile url -->
+ <string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/20151004.xml</string>
+
+ <!-- Entitlement APP provisioning for Tethering -->
+ <string-array translatable="false" name="config_mobile_hotspot_provision_app">
+ <item>com.lge.entitlement</item>
+ <item>com.lge.entitlement.EntitlementDialogActivity</item>
+ </string-array>
+ <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
+ <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
+
+</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml b/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml
new file mode 100644
index 0000000..fe7661c
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml
@@ -0,0 +1,40 @@
+<?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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <string-array translatable="false" name="config_default_vm_number">
+ <!-- SBM -->
+ <item>09066517000</item>
+ </string-array>
+
+ <!-- MMS user agent prolfile url -->
+ <string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/20151004.xml</string>
+
+ <!-- Entitlement APP provisioning for Tethering -->
+ <string-array translatable="false" name="config_mobile_hotspot_provision_app">
+ <item>com.lge.entitlement</item>
+ <item>com.lge.entitlement.EntitlementDialogActivity</item>
+ </string-array>
+ <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
+ <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
+
+</resources>
