Merge "Use new UnsupportedAppUsage annotation." am: 0db3af9fb3 am: d45c94d001

Change-Id: Ic6e2863b20c89080ef9999e1a537f164501041d1

21 files changed, 85 insertions, 77 deletions

diff --git a/android/src/main/java/com/squareup/okhttp/HttpHandler.java b/android/src/main/java/com/squareup/okhttp/HttpHandler.java
index 6b5e268..89fe098 100644
--- a/android/src/main/java/com/squareup/okhttp/HttpHandler.java
+++ b/android/src/main/java/com/squareup/okhttp/HttpHandler.java
@@ -17,9 +17,12 @@
 
 package com.squareup.okhttp;
 
-import com.squareup.okhttp.internal.URLFilter;
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
+
 import libcore.net.NetworkSecurityPolicy;
+
+import com.squareup.okhttp.internal.URLFilter;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.Proxy;
diff --git a/android/src/main/java/com/squareup/okhttp/HttpsHandler.java b/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
index dca2d65..1ee7a9e 100644
--- a/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
+++ b/android/src/main/java/com/squareup/okhttp/HttpsHandler.java
@@ -17,7 +17,8 @@
 
 package com.squareup.okhttp;
 
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
+
 import java.net.Proxy;
 import java.util.Collections;
 import java.util.List;
