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

Commit 52617bbf authored by Tsuwei Chen's avatar Tsuwei Chen
Browse files

Reload GPS configuration after carrier info is available. 

Bug: 17110478
Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
parent 09daab20

core/res/res/values-mcc310-mnc260/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -25,4 +25,9 @@ 
    -->

    <integer name="config_mobile_mtu">1440</integer>



    <!-- Values for GPS configuration -->

    <string-array translatable="false" name="config_gpsParameters">

        <item>"SUPL_PORT=7279"</item>

        <item>GPS_LOCK=1</item>

    </string-array>

</resources>

core/res/res/values-mcc310-mnc410/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -40,4 +40,8 @@ 
        <item>315</item>

        <item>316</item>

    </string-array>

    <!-- Values for GPS configuration -->

    <string-array translatable="false" name="config_gpsParameters">

        <item>"SUPL_HOST=supl.google.com"</item>

    </string-array>

</resources>

core/res/res/values/config.xml

+17 −0
Original line number Diff line number Diff line
@@ -1695,4 +1695,21 @@ 
    <string-array translatable="false" name="no_ems_support_sim_operators" />



    <bool name="config_auto_attach_data_on_creation">true</bool>



    <!-- Values for GPS configuration -->

    <string-array translatable="false" name="config_gpsParameters">

        <item>SUPL_HOST=supl.google.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_VER=0x20000</item>

        <item>CAPABILITIES=0x33</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>

    </string-array>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,7 @@ 
  <java-symbol type="array" name="config_globalActionsList" />

  <java-symbol type="array" name="config_telephonyHardware" />

  <java-symbol type="array" name="config_keySystemUuidMapping" />

  <java-symbol type="array" name="config_gpsParameters" />



  <java-symbol type="drawable" name="default_wallpaper" />

  <java-symbol type="drawable" name="indicator_input_error" />

location/java/android/location/GpsMeasurement.java

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class GpsMeasurement implements Parcelable { 
    private double mCarrierPhase;

    private double mCarrierPhaseUncertainty;

    private byte mLossOfLock;

    private short mBitNumber;

    private int mBitNumber;

    private short mTimeFromLastBitInMs;

    private double mDopplerShiftInHz;

    private double mDopplerShiftUncertaintyInHz;
@@ -784,14 +784,14 @@ public class GpsMeasurement implements Parcelable { 
     *

     * The value is only available if {@link #hasBitNumber()} is true.

     */

    public short getBitNumber() {

    public int getBitNumber() {

        return mBitNumber;

    }



    /**

     * Sets the bit number within the broadcast frame.

     */

    public void setBitNumber(short bitNumber) {

    public void setBitNumber(int bitNumber) {

        setFlag(HAS_BIT_NUMBER);

        mBitNumber = bitNumber;

    }
@@ -801,7 +801,7 @@ public class GpsMeasurement implements Parcelable { 
     */

    public void resetBitNumber() {

        resetFlag(HAS_BIT_NUMBER);

        mBitNumber = Short.MIN_VALUE;

        mBitNumber = Integer.MIN_VALUE;

    }



    /**
@@ -1161,7 +1161,7 @@ public class GpsMeasurement implements Parcelable { 
            gpsMeasurement.mCarrierPhase = parcel.readDouble();

            gpsMeasurement.mCarrierPhaseUncertainty = parcel.readDouble();

            gpsMeasurement.mLossOfLock = parcel.readByte();

            gpsMeasurement.mBitNumber = (short) parcel.readInt();

            gpsMeasurement.mBitNumber = parcel.readInt();

            gpsMeasurement.mTimeFromLastBitInMs = (short) parcel.readInt();

            gpsMeasurement.mDopplerShiftInHz = parcel.readDouble();

            gpsMeasurement.mDopplerShiftUncertaintyInHz = parcel.readDouble();