summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-07 17:08:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-07 17:08:20 +0000
commit09d92456fa0e4ac82e969e71460730170725f14e (patch)
tree38689951d29202fcf89752c3b476a05b2f2fae5e
parent5aeb1cdb03d17aca432ac68d577730934e89116a (diff)
parentd222986acdd1befa09941aeec0e31831b3365e4b (diff)
Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd
Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/net/ConnectivityDiagnosticsManager.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 14fd8c102811..ffe5a9bb3290 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28721,7 +28721,7 @@ package android.net {
method public long getReportTimestamp();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.ConnectivityDiagnosticsManager.ConnectivityReport> CREATOR;
- field public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK = "networkProbesAttemped";
+ field public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK = "networkProbesAttempted";
field public static final String KEY_NETWORK_PROBES_SUCCEEDED_BITMASK = "networkProbesSucceeded";
field public static final String KEY_NETWORK_VALIDATION_RESULT = "networkValidationResult";
field public static final int NETWORK_PROBE_DNS = 4; // 0x4
diff --git a/core/java/android/net/ConnectivityDiagnosticsManager.java b/core/java/android/net/ConnectivityDiagnosticsManager.java
index b128ea7f3e39..3c39d1558e87 100644
--- a/core/java/android/net/ConnectivityDiagnosticsManager.java
+++ b/core/java/android/net/ConnectivityDiagnosticsManager.java
@@ -202,7 +202,7 @@ public class ConnectivityDiagnosticsManager {
*/
@NetworkProbe
public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK =
- "networkProbesAttemped";
+ "networkProbesAttempted";
/** @hide */
@StringDef(prefix = {"KEY_"}, value = {