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

Commit 2db826de authored by Eugene Susla's avatar Eugene Susla
Browse files

Add @RequiresPermission for CDM watch profile use 

Bug: 165951651
Test: presubmit
Change-Id: Id1c3b2656875de07cfc3fd936d528d0410a62aee
parent 90768407

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9716,7 +9716,7 @@ package android.companion { 
  }















  public final class CompanionDeviceManager {













    method public void associate(@NonNull android.companion.AssociationRequest, @NonNull android.companion.CompanionDeviceManager.Callback, @Nullable android.os.Handler);













    method @RequiresPermission(value=android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull android.companion.CompanionDeviceManager.Callback, @Nullable android.os.Handler);















    method public void disassociate(@NonNull String);















    method @NonNull public java.util.List<java.lang.String> getAssociations();















    method public boolean hasNotificationAccess(android.content.ComponentName);

























core/java/android/companion/CompanionDeviceManager.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.companion;





























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;










@@ -141,6 +142,10 @@ public final class CompanionDeviceManager {













     * <p>Calling this API requires a uses-feature















     * {@link PackageManager#FEATURE_COMPANION_DEVICE_SETUP} declaration in the manifest</p>















     *













     * <p>When using {@link AssociationRequest#DEVICE_PROFILE_WATCH watch}













     * {@link AssociationRequest.Builder#setDeviceProfile profile}, caller must also hold













     * {@link Manifest.permission#REQUEST_COMPANION_PROFILE_WATCH}</p>













     *















     * @param request specific details about this request















     * @param callback will be called once there's at least one device found for user to choose from















     * @param handler A handler to control which thread the callback will be delivered on, or null,









@@ -148,6 +153,9 @@ public final class CompanionDeviceManager {













     *















     * @see AssociationRequest















     */













    @RequiresPermission(













            value = Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH,













            conditional = true)















    public void associate(















            @NonNull AssociationRequest request,















            @NonNull Callback callback,