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

Commit 711b1d2f authored by Tushar Janefalkar's avatar Tushar Janefalkar Committed by Steve Kondik
Browse files

Add support for BeiDou and Glonass 

Added masks for BeiDou amd Glonass
when deleting aiding data

Change-Id: I2d59f862b5c47204f053787038b3f180adc89eba
CRs-fixed: 498642
(cherry picked from commit 768a780bb1c74b708531257d8a2108c9fc3b62dd)
(cherry picked from commit 5d538b89d43f9c6d7c880ca494d62c0392e5dc0e)
(cherry picked from commit 45d57711ebb9f93ecada25fe5dc657323875fdc9)
parent 2b793d1e

services/java/com/android/server/location/GpsLocationProvider.java

+29 −13
Original line number Diff line number Diff line
@@ -133,19 +133,35 @@ public class GpsLocationProvider implements LocationProviderInterface { 
    private static final int LOCATION_HAS_ACCURACY = 16;



// IMPORTANT - the GPS_DELETE_* symbols here must match constants in gps.h

    private static final int GPS_DELETE_EPHEMERIS = 0x0001;

    private static final int GPS_DELETE_ALMANAC = 0x0002;

    private static final int GPS_DELETE_POSITION = 0x0004;

    private static final int GPS_DELETE_TIME = 0x0008;

    private static final int GPS_DELETE_IONO = 0x0010;

    private static final int GPS_DELETE_UTC = 0x0020;

    private static final int GPS_DELETE_HEALTH = 0x0040;

    private static final int GPS_DELETE_SVDIR = 0x0080;

    private static final int GPS_DELETE_SVSTEER = 0x0100;

    private static final int GPS_DELETE_SADATA = 0x0200;

    private static final int GPS_DELETE_RTI = 0x0400;

    private static final int GPS_DELETE_CELLDB_INFO = 0x8000;

    private static final int GPS_DELETE_ALL = 0xFFFF;

// and gps_extended_c.h

    private static final int GPS_DELETE_EPHEMERIS = 0x00000001;

    private static final int GPS_DELETE_ALMANAC = 0x00000002;

    private static final int GPS_DELETE_POSITION = 0x00000004;

    private static final int GPS_DELETE_TIME = 0x00000008;

    private static final int GPS_DELETE_IONO = 0x00000010;

    private static final int GPS_DELETE_UTC = 0x00000020;

    private static final int GPS_DELETE_HEALTH = 0x00000040;

    private static final int GPS_DELETE_SVDIR = 0x00000080;

    private static final int GPS_DELETE_SVSTEER = 0x00000100;

    private static final int GPS_DELETE_SADATA = 0x00000200;

    private static final int GPS_DELETE_RTI = 0x00000400;

    private static final int GPS_DELETE_CELLDB_INFO = 0x00000800;

    private static final int GPS_DELETE_ALMANAC_CORR = 0x00001000;

    private static final int GPS_DELETE_FREQ_BIAS_EST = 0x00002000;

    private static final int GPS_DELETE_EPHEMERIS_GLO = 0x00004000;

    private static final int GPS_DELETE_ALMANAC_GLO = 0x00008000;

    private static final int GPS_DELETE_SVDIR_GLO = 0x00010000;

    private static final int GPS_DELETE_SVSTEER_GLO = 0x00020000;

    private static final int GPS_DELETE_ALMANAC_CORR_GLO = 0x00040000;

    private static final int GPS_DELETE_TIME_GPS = 0x00080000;

    private static final int GPS_DELETE_TIME_GLO = 0x00100000;

    private static final int GPS_DELETE_SVDIR_BDS =  0X00200000;

    private static final int GPS_DELETE_SVSTEER_BDS = 0X00400000;

    private static final int GPS_DELETE_TIME_BDS = 0X00800000;

    private static final int GPS_DELETE_ALMANAC_CORR_BDS = 0X01000000;

    private static final int GPS_DELETE_EPHEMERIS_BDS = 0X02000000;

    private static final int GPS_DELETE_ALMANAC_BDS = 0X04000000;

    private static final int GPS_DELETE_ALL = 0xFFFFFFFF;



    // The GPS_CAPABILITY_* flags must match the values in gps.h

    private static final int GPS_CAPABILITY_SCHEDULING = 0x0000001;