Annotate repackaged API with @UnsupportedAppUsage

Adds @UnsupportedAppUsage annotations to the parts of okhttp that
are in the hidden API. Allows the okhttp entries to be removed from
the frameworks/base/config/hiddenapi-light-greylist.txt.

This was tested by making and then manually checking that the generated
out/target/common/obj/PACKAGING/hiddenapi-light-greylist.txt was the
same (after sorting) before and after this change.

Bug: 117818301
Test: see above
Change-Id: I5c88c7a80ee1d2ec7b688ae8175267fac35ef368

2 files changed, 10 insertions, 0 deletions

diff --git a/android/src/main/java/com/squareup/okhttp/HttpHandler.java b/android/src/main/java/com/squareup/okhttp/HttpHandler.java
index ef9a56b..6b5e268 100644
--- a/android/src/main/java/com/squareup/okhttp/HttpHandler.java
+++ b/android/src/main/java/com/squareup/okhttp/HttpHandler.java
@@ -18,6 +18,7 @@
 package com.squareup.okhttp;
 
 import com.squareup.okhttp.internal.URLFilter;
+import dalvik.annotation.compat.UnsupportedAppUsage;
 import libcore.net.NetworkSecurityPolicy;
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -40,6 +41,10 @@ public class HttpHandler extends URLStreamHandler {
     private final ConfigAwareConnectionPool configAwareConnectionPool =
             ConfigAwareConnectionPool.getInstance();
 
+    @UnsupportedAppUsage
+    public HttpHandler() {
+    }
+
     @Override protected URLConnection openConnection(URL url) throws IOException {
         return newOkUrlFactory(null /* proxy */).open(url);
     }
diff --git a/android/src/main/java/com/squareup/okhttp/HttpsHandler.java b/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
index d4c0b8b..dca2d65 100644
--- a/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
+++ b/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
@@ -17,6 +17,7 @@
 
 package com.squareup.okhttp;
 
+import dalvik.annotation.compat.UnsupportedAppUsage;
 import java.net.Proxy;
 import java.util.Collections;
 import java.util.List;
@@ -44,6 +45,10 @@ public final class HttpsHandler extends HttpHandler {
     private final ConfigAwareConnectionPool configAwareConnectionPool =
             ConfigAwareConnectionPool.getInstance();
 
+    @UnsupportedAppUsage
+    public HttpsHandler() {
+    }
+
     @Override protected int getDefaultPort() {
         return 443;
     }