summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2016-11-09 02:37:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-09 02:37:17 +0000
commitd8a06fa28a3bd3fa4bbb5335d324a754f61d724c (patch)
tree9c4e4455275637d5802aba15ae1ee0b4f85e6df7 /core/java/android
parent9c3b89dfc7d89a93da7b3cd43256225f10c2568d (diff)
parente4526604664cb66ecdcbeca4d8f64e8c94750c31 (diff)
Handle IpReachabilityMonitor errors better.
am: e452660466 Change-Id: I3bb9ce7caa99e166ddc576399453fcc9e172d6a6
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/metrics/IpManagerEvent.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java
index a5b4eb5aff86..e0a026ed678d 100644
--- a/core/java/android/net/metrics/IpManagerEvent.java
+++ b/core/java/android/net/metrics/IpManagerEvent.java
@@ -38,9 +38,15 @@ public final class IpManagerEvent implements Parcelable {
public static final int PROVISIONING_OK = 1;
public static final int PROVISIONING_FAIL = 2;
public static final int COMPLETE_LIFECYCLE = 3;
+ /** @hide */ public static final int ERROR_STARTING_IPV4 = 4;
+ /** @hide */ public static final int ERROR_STARTING_IPV6 = 5;
+ /** @hide */ public static final int ERROR_STARTING_IPREACHABILITYMONITOR = 6;
/** {@hide} */
- @IntDef(value = {PROVISIONING_OK, PROVISIONING_FAIL, COMPLETE_LIFECYCLE})
+ @IntDef(value = {
+ PROVISIONING_OK, PROVISIONING_FAIL, COMPLETE_LIFECYCLE,
+ ERROR_STARTING_IPV4, ERROR_STARTING_IPV6, ERROR_STARTING_IPREACHABILITYMONITOR,
+ })
@Retention(RetentionPolicy.SOURCE)
public @interface EventType {}
@@ -95,6 +101,7 @@ public final class IpManagerEvent implements Parcelable {
final static class Decoder {
static final SparseArray<String> constants = MessageUtils.findMessageNames(
- new Class[]{IpManagerEvent.class}, new String[]{"PROVISIONING_", "COMPLETE_"});
+ new Class[]{IpManagerEvent.class},
+ new String[]{"PROVISIONING_", "COMPLETE_", "ERROR_"});
}
}