summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2021-04-28 16:31:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-04-28 16:31:45 +0000
commit056452001fdc3c5f1b3becafb8ddca3414b77d62 (patch)
tree1c5a50219603a0d546a220b42eda57ad8625bc09 /core/java/android
parentc49760fc63d0d4a1264f3735ddbedbeb7506a783 (diff)
parente3cfe3c7f626d70fcf6d32e37355333daf7bc309 (diff)
Merge "Disabled DevicePolicyManager.setLocationEnabled() for automotive." into sc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index c93a88f9f312..cbf2d6a12bec 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -10368,6 +10368,9 @@ public class DevicePolicyManager {
/**
* Called by device owners to set the user's global location setting.
*
+ * <p><b>Note: </b> this call is ignored on
+ * {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive builds}.
+ *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with
* @param locationEnabled whether location should be enabled or disabled
* @throws SecurityException if {@code admin} is not a device owner.