Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6e145a authored by Igor Chernyshev's avatar Igor Chernyshev
Browse files

Make CompanionDeviceManager.getAllAssociations() public 

This allows mainline modules to enable their services
for CDM-associated devices.

Bug: 245972418

Test: atest CtsCompanionDeviceManagerCoreTestCases:AssociationsChangedListenerTest
Test: atest CtsCompanionDeviceManagerCoreTestCases:RetrieveAssociationsTest

API-Coverage-Bug: 261281482

Change-Id: I9c6d20ad59bec96b7c004a6c78df64b79652c512
parent 11e9066d

core/api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -9231,15 +9231,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(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 @Nullable public android.content.IntentSender buildAssociationCancellationIntent();















    method @Nullable public android.content.IntentSender buildPermissionTransferUserConsentIntent(int) throws android.companion.DeviceNotAssociatedException;















    method @Deprecated public void disassociate(@NonNull String);















    method public void disassociate(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 @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;









@@ -9260,6 +9263,10 @@ 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 @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);

























core/api/system-current.txt



+0
−7




























Original line number
Diff line number
Diff line








@@ -2973,18 +2973,11 @@ 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



+0
−9




























Original line number
Diff line number
Diff line








@@ -662,9 +662,7 @@ 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() {









@@ -678,10 +676,7 @@ 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









@@ -696,9 +691,7 @@ 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(









@@ -720,9 +713,7 @@ 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(