Merge "Orientation Listener looks for the "right" Device Orientation Sensor." (972bad79) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/WindowOrientationListener.java

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.util.proto.ProtoOutputStream;
	import android.view.Surface;		import android.view.Surface;

	import java.io.PrintWriter;		import java.io.PrintWriter;
			import java.util.List;

	/**		/**
	* A special helper class used by the WindowManager		* A special helper class used by the WindowManager
	@@ -90,7 +91,28 @@ public abstract class WindowOrientationListener {
	mHandler = handler;		mHandler = handler;
	mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);		mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
	mRate = rate;		mRate = rate;
	mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_DEVICE_ORIENTATION);		List<Sensor> l = mSensorManager.getSensorList(Sensor.TYPE_DEVICE_ORIENTATION);
			Sensor wakeUpDeviceOrientationSensor = null;
			Sensor nonWakeUpDeviceOrientationSensor = null;
			/**
			* Prefer the wakeup form of the sensor if implemented.
			* It's OK to look for just two types of this sensor and use
			* the last found. Typical devices will only have one sensor of
			* this type.
			*/
			for (Sensor s : l) {
			if (s.isWakeUpSensor()) {
			wakeUpDeviceOrientationSensor = s;
			} else {
			nonWakeUpDeviceOrientationSensor = s;
			}
			}

			if (wakeUpDeviceOrientationSensor != null) {
			mSensor = wakeUpDeviceOrientationSensor;
			} else {
			mSensor = nonWakeUpDeviceOrientationSensor;
			}

	if (mSensor != null) {		if (mSensor != null) {
	mOrientationJudge = new OrientationSensorJudge();		mOrientationJudge = new OrientationSensorJudge();