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

Commit 80e1b2fc authored by Yipeng Cao's avatar Yipeng Cao Committed by Android (Google) Code Review
Browse files

Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev

parents 557a0c50 2171781a

location/java/android/location/GnssStatus.java

+2 −2
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ public final class GnssStatus { 
    public static final int GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY = (1 << 3);



    /** @hide */

    public static final int SVID_SHIFT_WIDTH = 7;

    public static final int SVID_SHIFT_WIDTH = 8;

    /** @hide */

    public static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 3;

    public static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 4;

    /** @hide */

    public static final int CONSTELLATION_TYPE_MASK = 0xf;

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1277,8 +1277,8 @@ static void android_location_GnssLocationProvider_delete_aiding_data(JNIEnv* /* 
 * constellation and svFlag fields.

 */

enum ShiftWidth: uint8_t {

    SVID_SHIFT_WIDTH = 7,

    CONSTELLATION_TYPE_SHIFT_WIDTH = 3

    SVID_SHIFT_WIDTH = 8,

    CONSTELLATION_TYPE_SHIFT_WIDTH = 4

};



static jint android_location_GnssLocationProvider_read_sv_status(JNIEnv* env, jobject /* obj */,