commit 14dee43669d56e69c6e3b557bd20c40b4c504fbd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 07:14:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 07:14:27 2020 +0000
tree 2f4b8cedb97a9f204167fa44fca8b2ceaeb84d7c
parent f1e67d5b1727e22e304361083e4d56f3dcd1bc01
parent 5016cf02637e55adea98a7730ab6b4cc958d140e

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

Change-Id: I27c2aa961fce4d7ee19ded54e4e3cc3172bec850

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9142cfe..d564b38 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -683,6 +683,7 @@
 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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 3fc735b..5afd82f 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -7009,7 +7009,9 @@
      * @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