Merge "Annotate repackaged API with @UnsupportedAppUsage"android-n-iot-release-ihome-igv1nougat-iot-release

22 files changed, 322 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;
     }
diff --git a/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java b/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
index 920824b..ad8cd47 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
@@ -19,6 +19,7 @@
 package com.android.okhttp;
 
 import com.android.okhttp.internal.URLFilter;
+import dalvik.annotation.compat.UnsupportedAppUsage;
 import libcore.net.NetworkSecurityPolicy;
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -44,6 +45,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/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java b/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java
index 299274d..5c189d1 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java
@@ -18,6 +18,7 @@
 
 package com.android.okhttp;
 
+import dalvik.annotation.compat.UnsupportedAppUsage;
 import java.net.Proxy;
 import java.util.Collections;
 import java.util.List;
@@ -48,6 +49,10 @@ public final class HttpsHandler extends HttpHandler {
     private final ConfigAwareConnectionPool configAwareConnectionPool =
             ConfigAwareConnectionPool.getInstance();
 
+    @UnsupportedAppUsage
+    public HttpsHandler() {
+    }
+
     @Override protected int getDefaultPort() {
         return 443;
     }
diff --git a/repackaged/android/src/main/java/com/android/okhttp/internal/Platform.java b/repackaged/android/src/main/java/com/android/okhttp/internal/Platform.java
index ad2559a..6ddff7e 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/internal/Platform.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/internal/Platform.java
@@ -48,6 +48,7 @@ public class Platform {
     protected Platform() {
     }
 
+    @dalvik.annotation.compat.UnsupportedAppUsage
     public static Platform get() {
         return INSTANCE_HOLDER.get();
     }
@@ -89,6 +90,7 @@ public class Platform {
     private static final OptionalMethod<Socket> SET_ALPN_PROTOCOLS =
             new OptionalMethod<Socket>(null, "setAlpnProtocols", byte[].class );
 
+    @dalvik.annotation.compat.UnsupportedAppUsage
     public void logW(String warning) {
         System.logW(warning);
     }
diff --git a/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpURLConnectionImpl.java b/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpURLConnectionImpl.java
index 962bc99..8f1dcab 100644
--- a/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpURLConnectionImpl.java
+++ b/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpURLConnectionImpl.java
@@ -86,6 +86,7 @@ public class HttpURLConnectionImpl extends HttpURLConnection {
       Arrays.asList("OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "PATCH"));
   private static final RequestBody EMPTY_REQUEST_BODY = RequestBody.create(null, new byte[0]);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   final OkHttpClient client;
 
   private Headers.Builder requestHeaders = new Headers.Builder();
@@ -94,6 +95,7 @@ public class HttpURLConnectionImpl extends HttpURLConnection {
   private long fixedContentLength = -1;
   private int followUpCount;
   protected IOException httpEngineFailure;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   protected HttpEngine httpEngine;
   /** Lazily created (with synthetic headers) on first call to getHeaders(). */
   private Headers responseHeaders;
diff --git a/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpsURLConnectionImpl.java b/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpsURLConnectionImpl.java
index 5d7e738..f73a8ce 100644
--- a/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpsURLConnectionImpl.java
+++ b/repackaged/okhttp-urlconnection/src/main/java/com/android/okhttp/internal/huc/HttpsURLConnectionImpl.java
@@ -28,6 +28,7 @@ import javax.net.ssl.SSLSocketFactory;
  * @hide This class is not part of the Android public SDK API
  */
 public final class HttpsURLConnectionImpl extends DelegatingHttpsURLConnection {
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final HttpURLConnectionImpl delegate;
 
   public HttpsURLConnectionImpl(URL url, OkHttpClient client) {
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java b/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java
index 89f2546..3c19699 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java
@@ -73,6 +73,7 @@ public interface Connection {
    * Returns the socket that this connection uses, or null if the connection
    * is not currently connected.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   Socket getSocket();
 
   Handshake getHandshake();
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java b/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java
index 657751b..bd4a702 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java
@@ -60,6 +60,7 @@ import java.util.concurrent.TimeUnit;
 public final class ConnectionPool {
   private static final long DEFAULT_KEEP_ALIVE_DURATION_MS = 5 * 60 * 1000; // 5 min
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private static final ConnectionPool systemDefault;
 
   static {
@@ -88,7 +89,9 @@ public final class ConnectionPool {
       new LinkedBlockingQueue<Runnable>(), Util.threadFactory("OkHttp ConnectionPool", true));
 
   /** The maximum number of idle connections for each address. */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final int maxIdleConnections;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final long keepAliveDurationNs;
   private Runnable cleanupRunnable = new Runnable() {
     @Override public void run() {
@@ -109,6 +112,7 @@ public final class ConnectionPool {
     }
   };
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final Deque<RealConnection> connections = new ArrayDeque<>();
   final RouteDatabase routeDatabase = new RouteDatabase();
 
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java b/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java
index 24cb0d4..b16928d 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java
@@ -438,6 +438,7 @@ public final class HttpUrl {
    * Returns the entire path of this URL, encoded for use in HTTP resource resolution. The
    * returned path is always nonempty and is prefixed with {@code /}.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public String encodedPath() {
     int pathStart = url.indexOf('/', scheme.length() + 3); // "://".length() == 3.
     int pathEnd = delimiterOffset(url, pathStart, url.length(), "?#");
@@ -518,6 +519,7 @@ public final class HttpUrl {
     return result;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public String query() {
     if (queryNamesAndValues == null) return null; // No query.
     StringBuilder result = new StringBuilder();
@@ -588,6 +590,7 @@ public final class HttpUrl {
     return result == Builder.ParseResult.SUCCESS ? builder.build() : null;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public Builder newBuilder() {
     Builder result = new Builder();
     result.scheme = scheme;
@@ -607,6 +610,7 @@ public final class HttpUrl {
    * Returns a new {@code HttpUrl} representing {@code url} if it is a well-formed HTTP or HTTPS
    * URL, or null if it isn't.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static HttpUrl parse(String url) {
     Builder builder = new Builder();
     Builder.ParseResult result = builder.parse(null, url);
@@ -915,6 +919,7 @@ public final class HttpUrl {
       return this;
     }
 
+    @dalvik.annotation.compat.UnsupportedAppUsage
     public HttpUrl build() {
       if (scheme == null) throw new IllegalStateException("scheme == null");
       if (host == null) throw new IllegalStateException("host == null");
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java b/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java
index b6698d3..3f211c0 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java
@@ -53,6 +53,7 @@ import javax.net.ssl.SSLSocketFactory;
  * @hide This class is not part of the Android public SDK API
  */
 public class OkHttpClient implements Cloneable {
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private static final List<Protocol> DEFAULT_PROTOCOLS = Util.immutableList(
       Protocol.HTTP_2, Protocol.SPDY_3, Protocol.HTTP_1_1);
 
@@ -138,7 +139,9 @@ public class OkHttpClient implements Cloneable {
   private HostnameVerifier hostnameVerifier;
   private CertificatePinner certificatePinner;
   private Authenticator authenticator;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private ConnectionPool connectionPool;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private Dns dns;
   private boolean followSslRedirects = true;
   private boolean followRedirects = true;
@@ -147,6 +150,7 @@ public class OkHttpClient implements Cloneable {
   private int readTimeout = 10_000;
   private int writeTimeout = 10_000;
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public OkHttpClient() {
     routeDatabase = new RouteDatabase();
     dispatcher = new Dispatcher();
@@ -248,6 +252,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public Proxy getProxy() {
     return proxy;
   }
@@ -266,6 +271,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public ProxySelector getProxySelector() {
     return proxySelector;
   }
@@ -282,6 +288,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public CookieHandler getCookieHandler() {
     return cookieHandler;
   }
@@ -348,6 +355,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public SSLSocketFactory getSslSocketFactory() {
     return sslSocketFactory;
   }
@@ -363,6 +371,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public HostnameVerifier getHostnameVerifier() {
     return hostnameVerifier;
   }
@@ -409,6 +418,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public ConnectionPool getConnectionPool() {
     return connectionPool;
   }
@@ -456,6 +466,7 @@ public class OkHttpClient implements Cloneable {
    * Set this to false to avoid retrying requests when doing so is destructive. In this case the
    * calling application should do its own recovery of connectivity failures.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
     this.retryOnConnectionFailure = retryOnConnectionFailure;
   }
@@ -512,6 +523,7 @@ public class OkHttpClient implements Cloneable {
    *     must contain {@link Protocol#HTTP_1_1}. It must not contain null or
    *     {@link Protocol#HTTP_1_0}.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public OkHttpClient setProtocols(List<Protocol> protocols) {
     protocols = Util.immutableList(protocols);
     if (!protocols.contains(Protocol.HTTP_1_1)) {
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java b/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java
index e16496e..72fd072 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java
@@ -28,8 +28,11 @@ import java.util.List;
  * @hide This class is not part of the Android public SDK API
  */
 public final class Request {
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final HttpUrl url;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final String method;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final Headers headers;
   private final RequestBody body;
   private final Object tag;
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java b/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java
index f4bba1b..a79e29c 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java
@@ -37,12 +37,17 @@ import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
  */
 public final class Response {
   private final Request request;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final Protocol protocol;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final int code;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final String message;
   private final Handshake handshake;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final Headers headers;
   private final ResponseBody body;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private Response networkResponse;
   private Response cacheResponse;
   private final Response priorResponse;
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Internal.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Internal.java
index 20f937d..57ec483 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Internal.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Internal.java
@@ -40,37 +40,54 @@ import javax.net.ssl.SSLSocket;
 public abstract class Internal {
   public static final Logger logger = Logger.getLogger(OkHttpClient.class.getName());
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
+  public Internal() {
+  }
+
   public static void initializeInstanceForTests() {
     // Needed in tests to ensure that the instance is actually pointing to something.
     new OkHttpClient();
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static Internal instance;
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void addLenient(Headers.Builder builder, String line);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void addLenient(Headers.Builder builder, String name, String value);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void setCache(OkHttpClient client, InternalCache internalCache);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract InternalCache internalCache(OkHttpClient client);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract RealConnection get(
       ConnectionPool pool, Address address, StreamAllocation streamAllocation);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void put(ConnectionPool pool, RealConnection connection);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract boolean connectionBecameIdle(ConnectionPool pool, RealConnection connection);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract RouteDatabase routeDatabase(ConnectionPool connectionPool);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void apply(ConnectionSpec tlsConfiguration, SSLSocket sslSocket,
       boolean isFallback);
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract HttpUrl getHttpUrlChecked(String url)
       throws MalformedURLException, UnknownHostException;
 
   // TODO delete the following when web sockets move into the main package.
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket);
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public abstract StreamAllocation callEngineGetStreamAllocation(Call call);
 }
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Util.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Util.java
index b611109..8c978f1 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Util.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/Util.java
@@ -43,10 +43,12 @@ import com.android.okhttp.okio.Source;
 /** Junk drawer of utility methods. 
  * @hide This class is not part of the Android public SDK API*/
 public final class Util {
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
   public static final String[] EMPTY_STRING_ARRAY = new String[0];
 
   /** A cheap and type-safe constant for the UTF-8 Charset. */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static final Charset UTF_8 = Charset.forName("UTF-8");
 
   private Util() {
@@ -67,6 +69,7 @@ public final class Util {
    * Closes {@code closeable}, ignoring any checked exceptions. Does nothing
    * if {@code closeable} is null.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static void closeQuietly(Closeable closeable) {
     if (closeable != null) {
       try {
@@ -114,6 +117,7 @@ public final class Util {
    * Closes {@code a} and {@code b}. If either close fails, this completes
    * the other close and rethrows the first encountered exception.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static void closeAll(Closeable a, Closeable b) throws IOException {
     Throwable thrown = null;
     try {
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HeaderParser.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HeaderParser.java
index 7d398ea..84c9019 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HeaderParser.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HeaderParser.java
@@ -26,6 +26,7 @@ public final class HeaderParser {
    * contains a character from {@code characters}. Returns the input length if
    * none of the requested characters can be found.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static int skipUntil(String input, int pos, String characters) {
     for (; pos < input.length(); pos++) {
       if (characters.indexOf(input.charAt(pos)) != -1) {
@@ -39,6 +40,7 @@ public final class HeaderParser {
    * Returns the next non-whitespace character in {@code input} that is white
    * space. Result is undefined if input contains newline characters.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static int skipWhitespace(String input, int pos) {
     for (; pos < input.length(); pos++) {
       char c = input.charAt(pos);
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpDate.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpDate.java
index 52265c2..a8fbd60 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpDate.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpDate.java
@@ -74,6 +74,7 @@ public final class HttpDate {
       new DateFormat[BROWSER_COMPATIBLE_DATE_FORMAT_STRINGS.length];
 
   /** Returns the date for {@code value}. Returns null if the value couldn't be parsed. */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static Date parse(String value) {
     if (value.length() == 0) {
       return null;
@@ -112,6 +113,7 @@ public final class HttpDate {
   }
 
   /** Returns the string for {@code value}. */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public static String format(Date value) {
     return STANDARD_DATE_FORMAT.get().format(value);
   }
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpEngine.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpEngine.java
index 0ef78ed..58ce109 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpEngine.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/HttpEngine.java
@@ -108,10 +108,13 @@ public final class HttpEngine {
   final OkHttpClient client;
 
   public final StreamAllocation streamAllocation;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private final Response priorResponse;
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private HttpStream httpStream;
 
   /** The time when the request headers were written, or -1 if they haven't been written yet. */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   long sentRequestMillis = -1;
 
   /**
@@ -139,6 +142,7 @@ public final class HttpEngine {
    * derived from the user request, and customized to support OkHttp features
    * like compression and caching.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private Request networkRequest;
 
   /**
@@ -153,6 +157,7 @@ public final class HttpEngine {
    * response, cache response, or both. It is customized to support OkHttp
    * features like compression and caching.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private Response userResponse;
 
   private Sink requestBodyOut;
@@ -198,6 +203,7 @@ public final class HttpEngine {
    *     {@link #recover(IOException)}.
    *
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public void sendRequest() throws RequestException, RouteException, IOException {
     if (cacheStrategy != null) return; // Already sent.
     if (httpStream != null) throw new IllegalStateException();
@@ -296,6 +302,7 @@ public final class HttpEngine {
    * Called immediately before the transport transmits HTTP request headers.
    * This is used to observe the sent time should the request be cached.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public void writingRequestHeaders() {
     if (sentRequestMillis != -1) throw new IllegalStateException();
     sentRequestMillis = System.currentTimeMillis();
@@ -320,6 +327,7 @@ public final class HttpEngine {
         : null;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public boolean hasResponse() {
     return userResponse != null;
   }
@@ -335,6 +343,7 @@ public final class HttpEngine {
     return userResponse;
   }
 
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public Connection getConnection() {
     return streamAllocation.connection();
   }
@@ -517,6 +526,7 @@ public final class HttpEngine {
    * <p>This client doesn't specify a default {@code Accept} header because it
    * doesn't know what content types the application is interested in.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   private Request networkRequest(Request request) throws IOException {
     Request.Builder result = request.newBuilder();
 
@@ -557,6 +567,7 @@ public final class HttpEngine {
    * Flushes the remaining request header and body, parses the HTTP response
    * headers and starts reading the HTTP response body if it exists.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public void readResponse() throws IOException {
     if (userResponse != null) {
       return; // Already ready.
diff --git a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/RouteSelector.java b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/RouteSelector.java
index 75ecf64..0904341 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/RouteSelector.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/internal/http/RouteSelector.java
@@ -67,6 +67,7 @@ public final class RouteSelector {
    * Returns true if there's another route to attempt. Every address has at
    * least one route.
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage
   public boolean hasNext() {
     return hasNextInetSocketAddress()
         || hasNextProxy()
diff --git a/srcgen/default-constructors.txt b/srcgen/default-constructors.txt
new file mode 100644
index 0000000..033bd0d
--- /dev/null
+++ b/srcgen/default-constructors.txt
@@ -0,0 +1 @@
+com.android.okhttp.internal.Internal
diff --git a/srcgen/generate_android_src.sh b/srcgen/generate_android_src.sh
index b50c90d..d46ca00 100755
--- a/srcgen/generate_android_src.sh
+++ b/srcgen/generate_android_src.sh
@@ -1,4 +1,17 @@
 #!/bin/bash
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 if [ -z "$ANDROID_BUILD_TOP" ]; then
     echo "Missing environment variables. Did you run build/envsetup.sh and lunch?" 1>&2
@@ -8,6 +21,9 @@ fi
 CLASSPATH=${ANDROID_HOST_OUT}/framework/currysrc.jar
 PROJECT_DIR=${ANDROID_BUILD_TOP}/external/okhttp
 
+UNSUPPORTED_APP_USAGE_FILE=${PROJECT_DIR}/srcgen/unsupported-app-usage.json
+DEFAULT_CONSTRUCTORS_FILE=${PROJECT_DIR}/srcgen/default-constructors.txt
+
 cd ${ANDROID_BUILD_TOP}
 make -j15 currysrc
 
@@ -28,6 +44,8 @@ function do_transform() {
        --package-transformation "com.squareup:com.android" \
        --package-transformation "okio:com.android.okhttp.okio" \
        --tab-size 2 \
+       --unsupported-app-usage-file ${UNSUPPORTED_APP_USAGE_FILE} \
+       --default-constructors ${DEFAULT_CONSTRUCTORS_FILE} \
 
 }
 
diff --git a/srcgen/unsupported-app-usage.json b/srcgen/unsupported-app-usage.json
new file mode 100644
index 0000000..00d2be5
--- /dev/null
+++ b/srcgen/unsupported-app-usage.json
@@ -0,0 +1,211 @@
+// See com.google.currysrc.aosp.Annotations.addUnsupportedAppUsage(Path) method for details on the
+// syntax.
+[
+  {
+    "@location": "method:com.android.okhttp.Connection#getSocket()"
+  },
+  {
+    "@location": "field:com.android.okhttp.ConnectionPool#connections"
+  },
+  {
+    "@location": "field:com.android.okhttp.ConnectionPool#keepAliveDurationNs"
+  },
+  {
+    "@location": "field:com.android.okhttp.ConnectionPool#maxIdleConnections"
+  },
+  {
+    "@location": "field:com.android.okhttp.ConnectionPool#systemDefault"
+  },
+  {
+    "@location": "method:com.android.okhttp.HttpUrl$Builder#build()"
+  },
+  {
+    "@location": "method:com.android.okhttp.HttpUrl#encodedPath()"
+  },
+  {
+    "@location": "method:com.android.okhttp.HttpUrl#newBuilder()"
+  },
+  {
+    "@location": "method:com.android.okhttp.HttpUrl#parse(String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.HttpUrl#query()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HeaderParser#skipUntil(String,int,String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HeaderParser#skipWhitespace(String,int)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpDate#format(Date)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpDate#parse(String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#getConnection()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#hasResponse()"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.http.HttpEngine#httpStream"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#networkRequest(Request)"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.http.HttpEngine#networkRequest"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.http.HttpEngine#priorResponse"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#readResponse()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#sendRequest()"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.http.HttpEngine#sentRequestMillis"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.http.HttpEngine#userResponse"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.HttpEngine#writingRequestHeaders()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.http.RouteSelector#hasNext()"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.huc.HttpsURLConnectionImpl#delegate"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.huc.HttpURLConnectionImpl#client"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.huc.HttpURLConnectionImpl#httpEngine"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#Internal()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#addLenient(Headers.Builder,String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#addLenient(Headers.Builder,String,String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#apply(ConnectionSpec,SSLSocket,boolean)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#callEngineGetStreamAllocation(Call)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#callEnqueue(Call,Callback,boolean)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#connectionBecameIdle(ConnectionPool,RealConnection)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#get(ConnectionPool,Address,StreamAllocation)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#getHttpUrlChecked(String)"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.Internal#instance"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#internalCache(OkHttpClient)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#put(ConnectionPool,RealConnection)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#routeDatabase(ConnectionPool)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Internal#setCache(OkHttpClient,InternalCache)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Platform#get()"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Platform#logW(String)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Util#closeAll(Closeable,Closeable)"
+  },
+  {
+    "@location": "method:com.android.okhttp.internal.Util#closeQuietly(Closeable)"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.Util#EMPTY_BYTE_ARRAY"
+  },
+  {
+    "@location": "field:com.android.okhttp.internal.Util#UTF_8"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#OkHttpClient()"
+  },
+  {
+    "@location": "field:com.android.okhttp.OkHttpClient#connectionPool"
+  },
+  {
+    "@location": "field:com.android.okhttp.OkHttpClient#DEFAULT_PROTOCOLS"
+  },
+  {
+    "@location": "field:com.android.okhttp.OkHttpClient#dns"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getConnectionPool()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getCookieHandler()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getHostnameVerifier()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getProxy()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getProxySelector()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#getSslSocketFactory()"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#setProtocols(List<Protocol>)"
+  },
+  {
+    "@location": "method:com.android.okhttp.OkHttpClient#setRetryOnConnectionFailure(boolean)"
+  },
+  {
+    "@location": "field:com.android.okhttp.Request#headers"
+  },
+  {
+    "@location": "field:com.android.okhttp.Request#method"
+  },
+  {
+    "@location": "field:com.android.okhttp.Request#url"
+  },
+  {
+    "@location": "field:com.android.okhttp.Response#code"
+  },
+  {
+    "@location": "field:com.android.okhttp.Response#headers"
+  },
+  {
+    "@location": "field:com.android.okhttp.Response#message"
+  },
+  {
+    "@location": "field:com.android.okhttp.Response#networkResponse"
+  },
+  {
+    "@location": "field:com.android.okhttp.Response#protocol"
+  }
+]