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

Commit 2fa704eb authored by Eran Messeri's avatar Eran Messeri
Browse files

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
parent a4734632

core/api/system-current.txt

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

































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



+1
−14






























Original line number
Diff line number
Diff line








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















        }