Remove deprecated, hidden versions of changed public APIs.

These versions were kept around to facilitate dogfooder transition
during the API council review process. Our dogfooders' apps have updated
to versions that use the finalized sdk, so these are no longer required.

Bug: 181887768
Test: Presubmit
Test: Flash device, run jetpack platform backend tests
Change-Id: I4852b1ecc25254ffb781926ca799d0c8128339ab

10 files changed, 4 insertions, 535 deletions

diff --git a/apex/appsearch/framework/Android.bp b/apex/appsearch/framework/Android.bp
index cd9be9bb8be7..8964668abf72 100644
--- a/apex/appsearch/framework/Android.bp
+++ b/apex/appsearch/framework/Android.bp
@@ -57,12 +57,8 @@ java_sdk_library {
         // This list must be kept in sync with jarjar.txt
         "modules-utils-preconditions",
     ],
-    libs: ["unsupportedappusage"], // TODO(b/181887768) should be removed
     defaults: ["framework-module-defaults"],
     permitted_packages: ["android.app.appsearch"],
-    aidl: {
-        include_dirs: ["frameworks/base/core/java"], // TODO(b/146218515) should be removed
-    },
     jarjar_rules: "jarjar-rules.txt",
     apex_available: ["com.android.appsearch"],
     impl_library_visibility: [
diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java b/apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java
index b5e366255180..82b6d62e0758 100644
--- a/apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java
+++ b/apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java
@@ -25,7 +25,6 @@ import android.app.appsearch.aidl.IAppSearchManager;
 import android.app.appsearch.aidl.IAppSearchResultCallback;
 import android.app.appsearch.exceptions.AppSearchException;
 import android.app.appsearch.util.SchemaMigrationUtil;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -309,19 +308,6 @@ public final class AppSearchSession implements Closeable {
     }
 
     /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @UnsupportedAppUsage
-    public void getByUri(
-            @NonNull GetByUriRequest request,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull BatchResultCallback<String, GenericDocument> callback) {
-        getByDocumentId(request.toGetByDocumentIdRequest(), executor, callback);
-    }
-
-    /**
      * Gets {@link GenericDocument} objects by document IDs in a namespace from the {@link
      * AppSearchSession} database.
      *
@@ -521,19 +507,6 @@ public final class AppSearchSession implements Closeable {
     }
 
     /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @UnsupportedAppUsage
-    public void remove(
-            @NonNull RemoveByUriRequest request,
-            @NonNull @CallbackExecutor Executor executor,
-            @NonNull BatchResultCallback<String, Void> callback) {
-        remove(request.toRemoveByDocumentIdRequest(), executor, callback);
-    }
-
-    /**
      * Removes {@link GenericDocument} objects by document IDs in a namespace from the {@link
      * AppSearchSession} database.
      *
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java
index 0ee5e65ef775..2e04d71e56b2 100644
--- a/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java
+++ b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java
@@ -22,7 +22,6 @@ import android.annotation.Nullable;
 import android.app.appsearch.exceptions.IllegalSchemaException;
 import android.app.appsearch.util.BundleUtil;
 import android.app.appsearch.util.IndentingStringBuilder;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Bundle;
 import android.util.ArraySet;
 
@@ -643,60 +642,8 @@ public final class AppSearchSchema {
         }
     }
 
-    /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    public static class Int64PropertyConfig extends PropertyConfig {
-        @UnsupportedAppUsage
-        Int64PropertyConfig(@NonNull Bundle bundle) {
-            super(bundle);
-        }
-
-        /** Builder for {@link Int64PropertyConfig}. */
-        public static final class Builder {
-            private final String mPropertyName;
-            private @Cardinality int mCardinality = CARDINALITY_OPTIONAL;
-
-            /** Creates a new {@link Int64PropertyConfig.Builder}. */
-            @UnsupportedAppUsage
-            public Builder(@NonNull String propertyName) {
-                mPropertyName = Objects.requireNonNull(propertyName);
-            }
-
-            /**
-             * The cardinality of the property (whether it is optional, required or repeated).
-             *
-             * <p>If this method is not called, the default cardinality is {@link
-             * PropertyConfig#CARDINALITY_OPTIONAL}.
-             */
-            @SuppressWarnings("MissingGetterMatchingBuilder") // getter defined in superclass
-            @NonNull
-            @UnsupportedAppUsage
-            public Int64PropertyConfig.Builder setCardinality(@Cardinality int cardinality) {
-                Preconditions.checkArgumentInRange(
-                        cardinality, CARDINALITY_REPEATED, CARDINALITY_REQUIRED, "cardinality");
-                mCardinality = cardinality;
-                return this;
-            }
-
-            /** Constructs a new {@link Int64PropertyConfig} from the contents of this builder. */
-            @NonNull
-            @UnsupportedAppUsage
-            public Int64PropertyConfig build() {
-                Bundle bundle = new Bundle();
-                bundle.putString(NAME_FIELD, mPropertyName);
-                bundle.putInt(DATA_TYPE_FIELD, DATA_TYPE_LONG);
-                bundle.putInt(CARDINALITY_FIELD, mCardinality);
-                return new Int64PropertyConfig(bundle);
-            }
-        }
-    }
-
     /** Configuration for a property containing a 64-bit integer. */
