Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 80e1b2fc56

Change-Id: I9cff443fbb5009d3bb20d9050cd5980dc7c0b17f
This commit is contained in:
Yipeng Cao
2017-04-29 22:42:25 +00:00
committed by android-build-merger
parent 7ed9a3b3ad 80e1b2fc56
commit d78417d6cc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
location/java/android/location/GnssStatus.java
View File

@@ -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;

4
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -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 */,