summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorEran Messeri <eranm@google.com>2021-02-09 13:44:58 +0000
committerEran Messeri <eranm@google.com>2021-02-09 13:44:58 +0000
commitcf9227656d90b2ca780e1c3f64dcbe601fbbe420 (patch)
treeca6a7743fb1350d714006b7734b2a112c6e8a0e8 /core/java/android
parent005028d9259d34f30c9d4cbe8d224a788b8e558e (diff)
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
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 82255c87c971..ff41d1c84e91 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());
}