diff options
| author | 2020-01-14 23:03:35 -0800 | |
|---|---|---|
| committer | 2020-01-14 23:03:35 -0800 | |
| commit | 5016cf02637e55adea98a7730ab6b4cc958d140e (patch) | |
| tree | 509b2a63fee94c99e3e08948ce1ea4874468ad45 | |
| parent | 01224e019f53c37e92d8299fc402989779bea83f (diff) | |
| parent | d63ebcf8070c8636910d38c2a108781d8c47cece (diff) | |
Merge "DevicePolicyManager: annotate SystemApi"
am: d63ebcf807
Change-Id: Ieef5ffc0f01fba54c9e21b0bee22e82b585f8487
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 9142cfe5ea60..d564b382f6ac 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -683,6 +683,7 @@ package android.app { package android.app.admin { public class DevicePolicyManager { + method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean getBluetoothContactSharingDisabled(@NonNull android.os.UserHandle); method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getDeviceOwner(); method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.content.ComponentName getDeviceOwnerComponentOnAnyUser(); method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getDeviceOwnerNameOnAnyUser(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 12d3c59c2bbb..79a2c9010f35 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6993,7 +6993,9 @@ public class DevicePolicyManager { * @param userHandle The user for whom to check the caller-id permission * @hide */ - public boolean getBluetoothContactSharingDisabled(UserHandle userHandle) { + @SystemApi + @RequiresPermission(permission.INTERACT_ACROSS_USERS) + public boolean getBluetoothContactSharingDisabled(@NonNull UserHandle userHandle) { if (mService != null) { try { return mService.getBluetoothContactSharingDisabledForUser(userHandle |