Merge "Private DNS API: Follow-up on review"
diff --git a/api/current.txt b/api/current.txt
index 135a5b4..fb588dc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6949,7 +6949,7 @@
field public static final int PRIVATE_DNS_MODE_UNKNOWN = 0; // 0x0
field public static final int PRIVATE_DNS_SET_ERROR_FAILURE_SETTING = 2; // 0x2
field public static final int PRIVATE_DNS_SET_ERROR_HOST_NOT_SERVING = 1; // 0x1
- field public static final int PRIVATE_DNS_SET_SUCCESS = 0; // 0x0
+ field public static final int PRIVATE_DNS_SET_NO_ERROR = 0; // 0x0
field public static final int PROVISIONING_MODE_FULLY_MANAGED_DEVICE = 1; // 0x1
field public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2; // 0x2
field public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3; // 0x3
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index d82899e..f8ccb13 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2187,7 +2187,7 @@
* {@code PRIVATE_DNS_MODE_PROVIDER_HOSTNAME} then it implies the supplied host is valid
* and reachable.
*/
- public static final int PRIVATE_DNS_SET_SUCCESS = 0;
+ public static final int PRIVATE_DNS_SET_NO_ERROR = 0;
/**
* If the {@code privateDnsHost} provided was of a valid hostname but that host was found
@@ -2204,7 +2204,7 @@
* @hide
*/
@IntDef(prefix = {"PRIVATE_DNS_SET_"}, value = {
- PRIVATE_DNS_SET_SUCCESS,
+ PRIVATE_DNS_SET_NO_ERROR,
PRIVATE_DNS_SET_ERROR_HOST_NOT_SERVING,
PRIVATE_DNS_SET_ERROR_FAILURE_SETTING
})
@@ -10478,7 +10478,7 @@
*
* @param admin which {@link DeviceAdminReceiver} this request is associated with.
*
- * @return {@code PRIVATE_DNS_SET_SUCCESS} if the mode was set successfully, or
+ * @return {@code PRIVATE_DNS_SET_NO_ERROR} if the mode was set successfully, or
* {@code PRIVATE_DNS_SET_ERROR_FAILURE_SETTING} if it could not be set.
*
* @throws SecurityException if the caller is not the device owner.
@@ -10514,7 +10514,7 @@
* @param admin which {@link DeviceAdminReceiver} this request is associated with.
* @param privateDnsHost The hostname of a server that implements DNS over TLS (RFC7858).
*
- * @return {@code PRIVATE_DNS_SET_SUCCESS} if the mode was set successfully,
+ * @return {@code PRIVATE_DNS_SET_NO_ERROR} if the mode was set successfully,
* {@code PRIVATE_DNS_SET_ERROR_FAILURE_SETTING} if it could not be set or
* {@code PRIVATE_DNS_SET_ERROR_HOST_NOT_SERVING} if the specified host does not
* implement RFC7858.
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c16de5b..3999edd 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -65,7 +65,7 @@
import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_MODE_UNKNOWN;
import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_ERROR_FAILURE_SETTING;
-import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_SUCCESS;
+import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_NO_ERROR;
import static android.app.admin.DevicePolicyManager.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER;
import static android.app.admin.DevicePolicyManager.WIPE_EUICC;
import static android.app.admin.DevicePolicyManager.WIPE_EXTERNAL_STORAGE;
@@ -14010,7 +14010,7 @@
"Host provided for opportunistic mode, but is not needed.");
}
putPrivateDnsSettings(ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC, null);
- return PRIVATE_DNS_SET_SUCCESS;
+ return PRIVATE_DNS_SET_NO_ERROR;
case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
if (TextUtils.isEmpty(privateDnsHost)
|| !NetworkUtils.isWeaklyValidatedHostname(privateDnsHost)) {
@@ -14023,7 +14023,7 @@
putPrivateDnsSettings(
ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME,
privateDnsHost);
- return PRIVATE_DNS_SET_SUCCESS;
+ return PRIVATE_DNS_SET_NO_ERROR;
default:
throw new IllegalArgumentException(
String.format("Provided mode, %d, is not a valid mode.", mode));