Snap for 9848014 from e29ff09035efca8c6c470bc619570a193e49651c to tm-qpr3-release (2bf3a6ed) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -267,9 +267,6 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
		return;
		}
		sendStatusChanged();
		} else {
		throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo
		+ "\n mRootTaskInfo: " + mRootTaskInfo);
		}
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -126,12 +126,6 @@ public final class StageTaskListenerTests extends ShellTestCase {
		verify(mCallbacks).onStatusChanged(eq(mRootTask.isVisible), eq(true));
		}

		@Test(expected = IllegalArgumentException.class)
		public void testUnknownTaskVanished() {
		final ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder().build();
		mStageTaskListener.onTaskVanished(task);
		}

		@Test
		public void testTaskVanished() {
		// With shell transitions, the transition manages status changes, so skip this test.

libs/dream/lowlight/src/com/android/dream/lowlight/LowLightDreamManager.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ public final class LowLightDreamManager {
		public static final int AMBIENT_LIGHT_MODE_LOW_LIGHT = 2;

		private final DreamManager mDreamManager;
		private final LowLightTransitionCoordinator mLowLightTransitionCoordinator;

		@Nullable
		private final ComponentName mLowLightDreamComponent;
		@@ -82,10 +81,8 @@ public final class LowLightDreamManager {
		@Inject
		public LowLightDreamManager(
		DreamManager dreamManager,
		LowLightTransitionCoordinator lowLightTransitionCoordinator,
		@Named(LOW_LIGHT_DREAM_COMPONENT) @Nullable ComponentName lowLightDreamComponent) {
		mDreamManager = dreamManager;
		mLowLightTransitionCoordinator = lowLightTransitionCoordinator;
		mLowLightDreamComponent = lowLightDreamComponent;
		}

		@@ -115,8 +112,6 @@ public final class LowLightDreamManager {
		mAmbientLightMode = ambientLightMode;

		boolean shouldEnterLowLight = mAmbientLightMode == AMBIENT_LIGHT_MODE_LOW_LIGHT;
		mLowLightTransitionCoordinator.notifyBeforeLowLightTransition(shouldEnterLowLight,
		() -> mDreamManager.setSystemDreamComponent(
		shouldEnterLowLight ? mLowLightDreamComponent : null));
		mDreamManager.setSystemDreamComponent(shouldEnterLowLight ? mLowLightDreamComponent : null);
		}
		}

libs/dream/lowlight/tests/src/com.android.dream.lowlight/LowLightDreamManagerTest.java

+2 −17

Original line number	Diff line number	Diff line
		@@ -21,10 +21,7 @@ import static com.android.dream.lowlight.LowLightDreamManager.AMBIENT_LIGHT_MODE
		import static com.android.dream.lowlight.LowLightDreamManager.AMBIENT_LIGHT_MODE_UNKNOWN;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.doAnswer;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;

		@@ -46,9 +43,6 @@ public class LowLightDreamManagerTest {
		@Mock
		private DreamManager mDreamManager;

		@Mock
		private LowLightTransitionCoordinator mTransitionCoordinator;

		@Mock
		private ComponentName mDreamComponent;

		@@ -58,14 +52,7 @@ public class LowLightDreamManagerTest {
		public void setUp() {
		MockitoAnnotations.initMocks(this);

		// Automatically run any provided Runnable to mTransitionCoordinator to simplify testing.
		doAnswer(invocation -> {
		((Runnable) invocation.getArgument(1)).run();
		return null;
		}).when(mTransitionCoordinator).notifyBeforeLowLightTransition(anyBoolean(),
		any(Runnable.class));

		mLowLightDreamManager = new LowLightDreamManager(mDreamManager, mTransitionCoordinator,
		mLowLightDreamManager = new LowLightDreamManager(mDreamManager,
		mDreamComponent);
		}

		@@ -73,7 +60,6 @@ public class LowLightDreamManagerTest {
		public void setAmbientLightMode_lowLight_setSystemDream() {
		mLowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_LOW_LIGHT);

		verify(mTransitionCoordinator).notifyBeforeLowLightTransition(eq(true), any());
		verify(mDreamManager).setSystemDreamComponent(mDreamComponent);
		}

		@@ -81,7 +67,6 @@ public class LowLightDreamManagerTest {
		public void setAmbientLightMode_regularLight_clearSystemDream() {
		mLowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_REGULAR);

		verify(mTransitionCoordinator).notifyBeforeLowLightTransition(eq(false), any());
		verify(mDreamManager).setSystemDreamComponent(null);
		}

		@@ -100,7 +85,7 @@ public class LowLightDreamManagerTest {
		@Test
		public void setAmbientLightMode_dreamComponentNotSet_doNothing() {
		final LowLightDreamManager lowLightDreamManager = new LowLightDreamManager(mDreamManager,
		mTransitionCoordinator, null /dream component/);
		null /dream component/);

		lowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_LOW_LIGHT);

packages/SystemUI/AndroidManifest.xml

+0 −12

Original line number	Diff line number	Diff line
		@@ -893,18 +893,6 @@
		android:visibleToInstantApps="true">
		</activity>

		<activity android:name=".user.UserSwitcherActivity"
		android:label="@string/accessibility_multi_user_switch_switcher"
		android:theme="@style/Theme.UserSwitcherActivity"
		android:excludeFromRecents="true"
		android:showWhenLocked="true"
		android:showForAllUsers="true"
		android:finishOnTaskLaunch="true"
		android:lockTaskMode="always"
		android:configChanges="screenSize\|smallestScreenSize\|screenLayout\|orientation\|keyboard\|keyboardHidden"
		android:visibleToInstantApps="true">
		</activity>

		<receiver android:name=".controls.management.ControlsRequestReceiver"
		android:exported="true">
		<intent-filter>