Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9127bf6b authored by Grace Cheng's avatar Grace Cheng
Browse files

Use UnsupportedAppUsage to make new PackageTagsList APIs accessible 

Works around a problem caused by ag/34149987 renaming `PackageTagsList`
APIs.

Bug: 429792869
Flag: EXEMPT work around problem caused by renaming PackageTagsList APIs
Test: atest CtsLocationNoneTestCases
Change-Id: I17046734b12e828e9f0bc5623a3aa6d2330d8dd6
parent 41995c9d

core/java/android/os/PackageTagsList.java

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.location.flags.Flags;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -67,6 +68,7 @@ public final class PackageTagsList implements Parcelable { 
     * does not imply anything about whether any given attribution tag under the given package name

     * is present.

     */

    @UnsupportedAppUsage

    public boolean containsPackage(@NonNull String packageName) {

        return mPackageTags.containsKey(packageName);

    }
@@ -78,6 +80,7 @@ public final class PackageTagsList implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public boolean containsTag(@NonNull String attributionTag) {

        final int size = mPackageTags.size();

        for (int i = 0; i < size; i++) {
@@ -94,6 +97,7 @@ public final class PackageTagsList implements Parcelable { 
     * Returns true if all attribution tags under the given package are contained within this

     * instance.

     */

    @UnsupportedAppUsage

    public boolean containsPackageWithAllTags(@NonNull String packageName) {

        Set<String> tags = mPackageTags.get(packageName);

        return tags != null && tags.isEmpty();
@@ -115,6 +119,7 @@ public final class PackageTagsList implements Parcelable { 
    }



    /** Returns true if the given PackageTagsList is a subset of this instance. */

    @UnsupportedAppUsage

    public boolean containsAll(@NonNull PackageTagsList packageTagsList) {

        int otherSize = packageTagsList.mPackageTags.size();

        if (otherSize > mPackageTags.size()) {
@@ -145,6 +150,7 @@ public final class PackageTagsList implements Parcelable { 
    }



    /** Returns all packages that possess at least one attribution tag. */

    @UnsupportedAppUsage

    public @NonNull Set<String> getPackages() {

        return Set.copyOf(mPackageTags.keySet());

    }
@@ -312,6 +318,7 @@ public final class PackageTagsList implements Parcelable { 


        /** Adds the specified {@link PackageTagsList} to the builder. */

        @SuppressLint("MissingGetterMatchingBuilder")

        @UnsupportedAppUsage

        public @NonNull Builder addAll(@NonNull PackageTagsList packageTagsList) {

            return addAll(packageTagsList.mPackageTags);

        }
@@ -321,6 +328,7 @@ public final class PackageTagsList implements Parcelable { 
         * attribution tags is interpreted to imply all attribution tags under that package.

         */

        @SuppressLint("MissingGetterMatchingBuilder")

        @UnsupportedAppUsage

        public @NonNull Builder addAll(@NonNull Map<String, ? extends Set<String>> packageTagsMap) {

            mPackageTags.ensureCapacity(packageTagsMap.size());

            for (Map.Entry<String, ? extends Set<String>> entry : packageTagsMap.entrySet()) {
@@ -393,6 +401,7 @@ public final class PackageTagsList implements Parcelable { 
         * @hide

         */

        @SuppressLint("MissingGetterMatchingBuilder")

        @UnsupportedAppUsage

        public @NonNull Builder removeAll(@NonNull PackageTagsList packageTagsList) {

            return removeAll(packageTagsList.mPackageTags);

        }
@@ -406,6 +415,7 @@ public final class PackageTagsList implements Parcelable { 
         * @hide

         */

        @SuppressLint("MissingGetterMatchingBuilder")

        @UnsupportedAppUsage

        public @NonNull Builder removeAll(

                @NonNull Map<String, ? extends Set<String>> packageTagsMap) {

            for (Map.Entry<String, ? extends Set<String>> entry : packageTagsMap.entrySet()) {