commit a428392c1ddb93cabf0186ea0507b1fbc5254c60
author Hugo Benichi <hugobenichi@google.com> Fri Jul 14 07:25:51 2017 +0900
committer Hugo Benichi <hugobenichi@google.com> Fri Jul 14 07:25:51 2017 +0900
tree bf4c6024d1456f06da1849be5639c14d61c785bf
parent 791a698a6a5f6c6e8b37f43c38f0027af9ee70be
parent 4f2a0fe213e56d1eb4221a02a09571262ef8036a

resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031

core/java/android/net/metrics/IpManagerEvent.java

diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java
index f5aea73..a94b928 100644
--- a/core/java/android/net/metrics/IpManagerEvent.java
+++ b/core/java/android/net/metrics/IpManagerEvent.java
@@ -39,10 +39,12 @@
     public static final int ERROR_STARTING_IPV4                   = 4;
     public static final int ERROR_STARTING_IPV6                   = 5;
     public static final int ERROR_STARTING_IPREACHABILITYMONITOR  = 6;
+    public static final int ERROR_INVALID_PROVISIONING            = 7;
 
     @IntDef(value = {
             PROVISIONING_OK, PROVISIONING_FAIL, COMPLETE_LIFECYCLE,
             ERROR_STARTING_IPV4, ERROR_STARTING_IPV6, ERROR_STARTING_IPREACHABILITYMONITOR,
+            ERROR_INVALID_PROVISIONING,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface EventType {}