diff options
| author | 2020-01-15 07:28:57 +0000 | |
|---|---|---|
| committer | 2020-01-15 07:28:57 +0000 | |
| commit | 0dcf43d1fe34682acfdb843ac21d25ed1c15e8a2 (patch) | |
| tree | 4e11f9e5d7ef91e7d31a955c080abad4027f9510 | |
| parent | 70cb293d447d0025470c211ff196c131a0313dc2 (diff) | |
| parent | 14dee43669d56e69c6e3b557bd20c40b4c504fbd (diff) | |
Merge "DevicePolicyManager: annotate SystemApi" am: d63ebcf807 am: 5016cf0263 am: 14dee43669
Change-Id: I88cb20e9c283993cda6be98d73f0fbfdc3f4ce54
| -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 3f340962f823..5a5082cdd2c8 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -791,6 +791,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 caaa686ecf08..c584575f4839 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -7418,7 +7418,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 |