Merge "AnyMotionDetector holds wakelock until conclusive. Bug: 27821976" into nyc-dev (ed57efdf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/AnyMotionDetector.java

+48 −39

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,7 @@ public class AnyMotionDetector {
	public AnyMotionDetector(PowerManager pm, Handler handler, SensorManager sm,		public AnyMotionDetector(PowerManager pm, Handler handler, SensorManager sm,
	DeviceIdleCallback callback, float thresholdAngle) {		DeviceIdleCallback callback, float thresholdAngle) {
	if (DEBUG) Slog.d(TAG, "AnyMotionDetector instantiated.");		if (DEBUG) Slog.d(TAG, "AnyMotionDetector instantiated.");
			synchronized (mLock) {
	mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);		mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
	mWakeLock.setReferenceCounted(false);		mWakeLock.setReferenceCounted(false);
	mHandler = handler;		mHandler = handler;
	@@ -122,23 +123,32 @@ public class AnyMotionDetector {
	((double)ORIENTATION_MEASUREMENT_DURATION_MILLIS / SAMPLING_INTERVAL_MILLIS));		((double)ORIENTATION_MEASUREMENT_DURATION_MILLIS / SAMPLING_INTERVAL_MILLIS));
	if (DEBUG) Slog.d(TAG, "mNumSufficientSamples = " + mNumSufficientSamples);		if (DEBUG) Slog.d(TAG, "mNumSufficientSamples = " + mNumSufficientSamples);
	}		}
			}

	/*		/*
	* Acquire accel data until we determine AnyMotion status.		* Acquire accel data until we determine AnyMotion status.
	*/		*/
	public void checkForAnyMotion() {		public void checkForAnyMotion() {
	if (DEBUG) Slog.d(TAG, "checkForAnyMotion(). mState = " + mState);		if (DEBUG) {
			Slog.d(TAG, "checkForAnyMotion(). mState = " + mState);
			}
	if (mState != STATE_ACTIVE) {		if (mState != STATE_ACTIVE) {
			synchronized (mLock) {
	mState = STATE_ACTIVE;		mState = STATE_ACTIVE;
	if (DEBUG) Slog.d(TAG, "Moved from STATE_INACTIVE to STATE_ACTIVE.");		if (DEBUG) {
			Slog.d(TAG, "Moved from STATE_INACTIVE to STATE_ACTIVE.");
			}
	mCurrentGravityVector = null;		mCurrentGravityVector = null;
	mPreviousGravityVector = null;		mPreviousGravityVector = null;
	startOrientationMeasurement();		mWakeLock.acquire();
			startOrientationMeasurementLocked();
			}
	}		}
	}		}

	public void stop() {		public void stop() {
	if (mState == STATE_ACTIVE) {		if (mState == STATE_ACTIVE) {
			synchronized (mLock) {
	mState = STATE_INACTIVE;		mState = STATE_INACTIVE;
	if (DEBUG) Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE.");		if (DEBUG) Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE.");
	if (mMeasurementInProgress) {		if (mMeasurementInProgress) {
	@@ -147,24 +157,22 @@ public class AnyMotionDetector {
	}		}
	mHandler.removeCallbacks(mMeasurementTimeout);		mHandler.removeCallbacks(mMeasurementTimeout);
	mHandler.removeCallbacks(mSensorRestart);		mHandler.removeCallbacks(mSensorRestart);
	mWakeLock.release();
	mCurrentGravityVector = null;		mCurrentGravityVector = null;
	mPreviousGravityVector = null;		mPreviousGravityVector = null;
			mWakeLock.release();
			}
	}		}
	}		}

	private void startOrientationMeasurement() {		private void startOrientationMeasurementLocked() {
	if (DEBUG) Slog.d(TAG, "startOrientationMeasurement: mMeasurementInProgress=" +		if (DEBUG) Slog.d(TAG, "startOrientationMeasurementLocked: mMeasurementInProgress=" +
	mMeasurementInProgress + ", (mAccelSensor != null)=" + (mAccelSensor != null));		mMeasurementInProgress + ", (mAccelSensor != null)=" + (mAccelSensor != null));

	if (!mMeasurementInProgress && mAccelSensor != null) {		if (!mMeasurementInProgress && mAccelSensor != null) {
	if (mSensorManager.registerListener(mListener, mAccelSensor,		if (mSensorManager.registerListener(mListener, mAccelSensor,
	SAMPLING_INTERVAL_MILLIS * 1000)) {		SAMPLING_INTERVAL_MILLIS * 1000)) {
	mWakeLock.acquire();
	mMeasurementInProgress = true;		mMeasurementInProgress = true;
	mRunningStats.reset();		mRunningStats.reset();
	}		}

	Message msg = Message.obtain(mHandler, mMeasurementTimeout);		Message msg = Message.obtain(mHandler, mMeasurementTimeout);
	msg.setAsynchronous(true);		msg.setAsynchronous(true);
	mHandler.sendMessageDelayed(msg, ACCELEROMETER_DATA_TIMEOUT_MILLIS);		mHandler.sendMessageDelayed(msg, ACCELEROMETER_DATA_TIMEOUT_MILLIS);
	@@ -178,7 +186,6 @@ public class AnyMotionDetector {
	if (mMeasurementInProgress) {		if (mMeasurementInProgress) {
	mSensorManager.unregisterListener(mListener);		mSensorManager.unregisterListener(mListener);
	mHandler.removeCallbacks(mMeasurementTimeout);		mHandler.removeCallbacks(mMeasurementTimeout);
	mWakeLock.release();
	long detectionEndTime = SystemClock.elapsedRealtime();		long detectionEndTime = SystemClock.elapsedRealtime();
	mMeasurementInProgress = false;		mMeasurementInProgress = false;
	mPreviousGravityVector = mCurrentGravityVector;		mPreviousGravityVector = mCurrentGravityVector;
	@@ -196,8 +203,10 @@ public class AnyMotionDetector {
	status = getStationaryStatus();		status = getStationaryStatus();
	if (DEBUG) Slog.d(TAG, "getStationaryStatus() returned " + status);		if (DEBUG) Slog.d(TAG, "getStationaryStatus() returned " + status);
	if (status != RESULT_UNKNOWN) {		if (status != RESULT_UNKNOWN) {
	if (DEBUG) Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE. status = " +		mWakeLock.release();
	status);		if (DEBUG) {
			Slog.d(TAG, "Moved from STATE_ACTIVE to STATE_INACTIVE. status = " + status);
			}
	mState = STATE_INACTIVE;		mState = STATE_INACTIVE;
	} else {		} else {
	/*		/*
	@@ -275,7 +284,7 @@ public class AnyMotionDetector {
	@Override		@Override
	public void run() {		public void run() {
	synchronized (mLock) {		synchronized (mLock) {
	startOrientationMeasurement();		startOrientationMeasurementLocked();
	}		}
	}		}
	};		};