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

Commit 14dee436 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "DevicePolicyManager: annotate SystemApi" am: d63ebcf8 am: 5016cf02 

Change-Id: I27c2aa961fce4d7ee19ded54e4e3cc3172bec850
parents f1e67d5b 5016cf02

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

































core/java/android/app/admin/DevicePolicyManager.java



+3
−1




























Original line number
Diff line number
Diff line








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