Merge "Made ContentCapture's UserDataRemovalRequest getters public."

3 files changed, 8 insertions, 22 deletions

diff --git a/api/current.txt b/api/current.txt
index 8d00440d5e08..fa05e56d483d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -52887,6 +52887,9 @@ package android.view.contentcapture {
 
   public final class UserDataRemovalRequest implements android.os.Parcelable {
     method public int describeContents();
+    method @NonNull public String getPackageName();
+    method @NonNull public java.util.List<android.view.contentcapture.UserDataRemovalRequest.UriRequest> getUriRequests();
+    method public boolean isForEverything();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.view.contentcapture.UserDataRemovalRequest> CREATOR;
   }
@@ -52898,6 +52901,11 @@ package android.view.contentcapture {
     method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder forEverything();
   }
 
+  public final class UserDataRemovalRequest.UriRequest {
+    method @NonNull public android.net.Uri getUri();
+    method @NonNull public boolean isRecursive();
+  }
+
 }
 
 package android.view.inputmethod {
diff --git a/api/system-current.txt b/api/system-current.txt
index 27f730075ab4..19b3f0e6cae2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9404,17 +9404,6 @@ package android.view.contentcapture {
     method public void setContentCaptureFeatureEnabled(boolean);
   }
 
-  public final class UserDataRemovalRequest implements android.os.Parcelable {
-    method @NonNull public String getPackageName();
-    method @NonNull public java.util.List<android.view.contentcapture.UserDataRemovalRequest.UriRequest> getUriRequests();
-    method public boolean isForEverything();
-  }
-
-  public final class UserDataRemovalRequest.UriRequest {
-    method @NonNull public android.net.Uri getUri();
-    method @NonNull public boolean isRecursive();
-  }
-
   public final class ViewNode extends android.app.assist.AssistStructure.ViewNode {
     method @Nullable public android.view.autofill.AutofillId getParentAutofillId();
   }
diff --git a/core/java/android/view/contentcapture/UserDataRemovalRequest.java b/core/java/android/view/contentcapture/UserDataRemovalRequest.java
index 8ee63ef74685..8fedcd54b1fc 100644
--- a/core/java/android/view/contentcapture/UserDataRemovalRequest.java
+++ b/core/java/android/view/contentcapture/UserDataRemovalRequest.java
@@ -16,7 +16,6 @@
 package android.view.contentcapture;
 
 import android.annotation.NonNull;
-import android.annotation.SystemApi;
 import android.app.ActivityThread;
 import android.net.Uri;
 import android.os.Parcel;
@@ -67,9 +66,7 @@ public final class UserDataRemovalRequest implements Parcelable {
 
     /**
      * Gets the name of the app that's making the request.
-     * @hide
      */
-    @SystemApi
     @NonNull
     public String getPackageName() {
         return mPackageName;
@@ -77,20 +74,14 @@ public final class UserDataRemovalRequest implements Parcelable {
 
     /**
      * Checks if app is requesting to remove all user data associated with its package.
-     *
-     * @hide
      */
-    @SystemApi
     public boolean isForEverything() {
         return mForEverything;
     }
 
     /**
      * Gets the list of {@code Uri}s the apps is requesting to remove.
-     *
-     * @hide
      */
-    @SystemApi
     @NonNull
     public List<UriRequest> getUriRequests() {
         return mUriRequests;
@@ -203,9 +194,7 @@ public final class UserDataRemovalRequest implements Parcelable {
 
     /**
      * Representation of a request to remove data associated with an {@link Uri}.
-     * @hide
      */
-    @SystemApi
     public final class UriRequest {
         private final @NonNull Uri mUri;
         private final boolean mRecursive;