Snap for 10347357 from a5de62db1e60d59e96313de21a7d1ed44236c8ce to udc-release (c2302459) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -534,8 +534,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		return;
		}

		final Rect displayBounds = mPipBoundsState.getDisplayBounds();
		final Rect destinationBounds = new Rect(displayBounds);
		final Rect destinationBounds = new Rect(getExitDestinationBounds());
		final int direction = syncWithSplitScreenBounds(destinationBounds, requestEnterSplit)
		? TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN
		: TRANSITION_DIRECTION_LEAVE_PIP;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ public class PipTransition extends PipTransitionController {
		if (taskInfo != null) {
		startExpandAnimation(taskInfo, mPipOrganizer.getSurfaceControl(),
		mPipBoundsState.getBounds(), mPipBoundsState.getBounds(),
		new Rect(mExitDestinationBounds), Surface.ROTATION_0);
		new Rect(mExitDestinationBounds), Surface.ROTATION_0, null /* startT */);
		}
		mExitDestinationBounds.setEmpty();
		mCurrentPipTaskToken = null;
		@@ -604,14 +604,8 @@ public class PipTransition extends PipTransitionController {
		}
		}

		// Set the initial frame as scaling the end to the start.
		final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds());
		destinationBounds.offset(-offset.x, -offset.y);
		startTransaction.setWindowCrop(pipLeash, destinationBounds.width(),
		destinationBounds.height());
		mSurfaceTransactionHelper.scale(startTransaction, pipLeash, destinationBounds,
		currentBounds);
		startTransaction.apply();

		// Check if it is fixed rotation.
		final int rotationDelta;
		@@ -641,7 +635,7 @@ public class PipTransition extends PipTransitionController {
		rotationDelta = Surface.ROTATION_0;
		}
		startExpandAnimation(taskInfo, pipLeash, currentBounds, currentBounds, destinationBounds,
		rotationDelta);
		rotationDelta, startTransaction);
		}

		private void startExpandAndRotationAnimation(@NonNull TransitionInfo info,
		@@ -697,7 +691,7 @@ public class PipTransition extends PipTransitionController {

		private void startExpandAnimation(final TaskInfo taskInfo, final SurfaceControl leash,
		final Rect baseBounds, final Rect startBounds, final Rect endBounds,
		final int rotationDelta) {
		final int rotationDelta, @Nullable SurfaceControl.Transaction startTransaction) {
		final Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect(
		taskInfo.pictureInPictureParams, endBounds);
		final PipAnimationController.PipTransitionAnimator animator =
		@@ -705,9 +699,14 @@ public class PipTransition extends PipTransitionController {
		endBounds, sourceHintRect, TRANSITION_DIRECTION_LEAVE_PIP,
		0 /* startingAngle */, rotationDelta);
		animator.setTransitionDirection(TRANSITION_DIRECTION_LEAVE_PIP)
		.setPipAnimationCallback(mPipAnimationCallback)
		.setDuration(mEnterExitAnimationDuration);
		if (startTransaction != null) {
		animator.setPipTransactionHandler(mTransactionConsumer).applySurfaceControlTransaction(
		leash, startTransaction, PipAnimationController.FRACTION_START);
		startTransaction.apply();
		}
		animator.setPipAnimationCallback(mPipAnimationCallback)
		.setPipTransactionHandler(mPipOrganizer.getPipTransactionHandler())
		.setDuration(mEnterExitAnimationDuration)
		.start();
		}

media/java/android/media/audiopolicy/AudioMix.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -455,6 +455,11 @@ public class AudioMix {
		if (mRule.getTargetMixType() != AudioMix.MIX_TYPE_PLAYERS) {
		throw new IllegalArgumentException("Unsupported device on non-playback mix");
		}
		} else if (mDeviceSystemType == AudioSystem.DEVICE_OUT_REMOTE_SUBMIX) {
		if (mRule.getTargetMixType() != AudioMix.MIX_TYPE_PLAYERS) {
		throw new IllegalArgumentException(
		"DEVICE_OUT_REMOTE_SUBMIX device is not supported on non-playback mix");
		}
		} else {
		if ((mRouteFlags & ROUTE_FLAG_SUPPORTED) == ROUTE_FLAG_RENDER) {
		throw new IllegalArgumentException(

media/tests/AudioPolicyTest/src/com/android/audiopolicytest/AudioMixUnitTests.java

+82 −0

Original line number	Diff line number	Diff line
		@@ -24,7 +24,11 @@ import static android.media.audiopolicy.AudioMixingRule.MIX_ROLE_PLAYERS;
		import static android.media.audiopolicy.AudioMixingRule.RULE_MATCH_AUDIO_SESSION_ID;
		import static android.media.audiopolicy.AudioMixingRule.RULE_MATCH_UID;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertThrows;

		import android.media.AudioFormat;
		import android.media.AudioSystem;
		import android.media.audiopolicy.AudioMix;
		import android.media.audiopolicy.AudioMixingRule;
		import android.media.audiopolicy.AudioPolicyConfig;
		@@ -145,6 +149,84 @@ public class AudioMixUnitTests {
		equalsTester.testEquals();
		}

		@Test
		public void buildRenderToRemoteSubmix_success() {
		final String deviceAddress = "address";
		final AudioMix audioMix = new AudioMix.Builder(new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_RENDER)
		.setDevice(AudioSystem.DEVICE_OUT_REMOTE_SUBMIX, /address=/deviceAddress).build();

		assertEquals(deviceAddress, audioMix.getRegistration());
		assertEquals(OUTPUT_FORMAT_MONO_16KHZ_PCM, audioMix.getFormat());
		assertEquals(AudioMix.ROUTE_FLAG_RENDER, audioMix.getRouteFlags());
		}

		@Test
		public void buildLoopbackAndRenderToRemoteSubmix_success() {
		final String deviceAddress = "address";
		final AudioMix audioMix = new AudioMix.Builder(new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_LOOP_BACK_RENDER)
		.setDevice(AudioSystem.DEVICE_OUT_REMOTE_SUBMIX, /address=/deviceAddress).build();

		assertEquals(deviceAddress, audioMix.getRegistration());
		assertEquals(OUTPUT_FORMAT_MONO_16KHZ_PCM, audioMix.getFormat());
		assertEquals(AudioMix.ROUTE_FLAG_LOOP_BACK_RENDER, audioMix.getRouteFlags());
		}

		@Test
		public void buildRenderToSpeaker_success() {
		final AudioMix audioMix = new AudioMix.Builder(new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_RENDER)
		.setDevice(AudioSystem.DEVICE_OUT_SPEAKER, /address=/"").build();

		assertEquals(OUTPUT_FORMAT_MONO_16KHZ_PCM, audioMix.getFormat());
		assertEquals(AudioMix.ROUTE_FLAG_RENDER, audioMix.getRouteFlags());
		}

		@Test
		public void buildLoopbackForPlayerMix_success() {
		final AudioMix audioMix = new AudioMix.Builder(new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_LOOP_BACK).build();

		assertEquals(OUTPUT_FORMAT_MONO_16KHZ_PCM, audioMix.getFormat());
		assertEquals(AudioMix.ROUTE_FLAG_LOOP_BACK, audioMix.getRouteFlags());
		}

		@Test
		public void buildLoopbackWithDevice_throws() {
		assertThrows(IllegalArgumentException.class, () -> new AudioMix.Builder(
		new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_LOOP_BACK)
		.setDevice(AudioSystem.DEVICE_OUT_SPEAKER, /address=/"").build());
		}

		@Test
		public void buildRenderWithoutDevice_throws() {
		assertThrows(IllegalArgumentException.class, () -> new AudioMix.Builder(
		new AudioMixingRule.Builder()
		.setTargetMixRole(MIX_ROLE_PLAYERS)
		.addMixRule(RULE_MATCH_UID, 42).build())
		.setFormat(OUTPUT_FORMAT_MONO_16KHZ_PCM)
		.setRouteFlags(AudioMix.ROUTE_FLAG_RENDER).build());
		}



		private static AudioMix writeToAndFromParcel(AudioMix audioMix) {
		AudioPolicyConfig apc = new AudioPolicyConfig(new ArrayList<>(List.of(audioMix)));
		Parcel parcel = Parcel.obtain();

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -3272,12 +3272,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		Slog.wtf(TAG, "KEYCODE_STYLUS_BUTTON_* should be handled in"
		+ " interceptKeyBeforeQueueing");
		return key_consumed;
		case KeyEvent.KEYCODE_MACRO_1:
		case KeyEvent.KEYCODE_MACRO_2:
		case KeyEvent.KEYCODE_MACRO_3:
		case KeyEvent.KEYCODE_MACRO_4:
		Slog.wtf(TAG, "KEYCODE_MACRO_x should be handled in interceptKeyBeforeQueueing");
		return key_consumed;
		}

		if (isValidGlobalKey(keyCode)
		@@ -4427,7 +4421,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		case KeyEvent.KEYCODE_MACRO_2:
		case KeyEvent.KEYCODE_MACRO_3:
		case KeyEvent.KEYCODE_MACRO_4:
		// TODO(b/266098478): Add logic to handle KEYCODE_MACROx feature
		result &= ~ACTION_PASS_TO_USER;
		break;
		}