1 files changed, 25 insertions, 8 deletions
diff --git a/android/src/main/java/com/android/okhttp/internalandroidapi/HasCacheHolder.java b/android/src/main/java/com/android/okhttp/internalandroidapi/HasCacheHolder.java
index e990af4..6341b5f 100644
--- a/android/src/main/java/com/android/okhttp/internalandroidapi/HasCacheHolder.java
+++ b/android/src/main/java/com/android/okhttp/internalandroidapi/HasCacheHolder.java
@@ -16,6 +16,12 @@
 
 package com.android.okhttp.internalandroidapi;
 
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+
+import android.annotation.SystemApi;
+
+import libcore.util.NonNull;
+
 import com.squareup.okhttp.Cache;
 
 import java.io.File;
@@ -24,21 +30,26 @@ import java.io.File;
  * An interface used to indicate a class can return a {@link CacheHolder} object.
  * @hide
  */
-@libcore.api.CorePlatformApi
+@SystemApi(client = MODULE_LIBRARIES)
+@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
 public interface HasCacheHolder {
 
     /**
      * Returns the {@link CacheHolder} object.
+     *
+     * @hide
      */
-    @libcore.api.CorePlatformApi
-    CacheHolder getCacheHolder();
+    @SystemApi(client = MODULE_LIBRARIES)
+    @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
+    @NonNull CacheHolder getCacheHolder();
 
     /**
      * A holder for an OkHttp internal Cache object. This class exists as an opaque layer over
      * OkHttp internal classes.
      * @hide
      */
-    @libcore.api.CorePlatformApi
+    @SystemApi(client = MODULE_LIBRARIES)
+    @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
     final class CacheHolder {
 
         private final Cache okHttpCache;
@@ -68,9 +79,12 @@ public interface HasCacheHolder {
          *
          * @param directory a writable directory
          * @param maxSizeBytes the maximum number of bytes this cache should use to store
+         *
+         * @hide
          */
-        @libcore.api.CorePlatformApi
-        public static CacheHolder create(File directory, long maxSizeBytes) {
+        @SystemApi(client = MODULE_LIBRARIES)
+        @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
+        public static @NonNull CacheHolder create(@NonNull File directory, long maxSizeBytes) {
             Cache cache = new Cache(directory, maxSizeBytes);
             return new CacheHolder(cache);
         }
@@ -78,9 +92,12 @@ public interface HasCacheHolder {
         /**
          * Returns true if the arguments supplied would result in an equivalent cache to this one
          * being created if they were passed to {@link #create(File, long)}.
+         *
+         * @hide
          */
-        @libcore.api.CorePlatformApi
-        public boolean isEquivalent(File directory, long maxSizeBytes) {
+        @SystemApi(client = MODULE_LIBRARIES)
+        @libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
+        public boolean isEquivalent(@NonNull File directory, long maxSizeBytes) {
             return (okHttpCache.getDirectory().equals(directory)
                     && okHttpCache.getMaxSize() == maxSizeBytes
                     && !okHttpCache.isClosed());