Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev (fdcd2a4f) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

+12 −7

Original line number	Diff line number	Diff line
		@@ -28,17 +28,22 @@ import android.content.Context;
		import android.os.Handler;
		import android.os.Looper;
		import android.support.test.InstrumentationRegistry;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.util.wakelock.WakeLock;
		import com.android.systemui.util.wakelock.WakeLockFake;
		import com.android.systemui.utils.hardware.FakeSensorManager;

		import org.junit.Before;
		import org.junit.BeforeClass;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class DozeTriggersTest {
		private Context mContext;
		private DozeTriggers mTriggers;
		@@ -46,7 +51,7 @@ public class DozeTriggersTest {
		private DozeHostFake mHost;
		private AmbientDisplayConfiguration mConfig;
		private DozeParameters mParameters;
		private SensorManagerFake mSensors;
		private FakeSensorManager mSensors;
		private Handler mHandler;
		private WakeLock mWakeLock;
		private Instrumentation mInstrumentation;
		@@ -65,7 +70,7 @@ public class DozeTriggersTest {
		mHost = new DozeHostFake();
		mConfig = DozeConfigurationUtil.createMockConfig();
		mParameters = DozeConfigurationUtil.createMockParameters();
		mSensors = new SensorManagerFake(mContext);
		mSensors = new FakeSensorManager(mContext);
		mHandler = new Handler(Looper.getMainLooper());
		mWakeLock = new WakeLockFake();

		@@ -76,29 +81,29 @@ public class DozeTriggersTest {
		}

		@Test
		@Ignore("setup crashes on virtual devices")
		public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
		when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);

		mInstrumentation.runOnMainSync(()->{
		mTriggers.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
		mTriggers.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.DOZE);
		mTriggers.transitionTo(DozeMachine.State.INITIALIZED, DozeMachine.State.DOZE);

		mHost.callback.onNotificationHeadsUp();
		});

		mInstrumentation.runOnMainSync(() -> {
		mSensors.PROXIMITY.sendProximityResult(false); /* Near */
		mSensors.getMockProximitySensor().sendProximityResult(false); /* Near */
		});

		verify(mMachine, never()).requestState(any());
		verify(mMachine, never()).requestPulse(anyInt());

		mInstrumentation.runOnMainSync(()->{
		mHost.callback.onNotificationHeadsUp();
		});

		mInstrumentation.runOnMainSync(() -> {
		mSensors.PROXIMITY.sendProximityResult(true); /* Far */
		mSensors.getMockProximitySensor().sendProximityResult(true); /* Far */
		});

		verify(mMachine).requestPulse(anyInt());

packages/SystemUI/tests/src/com/android/systemui/doze/SensorManagerFake.java→packages/SystemUI/tests/src/com/android/systemui/utils/hardware/FakeSensorManager.java

+69 −14

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		* limitations under the License
		*/

		package com.android.systemui.doze;
		package com.android.systemui.utils.hardware;

		import android.content.Context;
		import android.hardware.HardwareBuffer;
		@@ -33,6 +33,8 @@ import android.util.ArraySet;
		import com.google.android.collect.Lists;

		import java.lang.reflect.Constructor;
		import java.lang.reflect.Field;
		import java.lang.reflect.Method;
		import java.util.ArrayList;
		import java.util.List;

		@@ -44,18 +46,38 @@ import java.util.List;
		* Note that this class ignores the "Handler" argument, so the test is responsible for calling the
		* listener on the right thread.
		*/
		public class SensorManagerFake extends SensorManager {
		public class FakeSensorManager extends SensorManager {

		public MockSensor PROXIMITY;
		private final MockProximitySensor mMockProximitySensor;

		public SensorManagerFake(Context context) {
		PROXIMITY = new MockSensor(context.getSystemService(SensorManager.class)
		.getDefaultSensor(Sensor.TYPE_PROXIMITY));
		public FakeSensorManager(Context context) throws Exception {
		Sensor proxSensor = context.getSystemService(SensorManager.class)
		.getDefaultSensor(Sensor.TYPE_PROXIMITY);
		if (proxSensor == null) {
		// No prox? Let's create a fake one!
		proxSensor = createSensor(Sensor.TYPE_PROXIMITY);
		}
		mMockProximitySensor = new MockProximitySensor(proxSensor);
		}

		public MockProximitySensor getMockProximitySensor() {
		return mMockProximitySensor;
		}

		@Override
		public Sensor getDefaultSensor(int type) {
		Sensor s = super.getDefaultSensor(type);
		if (s != null) {
		return s;
		}
		// Our mock sensors aren't wakeup, and it's a pain to create them that way. Instead, just
		// return non-wakeup sensors if we can't find a wakeup sensor.
		return getDefaultSensor(type, false /* wakeup */);
		}

		@Override
		protected List<Sensor> getFullSensorList() {
		return Lists.newArrayList(PROXIMITY.sensor);
		return Lists.newArrayList(mMockProximitySensor.sensor);
		}

		@Override
		@@ -65,8 +87,8 @@ public class SensorManagerFake extends SensorManager {

		@Override
		protected void unregisterListenerImpl(SensorEventListener listener, Sensor sensor) {
		if (sensor == PROXIMITY.sensor \|\| sensor == null) {
		PROXIMITY.listeners.remove(listener);
		if (sensor == mMockProximitySensor.sensor \|\| sensor == null) {
		mMockProximitySensor.listeners.remove(listener);
		}
		}

		@@ -74,8 +96,8 @@ public class SensorManagerFake extends SensorManager {
		protected boolean registerListenerImpl(SensorEventListener listener, Sensor sensor,
		int delayUs,
		Handler handler, int maxReportLatencyUs, int reservedFlags) {
		if (sensor == PROXIMITY.sensor) {
		PROXIMITY.listeners.add(listener);
		if (sensor == mMockProximitySensor.sensor) {
		mMockProximitySensor.listeners.add(listener);
		return true;
		}
		return false;
		@@ -141,11 +163,44 @@ public class SensorManagerFake extends SensorManager {
		return false;
		}

		public class MockSensor {
		private Sensor createSensor(int type) throws Exception {
		Constructor<Sensor> constr = Sensor.class.getDeclaredConstructor();
		constr.setAccessible(true);
		Sensor sensor = constr.newInstance();

		setSensorType(sensor, type);
		setSensorField(sensor, "mName", "Mock " + sensor.getStringType() + "/" + type);
		setSensorField(sensor, "mVendor", "Mock Vendor");
		setSensorField(sensor, "mVersion", 1);
		setSensorField(sensor, "mHandle", -1);
		setSensorField(sensor, "mMaxRange", 10);
		setSensorField(sensor, "mResolution", 1);
		setSensorField(sensor, "mPower", 1);
		setSensorField(sensor, "mMinDelay", 1000);
		setSensorField(sensor, "mMaxDelay", 1000000000);
		setSensorField(sensor, "mFlags", 0);
		setSensorField(sensor, "mId", -1);

		return sensor;
		}

		private void setSensorField(Sensor sensor, String fieldName, Object value) throws Exception {
		Field field = Sensor.class.getDeclaredField(fieldName);
		field.setAccessible(true);
		field.set(sensor, value);
		}

		private void setSensorType(Sensor sensor, int type) throws Exception {
		Method setter = Sensor.class.getDeclaredMethod("setType", Integer.TYPE);
		setter.setAccessible(true);
		setter.invoke(sensor, type);
		}

		public class MockProximitySensor {
		final Sensor sensor;
		final ArraySet<SensorEventListener> listeners = new ArraySet<>();

		private MockSensor(Sensor sensor) {
		private MockProximitySensor(Sensor sensor) {
		this.sensor = sensor;
		}