Merge change 1674 into donut (02c1c46f) · Commits · e / os / android_frameworks_base

location/java/com/android/internal/location/GpsLocationProvider.java

+33 −8

Original line number	Original line	Diff line number	Diff line
	@@ -160,11 +160,14 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	private long mStatusUpdateTime = SystemClock.elapsedRealtime();		private long mStatusUpdateTime = SystemClock.elapsedRealtime();

	// turn off GPS fix icon if we haven't received a fix in 10 seconds		// turn off GPS fix icon if we haven't received a fix in 10 seconds
	private static final long RECENT_FIX_TIMEOUT = 10 * 1000;		private static final long RECENT_FIX_TIMEOUT = 10;

	// number of fixes to receive before disabling GPS		// number of fixes to receive before disabling GPS
	private static final int MIN_FIX_COUNT = 10;		private static final int MIN_FIX_COUNT = 10;

			// stop trying if we do not receive a fix within 60 seconds
			private static final int NO_FIX_TIMEOUT = 60;

	// true if we are enabled		// true if we are enabled
	private boolean mEnabled;		private boolean mEnabled;

	@@ -221,8 +224,10 @@ public class GpsLocationProvider extends ILocationProvider.Stub {

	// Alarms		// Alarms
	private final static String ALARM_WAKEUP = "com.android.internal.location.ALARM_WAKEUP";		private final static String ALARM_WAKEUP = "com.android.internal.location.ALARM_WAKEUP";
			private final static String ALARM_TIMEOUT = "com.android.internal.location.ALARM_TIMEOUT";
	private final AlarmManager mAlarmManager;		private final AlarmManager mAlarmManager;
	private final PendingIntent mWakeupIntent;		private final PendingIntent mWakeupIntent;
			private final PendingIntent mTimeoutIntent;

	private final IBatteryStats mBatteryStats;		private final IBatteryStats mBatteryStats;
	private final SparseIntArray mClientUids = new SparseIntArray();		private final SparseIntArray mClientUids = new SparseIntArray();
	@@ -292,6 +297,9 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	if (action.equals(ALARM_WAKEUP)) {		if (action.equals(ALARM_WAKEUP)) {
	if (DEBUG) Log.d(TAG, "ALARM_WAKEUP");		if (DEBUG) Log.d(TAG, "ALARM_WAKEUP");
	startNavigating();		startNavigating();
			} else if (action.equals(ALARM_TIMEOUT)) {
			if (DEBUG) Log.d(TAG, "ALARM_TIMEOUT");
			hibernate();
	} else if (action.equals(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) {		} else if (action.equals(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) {
	String state = intent.getStringExtra(Phone.STATE_KEY);		String state = intent.getStringExtra(Phone.STATE_KEY);
	String apnName = intent.getStringExtra(Phone.DATA_APN_KEY);		String apnName = intent.getStringExtra(Phone.DATA_APN_KEY);
	@@ -326,9 +334,11 @@ public class GpsLocationProvider extends ILocationProvider.Stub {

	mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);		mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
	mWakeupIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_WAKEUP), 0);		mWakeupIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_WAKEUP), 0);
			mTimeoutIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_TIMEOUT), 0);

	IntentFilter intentFilter = new IntentFilter();		IntentFilter intentFilter = new IntentFilter();
	intentFilter.addAction(ALARM_WAKEUP);		intentFilter.addAction(ALARM_WAKEUP);
			intentFilter.addAction(ALARM_TIMEOUT);
	intentFilter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);		intentFilter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
	context.registerReceiver(mBroadcastReciever, intentFilter);		context.registerReceiver(mBroadcastReciever, intentFilter);

	@@ -569,6 +579,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	startNavigating();		startNavigating();
	} else {		} else {
	mAlarmManager.cancel(mWakeupIntent);		mAlarmManager.cancel(mWakeupIntent);
			mAlarmManager.cancel(mTimeoutIntent);
	stopNavigating();		stopNavigating();
	}		}
	}		}
	@@ -672,12 +683,19 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	if (!native_start(mPositionMode, false, mFixInterval)) {		if (!native_start(mPositionMode, false, mFixInterval)) {
	mStarted = false;		mStarted = false;
	Log.e(TAG, "native_start failed in startNavigating()");		Log.e(TAG, "native_start failed in startNavigating()");
			return;
	}		}

	// reset SV count to zero		// reset SV count to zero
	updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0);		updateStatus(LocationProvider.TEMPORARILY_UNAVAILABLE, 0);
	mFixCount = 0;		mFixCount = 0;
	mFixRequestTime = System.currentTimeMillis();		mFixRequestTime = System.currentTimeMillis();
			// set timer to give up if we do not receive a fix within NO_FIX_TIMEOUT
			// and our fix interval is not short
			if (mFixInterval >= NO_FIX_TIMEOUT) {
			mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
			SystemClock.elapsedRealtime() + NO_FIX_TIMEOUT * 1000, mTimeoutIntent);
			}
	}		}
	}		}

	@@ -695,6 +713,17 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	}		}
	}		}

			private void hibernate() {
			// stop GPS until our next fix interval arrives
			stopNavigating();
			mFixCount = 0;
			mAlarmManager.cancel(mTimeoutIntent);
			mAlarmManager.cancel(mWakeupIntent);
			long now = SystemClock.elapsedRealtime();
			mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
			SystemClock.elapsedRealtime() + mFixInterval * 1000, mWakeupIntent);
			}

	/**		/**
	* called from native code to update our position.		* called from native code to update our position.
	*/		*/
	@@ -762,6 +791,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	}		}

	if (mStarted && mStatus != LocationProvider.AVAILABLE) {		if (mStarted && mStatus != LocationProvider.AVAILABLE) {
			mAlarmManager.cancel(mTimeoutIntent);
	// send an intent to notify that the GPS is receiving fixes.		// send an intent to notify that the GPS is receiving fixes.
	Intent intent = new Intent(GPS_FIX_CHANGE_ACTION);		Intent intent = new Intent(GPS_FIX_CHANGE_ACTION);
	intent.putExtra(EXTRA_ENABLED, true);		intent.putExtra(EXTRA_ENABLED, true);
	@@ -771,12 +801,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {

	if (mFixCount++ >= MIN_FIX_COUNT && mFixInterval > 1) {		if (mFixCount++ >= MIN_FIX_COUNT && mFixInterval > 1) {
	if (DEBUG) Log.d(TAG, "exceeded MIN_FIX_COUNT");		if (DEBUG) Log.d(TAG, "exceeded MIN_FIX_COUNT");
	stopNavigating();		hibernate();
	mFixCount = 0;
	mAlarmManager.cancel(mWakeupIntent);
	long now = SystemClock.elapsedRealtime();
	mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
	SystemClock.elapsedRealtime() + mFixInterval * 1000, mWakeupIntent);
	}		}
	}		}

	@@ -881,7 +906,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
	updateStatus(mStatus, svCount);		updateStatus(mStatus, svCount);

	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 * 1000) {
	// send an intent to notify that the GPS is no longer receiving fixes.		// send an intent to notify that the GPS is no longer receiving fixes.
	Intent intent = new Intent(GPS_FIX_CHANGE_ACTION);		Intent intent = new Intent(GPS_FIX_CHANGE_ACTION);
	intent.putExtra(EXTRA_ENABLED, false);		intent.putExtra(EXTRA_ENABLED, false);