commit d57628bf9fcf638fabcf8dee2f4fed06ee693f0e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 11 14:27:47 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 11 14:27:47 2019 +0000
tree 4c150b94f5eee2386573ccc8fd7b991ddd0b7c35
parent f2016651b606c151f14f667ea18fdef1bd12a31a
parent 56cb6bb2a9c475a07a11edb18c07cb295e43454c

Merge "Add @UnsupportedAppUsage annotations for greylist."

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index cfa3934..75af41c 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1763,6 +1763,10 @@
 
     /** @hide */
     public static class PacketKeepaliveCallback {
+        @UnsupportedAppUsage
+        public PacketKeepaliveCallback() {
+        }
+
         /** The requested keepalive was successfully started. */
         @UnsupportedAppUsage
         public void onStarted() {}

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 3ec0aea..0706e75 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -111,6 +111,8 @@
     /**
      * @hide
      */
+    @UnsupportedAppUsage(implicitMember =
+            "values()[Landroid/net/LinkProperties$ProvisioningChange;")
     public enum ProvisioningChange {
         @UnsupportedAppUsage
         STILL_NOT_PROVISIONED,