diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4b35520ee806e..f5a22543f9405 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -872,7 +872,6 @@ package android.app.admin { } public class DevicePolicyManager { - method public boolean canAdminGrantSensorsPermissionsForUser(int); 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(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 907abb2602bb6..3b4f720c654fb 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -13358,24 +13358,11 @@ public class DevicePolicyManager { */ public boolean canAdminGrantSensorsPermissions() { throwIfParentInstance("canAdminGrantSensorsPermissions"); - return canAdminGrantSensorsPermissionsForUser(myUserId()); - } - - /** - * Returns true if the admin can control grants of sensors-related permissions, for - * a given user. - * - * @hide - * @param userId The ID of the user to check. - * @return if the admin may grant these permissions, false otherwise. - */ - @SystemApi - public boolean canAdminGrantSensorsPermissionsForUser(int userId) { if (mService == null) { return false; } try { - return mService.canAdminGrantSensorsPermissionsForUser(userId); + return mService.canAdminGrantSensorsPermissionsForUser(myUserId()); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); }