From 27539872f3cdeb3cfbc9552c2e7936d5f2b6b48c Mon Sep 17 00:00:00 2001
From: Shinru Han <shinruhan@google.com>
Date: Thu, 16 Aug 2018 16:09:23 +0800
Subject: Changing SUPL_ES=1 for SUPL end point control

SUPL_ES=1 ensures the GnssLocationProvider and related framework code
accepts incoming SMS SUPL_INIT messages with ES-bit=1 (which allow
redirection of the ESLP end-point e.g. to the current local emergency
services provider when you are travelling) only during an emergency call

Bug: 112623041
Bug: 112159033
Test: Verified setting takes effect on device with different SIMs
and no sim, and quick GPS works verification.

Change-Id: I03c00fbb3ca40f0254098b2cca885e061e2f2d27
---
 overlay/frameworks/base/core/res/res/values-mcc302-mnc220/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc302-mnc610/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc302-mnc720/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc310-mnc260/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc220/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc221/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc222/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc223/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc224/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc226/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc227/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc228/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc229/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc580/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc581/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc582/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc583/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc584/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc585/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc586/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc587/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc588/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc589/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml | 2 +-
 overlay/frameworks/base/core/res/res/values/config.xml               | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

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 d5e94703..ce5d6331 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 53329e58..4d99aa2c 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 1a1a4950..c0246f31 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 8ccd8b29..e059d1c9 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 5bc1fa75..4b14db38 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 59018754..9c326c5f 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 c18f1679..8cb86bf2 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 27e357a9..7af13f38 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 c18f1679..8cb86bf2 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 47413674..52943552 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 27e357a9..7af13f38 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 28f927f4..eb80d4cd 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 -->
-- 
cgit v1.2.3