AOD: Don't use doze states when unsupported (26d8184d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.content.Context;
		import android.hardware.SensorManager;
		import android.os.Handler;
		import android.os.PowerManager;
		import android.os.SystemClock;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.systemui.SystemUIApplication;
		@@ -52,7 +51,10 @@ public class DozeFactory {
		DozeFactory.WakeLock wakeLock = new DozeFactory.WakeLock(powerManager.newWakeLock(
		PowerManager.PARTIAL_WAKE_LOCK, "Doze"));

		DozeMachine machine = new DozeMachine(dozeService, params, wakeLock);
		DozeMachine machine = new DozeMachine(
		DozeScreenStatePreventingAdapter.wrapIfNeeded(dozeService, params),
		params,
		wakeLock);
		machine.setParts(new DozeMachine.Part[]{
		createDozeTriggers(context, sensorManager, host, config, params, handler, wakeLock,
		machine),

packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* 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
		*/

		package com.android.systemui.doze;

		import android.support.annotation.VisibleForTesting;
		import android.view.Display;

		import com.android.systemui.statusbar.phone.DozeParameters;

		/**
		* Prevents usage of doze screen states on devices that don't support them.
		*/
		public class DozeScreenStatePreventingAdapter implements DozeMachine.Service {

		private final DozeMachine.Service mInner;

		@VisibleForTesting
		DozeScreenStatePreventingAdapter(DozeMachine.Service inner) {
		mInner = inner;
		}

		@Override
		public void finish() {
		mInner.finish();
		}

		@Override
		public void setDozeScreenState(int state) {
		if (state == Display.STATE_DOZE \|\| state == Display.STATE_DOZE_SUSPEND) {
		state = Display.STATE_ON;
		}
		mInner.setDozeScreenState(state);
		}

		@Override
		public void requestWakeUp() {
		mInner.requestWakeUp();
		}

		/**
		* If the device supports the doze display state, return {@code inner}. Otherwise
		* return a new instance of {@link DozeScreenStatePreventingAdapter} wrapping {@code inner}.
		*/
		public static DozeMachine.Service wrapIfNeeded(DozeMachine.Service inner,
		DozeParameters params) {
		return isNeeded(params) ? new DozeScreenStatePreventingAdapter(inner) : inner;
		}

		private static boolean isNeeded(DozeParameters params) {
		return !params.getDisplayStateSupported();
		}
		}

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

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* 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
		*/

		package com.android.systemui.doze;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertSame;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.support.test.filters.SmallTest;
		import android.view.Display;

		import com.android.systemui.statusbar.phone.DozeParameters;

		import org.junit.Before;
		import org.junit.Test;

		@SmallTest
		public class DozeScreenStatePreventingAdapterTest {

		private DozeMachine.Service mInner;
		private DozeScreenStatePreventingAdapter mWrapper;

		@Before
		public void setup() throws Exception {
		mInner = mock(DozeMachine.Service.class);
		mWrapper = new DozeScreenStatePreventingAdapter(mInner);
		}

		@Test
		public void forwards_finish() throws Exception {
		mWrapper.finish();
		verify(mInner).finish();
		}

		@Test
		public void forwards_setDozeScreenState_on() throws Exception {
		mWrapper.setDozeScreenState(Display.STATE_ON);
		verify(mInner).setDozeScreenState(Display.STATE_ON);
		}

		@Test
		public void forwards_setDozeScreenState_off() throws Exception {
		mWrapper.setDozeScreenState(Display.STATE_OFF);
		verify(mInner).setDozeScreenState(Display.STATE_OFF);
		}

		@Test
		public void forwards_setDozeScreenState_doze() throws Exception {
		mWrapper.setDozeScreenState(Display.STATE_DOZE);
		verify(mInner).setDozeScreenState(Display.STATE_ON);
		}

		@Test
		public void forwards_setDozeScreenState_doze_suspend() throws Exception {
		mWrapper.setDozeScreenState(Display.STATE_DOZE_SUSPEND);
		verify(mInner).setDozeScreenState(Display.STATE_ON);
		}

		@Test
		public void forwards_requestWakeUp() throws Exception {
		mWrapper.requestWakeUp();
		verify(mInner).requestWakeUp();
		}

		@Test
		public void wrapIfNeeded_needed() throws Exception {
		DozeParameters params = mock(DozeParameters.class);
		when(params.getDisplayStateSupported()).thenReturn(false);

		assertEquals(DozeScreenStatePreventingAdapter.class,
		DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params).getClass());
		}

		@Test
		public void wrapIfNeeded_not_needed() throws Exception {
		DozeParameters params = mock(DozeParameters.class);
		when(params.getDisplayStateSupported()).thenReturn(true);

		assertSame(mInner, DozeScreenStatePreventingAdapter.wrapIfNeeded(mInner, params));
		}
		}
		No newline at end of file