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

Merge "DevicePolicyManager: annotate SystemApi" am: d63ebcf807 am: 5016cf0263

Browse Source 
Change-Id: I27c2aa961fce4d7ee19ded54e4e3cc3172bec850
This commit is contained in:
Automerger Merge Worker
2020-01-15 07:14:27 +00:00
parent f1e67d5b17 5016cf0263
commit 14dee43669
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

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

4
core/java/android/app/admin/DevicePolicyManager.java
View File

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