From 2fa704ebe2cb937eef59618f00da4314ff0d5e45 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Fri, 12 Feb 2021 14:48:23 +0000 Subject: [PATCH] Utilize context user ID for canAdminGrantSensorsPermissions Remove, from the system API surface, the canAdminGrantSensorsPermissionsForUser method, leaving only canAdminGrantSensorsPermissions. In canAdminGrantSensorsPermissions, get the user ID from the context. This means callers that need to find out the permission grant state for a particular user would have to construct a context object for that user. Bug: 179690270 Bug: 170627643 Test: DeviceOwnerTest#testDeviceOwnerProvisioning ManagedProvisioningTests:com.android.managedprovisioning.parser.ExtrasProvisioningDataParserTest ManagedProvisioningTests:com.android.managedprovisioning.parser.PropertiesProvisioningDataParserTest ManagedProvisioningTests:com.android.managedprovisioning.model.ProvisioningParamsTest android.devicepolicy.cts.DevicePolicyManagerTest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.DeviceOwnerTest#testAdminControlOverSensorPermissionGrantsDefault com.android.cts.devicepolicy.MixedProfileOwnerTest#testAdminControlOverSensorPermissionGrantsDefault Change-Id: I118f642c15b3f9848ff97d13e1e32b3bd5dba63d --- core/api/system-current.txt | 1 - .../android/app/admin/DevicePolicyManager.java | 15 +-------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 60a7d06f48aee..e25b4518f71ba 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -870,7 +870,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 e95ab17da09ba..3fc636cd9adcf 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -13357,24 +13357,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(); }