diff options
| author | 2018-03-27 10:19:13 +0000 | |
|---|---|---|
| committer | 2018-03-27 10:19:13 +0000 | |
| commit | 3cc7c4fc7677815149065018b3b64e58262b9c0d (patch) | |
| tree | 67f540f652967d848069b4bf54b34f99df13e356 | |
| parent | 1ad8367249f07869ec86ade432ba74e885b33763 (diff) | |
| parent | 6586f05457e496bbb6119cc43d77694b38336dd1 (diff) | |
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 5ab01c2630dd..8dbb9f0473a6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -9419,7 +9419,21 @@ public class DevicePolicyManager { * <p>This method may returns {@code -1} if {@code apnSetting} conflicts with an existing * override APN. Update the existing conflicted APN with * {@link #updateOverrideApn(ComponentName, int, ApnSetting)} instead of adding a new entry. - * <p>See {@link ApnSetting} for the definition of conflict. + * <p>Two override APNs are considered to conflict when all the following APIs return + * the same values on both override APNs: + * <ul> + * <li>{@link ApnSetting#getOperatorNumeric()}</li> + * <li>{@link ApnSetting#getApnName()}</li> + * <li>{@link ApnSetting#getProxyAddress()}</li> + * <li>{@link ApnSetting#getProxyPort()}</li> + * <li>{@link ApnSetting#getMmsProxyAddress()}</li> + * <li>{@link ApnSetting#getMmsProxyPort()}</li> + * <li>{@link ApnSetting#getMmsc()}</li> + * <li>{@link ApnSetting#isEnabled()}</li> + * <li>{@link ApnSetting#getMvnoType()}</li> + * <li>{@link ApnSetting#getProtocol()}</li> + * <li>{@link ApnSetting#getRoamingProtocol()}</li> + * </ul> * * @param admin which {@link DeviceAdminReceiver} this request is associated with * @param apnSetting the override APN to insert @@ -9448,7 +9462,7 @@ public class DevicePolicyManager { * {@code apnId}. * <p>This method may also returns {@code false} if {@code apnSetting} conflicts with an * existing override APN. Update the existing conflicted APN instead. - * <p>See {@link ApnSetting} for the definition of conflict. + * <p>See {@link #addOverrideApn} for the definition of conflict. * * @param admin which {@link DeviceAdminReceiver} this request is associated with * @param apnId the {@code id} of the override APN to update |