Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6df001 authored by Wayne Lin's avatar Wayne Lin
Browse files

resolve merge conflicts of 3afd4aed to oc-dr1-dev 

Bug: 115331218
Bug: 112159033
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
parents 6c2376ce 3afd4aed

core/res/res/values-mcc302-mnc220/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=3</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc221/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=3</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc370/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=2</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc610/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=2</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc640/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=2</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>