Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add @RequiresPermission for CDM watch profile use

Browse Source 
Bug: 165951651
Test: presubmit
Change-Id: Id1c3b2656875de07cfc3fd936d528d0410a62aee
This commit is contained in:
Eugene Susla
2021-03-05 12:26:40 -08:00
parent 9076840750
commit 2db826decf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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);

8
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -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,