Merge "Fix PhoneWindowManagerTests" into main (c7ed4da1) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -2312,6 +2312,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return ActivityManager.getService();
		}

		LockPatternUtils getLockPatternUtils() {
		return new LockPatternUtils(mContext);
		}

		ButtonOverridePermissionChecker getButtonOverridePermissionChecker() {
		return new ButtonOverridePermissionChecker();
		}
		@@ -2360,7 +2364,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mAccessibilityShortcutController = injector.getAccessibilityShortcutController(
		mContext, new Handler(), mCurrentUserId);
		mGlobalActionsFactory = injector.getGlobalActionsFactory();
		mLockPatternUtils = new LockPatternUtils(mContext);
		mLockPatternUtils = injector.getLockPatternUtils();
		mLogger = new MetricsLogger();

		Resources res = mContext.getResources();

services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import android.view.contentprotection.flags.Flags;
		import androidx.test.filters.SmallTest;

		import com.android.internal.util.test.LocalServiceKeeperRule;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.server.input.InputManagerInternal;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.policy.keyguard.KeyguardServiceDelegate;
		@@ -120,6 +121,8 @@ public class PhoneWindowManagerTests {
		private DisplayPolicy mDisplayPolicy;
		@Mock
		private KeyguardServiceDelegate mKeyguardServiceDelegate;
		@Mock
		private LockPatternUtils mLockPatternUtils;

		@Before
		public void setUp() {
		@@ -254,6 +257,7 @@ public class PhoneWindowManagerTests {
		@Test
		public void powerPress_hubOrDreamOrSleep_goesToSleepFromDream() {
		when(mDisplayPolicy.isAwake()).thenReturn(true);
		when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false);
		initPhoneWindowManager();

		// Set power button behavior.
		@@ -275,6 +279,7 @@ public class PhoneWindowManagerTests {
		@Test
		public void powerPress_hubOrDreamOrSleep_hubAvailableLocks() {
		when(mDisplayPolicy.isAwake()).thenReturn(true);
		when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false);
		mContext.getTestablePermissions().setPermission(android.Manifest.permission.DEVICE_POWER,
		PERMISSION_GRANTED);
		initPhoneWindowManager();
		@@ -303,6 +308,7 @@ public class PhoneWindowManagerTests {
		@Test
		public void powerPress_hubOrDreamOrSleep_hubNotAvailableDreams() {
		when(mDisplayPolicy.isAwake()).thenReturn(true);
		when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(false);
		initPhoneWindowManager();

		// Set power button behavior.
		@@ -346,6 +352,11 @@ public class PhoneWindowManagerTests {
		return mKeyguardServiceDelegate;
		}

		@Override
		LockPatternUtils getLockPatternUtils() {
		return mLockPatternUtils;
		}

		/**
		* {@code WindowWakeUpPolicy} registers a local service in its constructor, easier to just
		* mock it out so we don't have to unregister it after every test.