Merge "Rename wasTransferRequestedBySelf to wasTransferInitiatedBySelf" into main (29161ea0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -24307,7 +24307,7 @@ package android.media {
		method public void release();
		method public void selectRoute(@NonNull android.media.MediaRoute2Info);
		method public void setVolume(int);
		method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public boolean wasTransferRequestedBySelf();
		method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public boolean wasTransferInitiatedBySelf();
		}

		public abstract static class MediaRouter2.TransferCallback {

+3 −3

Original line number	Diff line number	Diff line
		@@ -734,7 +734,7 @@ public final class MediaRouter2 {
		* request.
		* @param transferInitiatorPackageName the package name of the app that initiated the transfer.
		* This value is used with the user handle to populate {@link
		* RoutingController#wasTransferRequestedBySelf()}.
		* RoutingController#wasTransferInitiatedBySelf()}.
		* @hide
		*/
		@FlaggedApi(FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES)
		@@ -1550,11 +1550,11 @@ public final class MediaRouter2 {
		}

		/**
		* Returns whether the transfer was requested by the calling app (as determined by comparing
		* Returns whether the transfer was initiated by the calling app (as determined by comparing
		* {@link UserHandle} and package name).
		*/
		@FlaggedApi(FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES)
		public boolean wasTransferRequestedBySelf() {
		public boolean wasTransferInitiatedBySelf() {
		RoutingSessionInfo sessionInfo = getRoutingSessionInfo();

		UserHandle transferInitiatorUserHandle = sessionInfo.getTransferInitiatorUserHandle();