Move auxiliary test storage classes to internal APIs from experimental.

PiperOrigin-RevId: 627866071
android · Apr 25, 2024 · 7844ace · 7844ace
1 parent 3a23fe9
commit 7844ace
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 32 deletions.
diff --git a/services/storage/java/androidx/test/services/storage/BUILD b/services/storage/java/androidx/test/services/storage/BUILD
@@ -44,7 +44,7 @@ java_library(
     name = "test_storage_constants",
     srcs = ["TestStorageConstants.java"],
     deps = [
-        "//annotation",
+        "//opensource/androidx:annotation",
     ],
 )
 

diff --git a/services/storage/java/androidx/test/services/storage/TestStorage.java b/services/storage/java/androidx/test/services/storage/TestStorage.java
@@ -54,6 +54,8 @@
  * <p>Users should ideally not reference this class directly, but rather retrieve the
  * PlatformTestStorage implementation appropriate for their execution environment from {@link
  * androidx.test.platform.io.PlatformTestStorageRegistry}.
+ *
+ * @hide
  */
 @RestrictTo(Scope.LIBRARY_GROUP)
 public final class TestStorage implements PlatformTestStorage {

diff --git a/services/storage/java/androidx/test/services/storage/TestStorageConstants.java b/services/storage/java/androidx/test/services/storage/TestStorageConstants.java
@@ -15,10 +15,15 @@
  */
 package androidx.test.services.storage;
 
-import androidx.test.annotation.ExperimentalTestApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 
-/** Holds constants that are shared between on-device and host-side testing infrastructure. */
-@ExperimentalTestApi
+/**
+ * Holds constants that are shared between on-device and host-side testing infrastructure.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class TestStorageConstants {
 
   /** The parent folder name for all the test related files. */

diff --git a/services/storage/java/androidx/test/services/storage/TestStorageException.java b/services/storage/java/androidx/test/services/storage/TestStorageException.java
@@ -15,10 +15,15 @@
  */
 package androidx.test.services.storage;
 
-import androidx.test.annotation.ExperimentalTestApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 
-/** A RuntimeException thrown out of the test storage service. */
-@ExperimentalTestApi
+/**
+ * A RuntimeException thrown out of the test storage service.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
 public class TestStorageException extends RuntimeException {
 
   public TestStorageException(String message) {

diff --git a/services/storage/java/androidx/test/services/storage/api/current_public.txt b/services/storage/java/androidx/test/services/storage/api/current_public.txt
@@ -1,20 +1 @@
 // Signature format: 3.0
-package androidx.test.services.storage {
-
-  public final class TestStorage implements androidx.test.platform.io.PlatformTestStorage {
-    ctor public TestStorage();
-    ctor public TestStorage(android.content.ContentResolver);
-    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
-    method public String! getInputArg(String);
-    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
-    method public android.net.Uri! getInputFileUri(String);
-    method public android.net.Uri! getOutputFileUri(String);
-    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
-    method public boolean isTestStorageFilePath(String);
-    method public java.io.InputStream! openInputFile(String) throws java.io.FileNotFoundException;
-    method public java.io.OutputStream! openOutputFile(String) throws java.io.FileNotFoundException;
-    method public java.io.OutputStream! openOutputFile(String, boolean) throws java.io.FileNotFoundException;
-  }
-
-}
-
diff --git a/services/storage/java/androidx/test/services/storage/file/BUILD b/services/storage/java/androidx/test/services/storage/file/BUILD
@@ -14,7 +14,7 @@ android_library(
     name = "file",
     srcs = glob(["*.java"]),
     deps = [
-        "//annotation",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
         "//services/storage/java/androidx/test/services/storage:test_storage_constants",
     ],

diff --git a/services/storage/java/androidx/test/services/storage/file/HostedFile.java b/services/storage/java/androidx/test/services/storage/file/HostedFile.java
@@ -22,12 +22,18 @@
 import android.os.UserManager;
 import android.provider.OpenableColumns;
 import android.util.Log;
-import androidx.test.annotation.ExperimentalTestApi;
 import androidx.test.services.storage.TestStorageConstants;
 import java.io.File;
 
-/** Constants to access hosted file data and convenience methods for building Uris. */
-@ExperimentalTestApi
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Constants to access hosted file data and convenience methods for building Uris.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class HostedFile {
 
   private static final String TAG = "HostedFile";

diff --git a/services/storage/java/androidx/test/services/storage/file/PropertyFile.java b/services/storage/java/androidx/test/services/storage/file/PropertyFile.java
@@ -18,14 +18,18 @@
 import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.net.Uri;
-import androidx.test.annotation.ExperimentalTestApi;
 import androidx.test.services.storage.TestStorageConstants;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
 /**
  * Constants to access property file data (holding name/value pairs) and convenience methods for
  * build URIs.
+ *
+ * @hide
  */
-@ExperimentalTestApi
+@RestrictTo(Scope.LIBRARY)
 public final class PropertyFile {
 
   /** Represents columns returned by the property file service. */