diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-12-05 15:02:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-05 15:02:19 +0000 |
| commit | 40067bbcd2e64e6fa7eccf31d71b7f4b43de2a63 (patch) | |
| tree | b49d3012b4090f101ff7dd2ce5561ada7a244a77 /core/java/android | |
| parent | 0c637f535cde6f8b5c40fda13ba5d9f54326b7f1 (diff) | |
| parent | 6ba10db1e42a8ba2e67bb19d9dc08129b253e667 (diff) | |
Merge "getWifiMacAddress: Enable for profile owner on org-owned device"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminInfo.java | 8 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 00903c43b291..63bc40b86aa7 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -55,6 +55,14 @@ public final class DeviceAdminInfo implements Parcelable { static final String TAG = "DeviceAdminInfo"; /** + * A type of policy that this device admin can use: profile owner on an organization-owned + * device. + * + * @hide + */ + public static final int USES_POLICY_ORGANIZATION_OWNED_PROFILE_OWNER = -3; + + /** * A type of policy that this device admin can use: device owner meta-policy * for an admin that is designated as owner of the device. * diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 39dc51e307f1..34ceb08f39bf 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -9135,7 +9135,14 @@ public class DevicePolicyManager { } /** - * Called by device owner to get the MAC address of the Wi-Fi device. + * Called by device owner, or profile owner on organization-owned device, to get the MAC + * address of the Wi-Fi device. + * + * NOTE: The MAC address returned here should only be used for inventory management and is + * not likely to be the MAC address used by the device to connect to Wi-Fi networks: MAC + * addresses used for scanning and connecting to Wi-Fi networks are randomized by default. + * To get the randomized MAC address used, call + * {@link android.net.wifi.WifiConfiguration#getRandomizedMacAddress}. * * @param admin Which device owner this request is associated with. * @return the MAC address of the Wi-Fi device, or null when the information is not available. |