Merge "Cn0 info added to GPS extras" (d7f40306) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/GnssLocationProvider.java

+33 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1184,21 +1184,29 @@ public class GnssLocationProvider implements LocationProviderInterface {

	@Override		@Override
	public int getStatus(Bundle extras) {		public int getStatus(Bundle extras) {
	if (extras != null) {		setLocationExtras(extras);
	extras.putInt("satellites", mSvCount);
	}
	return mStatus;		return mStatus;
	}		}

	private void updateStatus(int status, int svCount) {		private void updateStatus(int status, int svCount, int meanCn0, int maxCn0) {
	if (status != mStatus \|\| svCount != mSvCount) {		if (status != mStatus \|\| svCount != mSvCount \|\| meanCn0 != mMeanCn0 \|\| maxCn0 != mMaxCn0 ) {
	mStatus = status;		mStatus = status;
	mSvCount = svCount;		mSvCount = svCount;
	mLocationExtras.putInt("satellites", svCount);		mMeanCn0 = meanCn0;
			mMaxCn0 = maxCn0;
			setLocationExtras(mLocationExtras);
	mStatusUpdateTime = SystemClock.elapsedRealtime();		mStatusUpdateTime = SystemClock.elapsedRealtime();
	}		}
	}		}

			private void setLocationExtras(Bundle extras) {
			if (extras != null) {
			extras.putInt("satellites", mSvCount);
			extras.putInt("meanCn0", mMeanCn0);
			extras.putInt("maxCn0", mMaxCn0);
			}
			}

	@Override		@Override
	public long getStatusUpdateTime() {		public long getStatusUpdateTime() {
	return mStatusUpdateTime;		return mStatusUpdateTime;
	@@ -1449,7 +1457,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
	}		}

	// reset SV count to zero		// reset SV count to zero
	updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0);		updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0, 0, 0);
	mFixRequestTime = System.currentTimeMillis();		mFixRequestTime = System.currentTimeMillis();
	if (!hasCapability(GPS_CAPABILITY_SCHEDULING)) {		if (!hasCapability(GPS_CAPABILITY_SCHEDULING)) {
	// set timer to give up if we do not receive a fix within NO_FIX_TIMEOUT		// set timer to give up if we do not receive a fix within NO_FIX_TIMEOUT
	@@ -1472,7 +1480,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
	mLastFixTime = 0;		mLastFixTime = 0;

	// reset SV count to zero		// reset SV count to zero
	updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0);		updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0, 0, 0);
	}		}
	}		}

	@@ -1558,7 +1566,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
	Intent intent = new Intent(LocationManager.GPS_FIX_CHANGE_ACTION);		Intent intent = new Intent(LocationManager.GPS_FIX_CHANGE_ACTION);
	intent.putExtra(LocationManager.EXTRA_GPS_ENABLED, true);		intent.putExtra(LocationManager.EXTRA_GPS_ENABLED, true);
	mContext.sendBroadcastAsUser(intent, UserHandle.ALL);		mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
	updateStatus(LocationProvider.AVAILABLE, mSvCount);		updateStatus(LocationProvider.AVAILABLE, mSvCount, mMeanCn0, mMaxCn0);
	}		}

	if (!hasCapability(GPS_CAPABILITY_SCHEDULING) && mStarted &&		if (!hasCapability(GPS_CAPABILITY_SCHEDULING) && mStarted &&
	@@ -1622,15 +1630,21 @@ public class GnssLocationProvider implements LocationProviderInterface {
	if (VERBOSE) {		if (VERBOSE) {
	Log.v(TAG, "SV count: " + svCount);		Log.v(TAG, "SV count: " + svCount);
	}		}
	// Calculate number of sets used in fix.		// Calculate number of satellites used in fix.
	int usedInFixCount = 0;		int usedInFixCount = 0;
			int maxCn0 = 0;
			int meanCn0 = 0;
	for (int i = 0; i < svCount; i++) {		for (int i = 0; i < svCount; i++) {
	if ((mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {		if ((mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) {
	++usedInFixCount;		++usedInFixCount;
			if (mCn0s[i] > maxCn0) {
			maxCn0 = (int)mCn0s[i];
			}
			meanCn0 += mCn0s[i];
	}		}
	if (VERBOSE) {		if (VERBOSE) {
	Log.v(TAG, "svid: " + (mSvidWithFlags[i] >> GnssStatus.SVID_SHIFT_WIDTH) +		Log.v(TAG, "svid: " + (mSvidWithFlags[i] >> GnssStatus.SVID_SHIFT_WIDTH) +
	" cn0: " + mCn0s[i]/10 +		" cn0: " + mCn0s[i] +
	" elev: " + mSvElevations[i] +		" elev: " + mSvElevations[i] +
	" azimuth: " + mSvAzimuths[i] +		" azimuth: " + mSvAzimuths[i] +
	" carrier frequency: " + mSvCarrierFreqs[i] +		" carrier frequency: " + mSvCarrierFreqs[i] +
	@@ -1644,8 +1658,11 @@ public class GnssLocationProvider implements LocationProviderInterface {
	? "" : "F"));		? "" : "F"));
	}		}
	}		}
	// return number of sets used in fix instead of total		if (usedInFixCount > 0) {
	updateStatus(mStatus, usedInFixCount);		meanCn0 /= usedInFixCount;
			}
			// return number of sats used in fix instead of total reported
			updateStatus(mStatus, usedInFixCount, meanCn0, maxCn0);

	if (mNavigating && mStatus == LocationProvider.AVAILABLE && mLastFixTime > 0 &&		if (mNavigating && mStatus == LocationProvider.AVAILABLE && mLastFixTime > 0 &&
	System.currentTimeMillis() - mLastFixTime > RECENT_FIX_TIMEOUT) {		System.currentTimeMillis() - mLastFixTime > RECENT_FIX_TIMEOUT) {
	@@ -1653,7 +1670,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
	Intent intent = new Intent(LocationManager.GPS_FIX_CHANGE_ACTION);		Intent intent = new Intent(LocationManager.GPS_FIX_CHANGE_ACTION);
	intent.putExtra(LocationManager.EXTRA_GPS_ENABLED, false);		intent.putExtra(LocationManager.EXTRA_GPS_ENABLED, false);
	mContext.sendBroadcastAsUser(intent, UserHandle.ALL);		mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
	updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, mSvCount);		updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, mSvCount, mMeanCn0, mMaxCn0);
	}		}
	}		}

	@@ -2531,6 +2548,8 @@ public class GnssLocationProvider implements LocationProviderInterface {
	private float mSvAzimuths[] = new float[MAX_SVS];		private float mSvAzimuths[] = new float[MAX_SVS];
	private float mSvCarrierFreqs[] = new float[MAX_SVS];		private float mSvCarrierFreqs[] = new float[MAX_SVS];
	private int mSvCount;		private int mSvCount;
			private int mMeanCn0;
			private int mMaxCn0;
	// preallocated to avoid memory allocation in reportNmea()		// preallocated to avoid memory allocation in reportNmea()
	private byte[] mNmeaBuffer = new byte[120];		private byte[] mNmeaBuffer = new byte[120];