Merge "Revert "Make CompanionDeviceManager.getAllAssociations() public"" (d1559eb9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -9396,7 +9396,6 @@ package android.companion {
		}

		public final class CompanionDeviceManager {
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void addOnAssociationsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnAssociationsChangedListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER, android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING, android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION}, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull android.companion.CompanionDeviceManager.Callback, @Nullable android.os.Handler);
		method @RequiresPermission(anyOf={android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER, android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING, android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION}, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.Callback);
		method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;
		@@ -9407,11 +9406,9 @@ package android.companion {
		method @Deprecated public void disassociate(@NonNull String);
		method public void disassociate(int);
		method public void enableSystemDataSync(int, int);
		method @NonNull @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public java.util.List<android.companion.AssociationInfo> getAllAssociations();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getAssociations();
		method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations();
		method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName);
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void removeOnAssociationsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnAssociationsChangedListener);
		method public void requestNotificationAccess(android.content.ComponentName);
		method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;
		method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException;
		@@ -9434,10 +9431,6 @@ package android.companion {
		method public abstract void onFailure(@Nullable CharSequence);
		}

		public static interface CompanionDeviceManager.OnAssociationsChangedListener {
		method public void onAssociationsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);
		}

		public abstract class CompanionDeviceService extends android.app.Service {
		ctor public CompanionDeviceService();
		method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;

core/api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -3127,11 +3127,18 @@ package android.companion {
		}

		public final class CompanionDeviceManager {
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void addOnAssociationsChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.OnAssociationsChangedListener);
		method @RequiresPermission(android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES) public void associate(@NonNull String, @NonNull android.net.MacAddress, @NonNull byte[]);
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean canPairWithoutPrompt(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);
		method @NonNull @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public java.util.List<android.companion.AssociationInfo> getAllAssociations();
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public void notifyDeviceAppeared(int);
		method @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public void notifyDeviceDisappeared(int);
		method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void removeOnAssociationsChangedListener(@NonNull android.companion.CompanionDeviceManager.OnAssociationsChangedListener);
		}

		public static interface CompanionDeviceManager.OnAssociationsChangedListener {
		method public void onAssociationsChanged(@NonNull java.util.List<android.companion.AssociationInfo>);
		}

		}

core/java/android/companion/CompanionDeviceManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -718,7 +718,9 @@ public final class CompanionDeviceManager {
		* @return the associations list
		* @see #addOnAssociationsChangedListener(Executor, OnAssociationsChangedListener)
		* @see #removeOnAssociationsChangedListener(OnAssociationsChangedListener)
		* @hide
		*/
		@SystemApi
		@UserHandleAware
		@RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)
		public @NonNull List<AssociationInfo> getAllAssociations() {
		@@ -732,7 +734,10 @@ public final class CompanionDeviceManager {

		/**
		* Listener for any changes to {@link AssociationInfo}.
		*
		* @hide
		*/
		@SystemApi
		public interface OnAssociationsChangedListener {
		/**
		* Invoked when a change occurs to any of the associations for the user (including adding
		@@ -747,7 +752,9 @@ public final class CompanionDeviceManager {
		* Register listener for any changes to {@link AssociationInfo}.
		*
		* @see #getAllAssociations()
		* @hide
		*/
		@SystemApi
		@UserHandleAware
		@RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)
		public void addOnAssociationsChangedListener(
		@@ -769,7 +776,9 @@ public final class CompanionDeviceManager {
		* Unregister listener for any changes to {@link AssociationInfo}.
		*
		* @see #getAllAssociations()
		* @hide
		*/
		@SystemApi
		@UserHandleAware
		@RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)
		public void removeOnAssociationsChangedListener(