diff --git a/android/src/main/java/com/squareup/okhttp/internal/Version.java b/android/src/main/java/com/squareup/okhttp/internal/Version.java
index 85ff0da..a402677 100644
--- a/android/src/main/java/com/squareup/okhttp/internal/Version.java
+++ b/android/src/main/java/com/squareup/okhttp/internal/Version.java
@@ -15,7 +15,7 @@
  */
 package com.squareup.okhttp.internal;
 
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 public final class Version {
   @UnsupportedAppUsage
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 ad8cd47..76413a2 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/HttpHandler.java
@@ -18,9 +18,12 @@
 
 package com.android.okhttp;
 
-import com.android.okhttp.internal.URLFilter;
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
+
 import libcore.net.NetworkSecurityPolicy;
+
+import com.android.okhttp.internal.URLFilter;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.Proxy;
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 5c189d1..57fe2af 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/HttpsHandler.java
@@ -18,7 +18,8 @@
 
 package com.android.okhttp;
 
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
+
 import java.net.Proxy;
 import java.util.Collections;
 import java.util.List;
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 e0283f5..a4c0fd6 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
@@ -53,7 +53,7 @@ public class Platform {
     protected Platform() {
     }
 
-    @dalvik.annotation.compat.UnsupportedAppUsage
+    @android.compat.annotation.UnsupportedAppUsage
     public static Platform get() {
         return INSTANCE_HOLDER.get();
     }
@@ -102,7 +102,7 @@ public class Platform {
     private static final OptionalMethod<Socket> SET_ALPN_PROTOCOLS =
             new OptionalMethod<Socket>(null, "setAlpnProtocols", byte[].class );
 
-    @dalvik.annotation.compat.UnsupportedAppUsage
+    @android.compat.annotation.UnsupportedAppUsage
     public void logW(String warning) {
         System.logW(warning);
     }
diff --git a/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java b/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java
index c248941..5eb405b 100644
--- a/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java
+++ b/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java
@@ -16,7 +16,7 @@
  */
 package com.android.okhttp.internal;
 
-import dalvik.annotation.compat.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 /**
  * @hide This class is not part of the Android public SDK API
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 8f1dcab..3d5fd87 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,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   final OkHttpClient client;
 
   private Headers.Builder requestHeaders = new Headers.Builder();
@@ -95,7 +95,7 @@ public class HttpURLConnectionImpl extends HttpURLConnection {
   private long fixedContentLength = -1;
   private int followUpCount;
   protected IOException httpEngineFailure;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 f73a8ce..2378ade 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,7 +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
+  @android.compat.annotation.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 3c19699..be52caf 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Connection.java
@@ -73,7 +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
+  @android.compat.annotation.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 bd4a702..60d6b96 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/ConnectionPool.java
@@ -60,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private static final ConnectionPool systemDefault;
 
   static {
@@ -89,9 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private final int maxIdleConnections;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final long keepAliveDurationNs;
   private Runnable cleanupRunnable = new Runnable() {
     @Override public void run() {
@@ -112,7 +112,7 @@ public final class ConnectionPool {
     }
   };
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 b16928d..38e0264 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/HttpUrl.java
@@ -438,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public String encodedPath() {
     int pathStart = url.indexOf('/', scheme.length() + 3); // "://".length() == 3.
     int pathEnd = delimiterOffset(url, pathStart, url.length(), "?#");
@@ -519,7 +519,7 @@ public final class HttpUrl {
     return result;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public String query() {
     if (queryNamesAndValues == null) return null; // No query.
     StringBuilder result = new StringBuilder();
@@ -590,7 +590,7 @@ public final class HttpUrl {
     return result == Builder.ParseResult.SUCCESS ? builder.build() : null;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public Builder newBuilder() {
     Builder result = new Builder();
     result.scheme = scheme;
@@ -610,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public static HttpUrl parse(String url) {
     Builder builder = new Builder();
     Builder.ParseResult result = builder.parse(null, url);
@@ -919,7 +919,7 @@ public final class HttpUrl {
       return this;
     }
 
-    @dalvik.annotation.compat.UnsupportedAppUsage
+    @android.compat.annotation.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 3f211c0..38a9250 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/OkHttpClient.java
@@ -53,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private static final List<Protocol> DEFAULT_PROTOCOLS = Util.immutableList(
       Protocol.HTTP_2, Protocol.SPDY_3, Protocol.HTTP_1_1);
 
@@ -139,9 +139,9 @@ public class OkHttpClient implements Cloneable {
   private HostnameVerifier hostnameVerifier;
   private CertificatePinner certificatePinner;
   private Authenticator authenticator;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private ConnectionPool connectionPool;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private Dns dns;
   private boolean followSslRedirects = true;
   private boolean followRedirects = true;
@@ -150,7 +150,7 @@ public class OkHttpClient implements Cloneable {
   private int readTimeout = 10_000;
   private int writeTimeout = 10_000;
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public OkHttpClient() {
     routeDatabase = new RouteDatabase();
     dispatcher = new Dispatcher();
@@ -252,7 +252,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public Proxy getProxy() {
     return proxy;
   }
@@ -271,7 +271,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public ProxySelector getProxySelector() {
     return proxySelector;
   }
@@ -288,7 +288,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public CookieHandler getCookieHandler() {
     return cookieHandler;
   }
@@ -355,7 +355,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public SSLSocketFactory getSslSocketFactory() {
     return sslSocketFactory;
   }
@@ -371,7 +371,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public HostnameVerifier getHostnameVerifier() {
     return hostnameVerifier;
   }
@@ -418,7 +418,7 @@ public class OkHttpClient implements Cloneable {
     return this;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public ConnectionPool getConnectionPool() {
     return connectionPool;
   }
@@ -466,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) {
     this.retryOnConnectionFailure = retryOnConnectionFailure;
   }
@@ -523,7 +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
+  @android.compat.annotation.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 72fd072..86279d6 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Request.java
@@ -28,11 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private final HttpUrl url;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final String method;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 a79e29c..f953d79 100644
--- a/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java
+++ b/repackaged/okhttp/src/main/java/com/android/okhttp/Response.java
@@ -37,17 +37,17 @@ import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
  */
 public final class Response {
   private final Request request;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final Protocol protocol;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final int code;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final String message;
   private final Handshake handshake;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final Headers headers;
   private final ResponseBody body;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 57ec483..676bd1a 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,7 +40,7 @@ import javax.net.ssl.SSLSocket;
 public abstract class Internal {
   public static final Logger logger = Logger.getLogger(OkHttpClient.class.getName());
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public Internal() {
   }
 
@@ -49,45 +49,45 @@ public abstract class Internal {
     new OkHttpClient();
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public static Internal instance;
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void addLenient(Headers.Builder builder, String line);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void addLenient(Headers.Builder builder, String name, String value);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void setCache(OkHttpClient client, InternalCache internalCache);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract InternalCache internalCache(OkHttpClient client);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract RealConnection get(
       ConnectionPool pool, Address address, StreamAllocation streamAllocation);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void put(ConnectionPool pool, RealConnection connection);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract boolean connectionBecameIdle(ConnectionPool pool, RealConnection connection);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract RouteDatabase routeDatabase(ConnectionPool connectionPool);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void apply(ConnectionSpec tlsConfiguration, SSLSocket sslSocket,
       boolean isFallback);
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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
+  @android.compat.annotation.UnsupportedAppUsage
   public abstract void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket);
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 8c978f1..9833b64 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,12 +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
+  @android.compat.annotation.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
+  @android.compat.annotation.UnsupportedAppUsage
   public static final Charset UTF_8 = Charset.forName("UTF-8");
 
   private Util() {
@@ -69,7 +69,7 @@ public final class Util {
    * Closes {@code closeable}, ignoring any checked exceptions. Does nothing
    * if {@code closeable} is null.
    */
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public static void closeQuietly(Closeable closeable) {
     if (closeable != null) {
       try {
@@ -117,7 +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
+  @android.compat.annotation.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 84c9019..0eefc26 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,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public static int skipUntil(String input, int pos, String characters) {
     for (; pos < input.length(); pos++) {
       if (characters.indexOf(input.charAt(pos)) != -1) {
@@ -40,7 +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
+  @android.compat.annotation.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 a8fbd60..eba873c 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,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public static Date parse(String value) {
     if (value.length() == 0) {
       return null;
@@ -113,7 +113,7 @@ public final class HttpDate {
   }
 
   /** Returns the string for {@code value}. */
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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 58ce109..c161ee3 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,13 +108,13 @@ public final class HttpEngine {
   final OkHttpClient client;
 
   public final StreamAllocation streamAllocation;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   private final Response priorResponse;
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.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
+  @android.compat.annotation.UnsupportedAppUsage
   long sentRequestMillis = -1;
 
   /**
@@ -142,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private Request networkRequest;
 
   /**
@@ -157,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private Response userResponse;
 
   private Sink requestBodyOut;
@@ -203,7 +203,7 @@ public final class HttpEngine {
    *     {@link #recover(IOException)}.
    *
    */
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public void sendRequest() throws RequestException, RouteException, IOException {
     if (cacheStrategy != null) return; // Already sent.
     if (httpStream != null) throw new IllegalStateException();
@@ -302,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public void writingRequestHeaders() {
     if (sentRequestMillis != -1) throw new IllegalStateException();
     sentRequestMillis = System.currentTimeMillis();
@@ -327,7 +327,7 @@ public final class HttpEngine {
         : null;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public boolean hasResponse() {
     return userResponse != null;
   }
@@ -343,7 +343,7 @@ public final class HttpEngine {
     return userResponse;
   }
 
-  @dalvik.annotation.compat.UnsupportedAppUsage
+  @android.compat.annotation.UnsupportedAppUsage
   public Connection getConnection() {
     return streamAllocation.connection();
   }
@@ -526,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   private Request networkRequest(Request request) throws IOException {
     Request.Builder result = request.newBuilder();
 
@@ -567,7 +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
+  @android.compat.annotation.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 0904341..12b9706 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,7 +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
+  @android.compat.annotation.UnsupportedAppUsage
   public boolean hasNext() {
     return hasNextInetSocketAddress()
         || hasNextProxy()