Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release
Change-Id: I8a3bd9b79d63b665ea12423b67db3df581f14bcb
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 d5e9470..ce5d633 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
@@ -37,7 +37,7 @@
<item>ERR_ESTIMATE=0</item>
<item>INTERMEDIATE_POS=0</item>
<item>GPS_LOCK=0</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc610/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc610/config.xml
index 53329e5..4d99aa2 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc610/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc610/config.xml
@@ -37,7 +37,7 @@
<item>ERR_ESTIMATE=0</item>
<item>INTERMEDIATE_POS=0</item>
<item>GPS_LOCK=0</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml b/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
index 1a1a495..c0246f3 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml
@@ -45,7 +45,7 @@
<item>ERR_ESTIMATE=0</item>
<item>INTERMEDIATE_POS=0</item>
<item>GPS_LOCK=0</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
index 8ccd8b2..e059d1c 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
@@ -52,7 +52,7 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
<!-- sms encoded as octet is decoded by utf8 decoder. if it is true -->
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
index 5bc1fa7..4b14db3 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml
@@ -71,7 +71,7 @@
<item>GPS_LOCK=1</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
index 5901875..9c326c5 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
@@ -52,7 +52,7 @@
<item>GPS_LOCK=1</item>
<item>LPP_PROFILE=3</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
<!-- If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 this is the Values
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
index c18f167..8cb86bf 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml
@@ -36,7 +36,7 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
index 27e357a..7af13f3 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
@@ -52,7 +52,7 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
<!-- Entitlement APP provisioning for Tethering -->
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
index c18f167..8cb86bf 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml
@@ -36,7 +36,7 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
index 4741367..5294355 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml
@@ -36,6 +36,6 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
index 27e357a..7af13f3 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
@@ -52,7 +52,7 @@
<item>GPS_LOCK=3</item>
<item>LPP_PROFILE=2</item>
<item>SUPL_MODE=1</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
<!-- Entitlement APP provisioning for Tethering -->
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 28f927f..eb80d4c 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -453,7 +453,7 @@
<item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>
<item>ERR_ESTIMATE=0</item>
<item>INTERMEDIATE_POS=0</item>
- <item>SUPL_ES=0</item>
+ <item>SUPL_ES=1</item>
</string-array>
<!-- Values for USB port setting. in format of bootmode:current function:new function -->