-    // TODO(b/181887768): This should extend directly from PropertyConfig
-    public static final class LongPropertyConfig extends Int64PropertyConfig {
+    public static final class LongPropertyConfig extends PropertyConfig {
         LongPropertyConfig(@NonNull Bundle bundle) {
             super(bundle);
         }
@@ -896,8 +843,7 @@ public final class AppSearchSchema {
         /** Builder for {@link DocumentPropertyConfig}. */
         public static final class Builder {
             private final String mPropertyName;
-            // TODO(b/181887768): This should be final
-            private String mSchemaType;
+            private final String mSchemaType;
             private @Cardinality int mCardinality = CARDINALITY_OPTIONAL;
             private boolean mShouldIndexNestedProperties = false;
 
@@ -916,29 +862,6 @@ public final class AppSearchSchema {
             }
 
             /**
-             * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-             * @hide
-             */
-            @Deprecated
-            @UnsupportedAppUsage
-            public Builder(@NonNull String propertyName) {
-                mPropertyName = Objects.requireNonNull(propertyName);
-                mSchemaType = null;
-            }
-
-            /**
-             * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-             * @hide
-             */
-            @Deprecated
-            @UnsupportedAppUsage
-            @NonNull
-            public Builder setSchemaType(@NonNull String schemaType) {
-                mSchemaType = Objects.requireNonNull(schemaType);
-                return this;
-            }
-
-            /**
              * The cardinality of the property (whether it is optional, required or repeated).
              *
              * <p>If this method is not called, the default cardinality is {@link
@@ -967,18 +890,6 @@ public final class AppSearchSchema {
                 return this;
             }
 
-            /**
-             * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-             * @hide
-             */
-            @Deprecated
-            @UnsupportedAppUsage
-            @NonNull
-            public DocumentPropertyConfig.Builder setIndexNestedProperties(
-                    boolean indexNestedProperties) {
-                return setShouldIndexNestedProperties(indexNestedProperties);
-            }
-
             /** Constructs a new {@link PropertyConfig} from the contents of this builder. */
             @NonNull
             public DocumentPropertyConfig build() {
@@ -987,9 +898,7 @@ public final class AppSearchSchema {
                 bundle.putInt(DATA_TYPE_FIELD, DATA_TYPE_DOCUMENT);
                 bundle.putInt(CARDINALITY_FIELD, mCardinality);
                 bundle.putBoolean(INDEX_NESTED_PROPERTIES_FIELD, mShouldIndexNestedProperties);
-                // TODO(b/181887768): Remove checkNotNull after the deprecated constructor (which
-                //  is the only way to get null here) is removed
-                bundle.putString(SCHEMA_TYPE_FIELD, Objects.requireNonNull(mSchemaType));
+                bundle.putString(SCHEMA_TYPE_FIELD, mSchemaType);
                 return new DocumentPropertyConfig(bundle);
             }
         }
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java b/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java
index c905f95fe4c4..963858b274d7 100644
--- a/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java
+++ b/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java
@@ -23,7 +23,6 @@ import android.annotation.Nullable;
 import android.annotation.SuppressLint;
 import android.app.appsearch.util.BundleUtil;
 import android.app.appsearch.util.IndentingStringBuilder;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
@@ -134,17 +133,6 @@ public class GenericDocument {
         return mBundle;
     }
 
-    /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @UnsupportedAppUsage
-    @NonNull
-    public String getUri() {
-        return getId();
-    }
-
     /** Returns the unique identifier of the {@link GenericDocument}. */
     @NonNull
     public String getId() {
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java
deleted file mode 100644
index 7b05eac43070..000000000000
--- a/apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-
-package android.app.appsearch;
-
-import android.annotation.NonNull;
-import android.compat.annotation.UnsupportedAppUsage;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-
-import com.android.internal.util.Preconditions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
- * @hide
- */
-@Deprecated
-public final class GetByUriRequest {
-    /**
-     * Schema type to be used in {@link GetByUriRequest.Builder#addProjection} to apply property
-     * paths to all results, excepting any types that have had their own, specific property paths
-     * set.
-     */
-    public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";
-
-    private final String mNamespace;
-    private final Set<String> mIds;
-    private final Map<String, List<String>> mTypePropertyPathsMap;
-
-    GetByUriRequest(
-            @NonNull String namespace,
-            @NonNull Set<String> ids,
-            @NonNull Map<String, List<String>> typePropertyPathsMap) {
-        mNamespace = Objects.requireNonNull(namespace);
-        mIds = Objects.requireNonNull(ids);
-        mTypePropertyPathsMap = Objects.requireNonNull(typePropertyPathsMap);
-    }
-
-    /** Returns the namespace attached to the request. */
-    @NonNull
-    public String getNamespace() {
-        return mNamespace;
-    }
-
-    /** Returns the set of document IDs attached to the request. */
-    @NonNull
-    public Set<String> getUris() {
-        return Collections.unmodifiableSet(mIds);
-    }
-
-    /**
-     * Returns a map from schema type to property paths to be used for projection.
-     *
-     * <p>If the map is empty, then all properties will be retrieved for all results.
-     *
-     * <p>Calling this function repeatedly is inefficient. Prefer to retain the Map returned by this
-     * function, rather than calling it multiple times.
-     */
-    @NonNull
-    public Map<String, List<String>> getProjections() {
-        Map<String, List<String>> copy = new ArrayMap<>();
-        for (Map.Entry<String, List<String>> entry : mTypePropertyPathsMap.entrySet()) {
-            copy.put(entry.getKey(), new ArrayList<>(entry.getValue()));
-        }
-        return copy;
-    }
-
-    /**
-     * Returns a map from schema type to property paths to be used for projection.
-     *
-     * <p>If the map is empty, then all properties will be retrieved for all results.
-     *
-     * <p>A more efficient version of {@link #getProjections}, but it returns a modifiable map. This
-     * is not meant to be unhidden and should only be used by internal classes.
-     *
-     * @hide
-     */
-    @NonNull
-    public Map<String, List<String>> getProjectionsInternal() {
-        return mTypePropertyPathsMap;
-    }
-
-    /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @NonNull
-    public GetByDocumentIdRequest toGetByDocumentIdRequest() {
-        GetByDocumentIdRequest.Builder builder =
-                new GetByDocumentIdRequest.Builder(mNamespace).addIds(mIds);
-        for (Map.Entry<String, List<String>> projection : mTypePropertyPathsMap.entrySet()) {
-            builder.addProjection(projection.getKey(), projection.getValue());
-        }
-        return builder.build();
-    }
-
-    /**
-     * Builder for {@link GetByUriRequest} objects.
-     *
-     * <p>Once {@link #build} is called, the instance can no longer be used.
-     */
-    public static final class Builder {
-        private final String mNamespace;
-        private final Set<String> mIds = new ArraySet<>();
-        private final Map<String, List<String>> mProjectionTypePropertyPaths = new ArrayMap<>();
-        private boolean mBuilt = false;
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        public Builder(@NonNull String namespace) {
-            mNamespace = Objects.requireNonNull(namespace);
-        }
-
-        /**
-         * Adds one or more document IDs to the request.
-         *
-         * @throws IllegalStateException if the builder has already been used.
-         */
-        @NonNull
-        public Builder addUris(@NonNull String... ids) {
-            Objects.requireNonNull(ids);
-            return addUris(Arrays.asList(ids));
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public Builder addUris(@NonNull Collection<String> ids) {
-            Preconditions.checkState(!mBuilt, "Builder has already been used");
-            Objects.requireNonNull(ids);
-            mIds.addAll(ids);
-            return this;
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public Builder addProjection(
-                @NonNull String schemaType, @NonNull Collection<String> propertyPaths) {
-            Preconditions.checkState(!mBuilt, "Builder has already been used");
-            Objects.requireNonNull(schemaType);
-            Objects.requireNonNull(propertyPaths);
-            List<String> propertyPathsList = new ArrayList<>(propertyPaths.size());
-            for (String propertyPath : propertyPaths) {
-                Objects.requireNonNull(propertyPath);
-                propertyPathsList.add(propertyPath);
-            }
-            mProjectionTypePropertyPaths.put(schemaType, propertyPathsList);
-            return this;
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public GetByUriRequest build() {
-            Preconditions.checkState(!mBuilt, "Builder has already been used");
-            mBuilt = true;
-            return new GetByUriRequest(mNamespace, mIds, mProjectionTypePropertyPaths);
-        }
-    }
-}
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java
deleted file mode 100644
index 9c74966ada58..000000000000
--- a/apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-
-package android.app.appsearch;
-
-import android.annotation.NonNull;
-import android.compat.annotation.UnsupportedAppUsage;
-import android.util.ArraySet;
-
-import com.android.internal.util.Preconditions;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
- * @hide
- */
-@Deprecated
-public final class RemoveByUriRequest {
-    private final String mNamespace;
-    private final Set<String> mIds;
-
-    RemoveByUriRequest(String namespace, Set<String> ids) {
-        mNamespace = namespace;
-        mIds = ids;
-    }
-
-    /** Returns the namespace to remove documents from. */
-    @NonNull
-    public String getNamespace() {
-        return mNamespace;
-    }
-
-    /** Returns the set of document IDs attached to the request. */
-    @NonNull
-    public Set<String> getUris() {
-        return Collections.unmodifiableSet(mIds);
-    }
-
-    /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @NonNull
-    public RemoveByDocumentIdRequest toRemoveByDocumentIdRequest() {
-        return new RemoveByDocumentIdRequest.Builder(mNamespace).addIds(mIds).build();
-    }
-
-    /**
-     * Builder for {@link RemoveByUriRequest} objects.
-     *
-     * <p>Once {@link #build} is called, the instance can no longer be used.
-     */
-    public static final class Builder {
-        private final String mNamespace;
-        private final Set<String> mIds = new ArraySet<>();
-        private boolean mBuilt = false;
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        public Builder(@NonNull String namespace) {
-            mNamespace = Objects.requireNonNull(namespace);
-        }
-
-        /**
-         * Adds one or more document IDs to the request.
-         *
-         * @throws IllegalStateException if the builder has already been used.
-         */
-        @NonNull
-        public Builder addUris(@NonNull String... ids) {
-            Objects.requireNonNull(ids);
-            return addUris(Arrays.asList(ids));
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public Builder addUris(@NonNull Collection<String> ids) {
-            Preconditions.checkState(!mBuilt, "Builder has already been used");
-            Objects.requireNonNull(ids);
-            mIds.addAll(ids);
-            return this;
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public RemoveByUriRequest build() {
-            Preconditions.checkState(!mBuilt, "Builder has already been used");
-            mBuilt = true;
-            return new RemoveByUriRequest(mNamespace, mIds);
-        }
-    }
-}
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/ReportUsageRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/ReportUsageRequest.java
index c388bdebb00d..e807803bae39 100644
--- a/apex/appsearch/framework/java/external/android/app/appsearch/ReportUsageRequest.java
+++ b/apex/appsearch/framework/java/external/android/app/appsearch/ReportUsageRequest.java
@@ -18,7 +18,6 @@ package android.app.appsearch;
 
 import android.annotation.CurrentTimeMillisLong;
 import android.annotation.NonNull;
-import android.compat.annotation.UnsupportedAppUsage;
 
 import java.util.Objects;
 
@@ -67,8 +66,7 @@ public final class ReportUsageRequest {
     /** Builder for {@link ReportUsageRequest} objects. */
     public static final class Builder {
         private final String mNamespace;
-        // TODO(b/181887768): Make this final
-        private String mDocumentId;
+        private final String mDocumentId;
         private Long mUsageTimestampMillis;
 
         /**
@@ -85,40 +83,6 @@ public final class ReportUsageRequest {
         }
 
         /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        public Builder(@NonNull String namespace) {
-            mNamespace = Objects.requireNonNull(namespace);
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public Builder setUri(@NonNull String uri) {
-            mDocumentId = uri;
-            return this;
-        }
-
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public ReportUsageRequest.Builder setUsageTimeMillis(
-                @CurrentTimeMillisLong long usageTimestampMillis) {
-            return setUsageTimestampMillis(usageTimestampMillis);
-        }
-
-        /**
          * Sets the timestamp in milliseconds of the usage report (the time at which the document
          * was used).
          *
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java
index 4beb667ac608..f6a597c51116 100644
--- a/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java
+++ b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java
@@ -18,7 +18,6 @@ package android.app.appsearch;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Bundle;
 
 import com.android.internal.util.Preconditions;
@@ -84,17 +83,6 @@ public final class SearchResult {
     }
 
     /**
-     * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-     * @hide
-     */
-    @Deprecated
-    @UnsupportedAppUsage
-    @NonNull
-    public List<MatchInfo> getMatches() {
-        return getMatchInfos();
-    }
-
-    /**
      * Returns a list of {@link MatchInfo}s providing information about how the document in {@link
      * #getGenericDocument} matched the query.
      *
@@ -196,17 +184,6 @@ public final class SearchResult {
             return this;
         }
 
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public Builder addMatch(@NonNull MatchInfo matchInfo) {
-            return addMatchInfo(matchInfo);
-        }
-
         /** Adds another match to this SearchResult. */
         @NonNull
         public Builder addMatchInfo(@NonNull MatchInfo matchInfo) {
diff --git a/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaResponse.java b/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaResponse.java
index 3e5a2ca246e0..a3a4a23e577b 100644
--- a/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaResponse.java
+++ b/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaResponse.java
@@ -18,7 +18,6 @@ package android.app.appsearch;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Bundle;
 import android.util.ArraySet;
 
@@ -342,17 +341,6 @@ public class SetSchemaResponse {
             return mBundle.getString(NAMESPACE_FIELD, /*defaultValue=*/ "");
         }
 
-        /**
-         * @deprecated TODO(b/181887768): Exists for dogfood transition; must be removed.
-         * @hide
-         */
-        @Deprecated
-        @UnsupportedAppUsage
-        @NonNull
-        public String getUri() {
-            return getDocumentId();
-        }
-
         /** Returns the id of the {@link GenericDocument} that failed to be migrated. */
         @NonNull
         public String getDocumentId() {
diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp
index b101895f82c9..b6521ffff51b 100644
--- a/apex/appsearch/service/Android.bp
+++ b/apex/appsearch/service/Android.bp
@@ -52,7 +52,6 @@ java_library {
     libs: [
         "framework-appsearch.impl",
         "framework-statsd.stubs.module_lib",
-        "unsupportedappusage", // TODO(b/181887768) should be removed
     ],
     defaults: ["framework-system-server-module-defaults"],
     permitted_packages: [