From cf9227656d90b2ca780e1c3f64dcbe601fbbe420 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Tue, 9 Feb 2021 13:44:58 +0000 Subject: [PATCH] Block calls to canAdminGrantSensorsPermissions on parent Throw if canAdminGrantSensorsPermissions is called on the parent profile instance. That would fix ManagedProfileTest#testParentProfileApiDisabled Bug: 179726587 Test: atest ManagedProfileTest#testParentProfileApiDisabled Change-Id: I7ff654674ad412ac9a9219a1a470b50da928ea10 --- core/java/android/app/admin/DevicePolicyManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 82255c87c9710..ff41d1c84e915 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -13328,6 +13328,7 @@ public class DevicePolicyManager { * @return true if the app can grant device sensors-related permissions, false otherwise. */ public boolean canAdminGrantSensorsPermissions() { + throwIfParentInstance("canAdminGrantSensorsPermissions"); return canAdminGrantSensorsPermissionsForUser(myUserId()); }