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

Commit b95f9ef8 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations" 

am: 06f2e6b7

Change-Id: I21260b0436ae2a6fb432b752ec9cd35637f9cd68
parents d1299b89 06f2e6b7

config/hiddenapi-light-greylist.txt

+0 −90
Original line number Diff line number Diff line
@@ -4634,97 +4634,7 @@ Landroid/transition/Transition;->getRunningAnimators()Landroid/util/ArrayMap; 
Landroid/transition/TransitionManager;->getRunningTransitions()Landroid/util/ArrayMap;

Landroid/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList;

Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal;

Landroid/util/ArrayMap;->allocArrays(I)V

Landroid/util/ArrayMap;->append(Ljava/lang/Object;Ljava/lang/Object;)V

Landroid/util/ArrayMap;->CACHE_SIZE:I

Landroid/util/ArrayMap;->EMPTY:Landroid/util/ArrayMap;

Landroid/util/ArrayMap;->EMPTY_IMMUTABLE_INTS:[I

Landroid/util/ArrayMap;->freeArrays([I[Ljava/lang/Object;I)V

Landroid/util/ArrayMap;->indexOf(Ljava/lang/Object;I)I

Landroid/util/ArrayMap;->indexOfNull()I

Landroid/util/ArrayMap;->indexOfValue(Ljava/lang/Object;)I

Landroid/util/ArrayMap;->mArray:[Ljava/lang/Object;

Landroid/util/ArrayMap;->mBaseCache:[Ljava/lang/Object;

Landroid/util/ArrayMap;->mBaseCacheSize:I

Landroid/util/ArrayMap;->mHashes:[I

Landroid/util/ArrayMap;->mSize:I

Landroid/util/ArrayMap;->mTwiceBaseCache:[Ljava/lang/Object;

Landroid/util/ArrayMap;->mTwiceBaseCacheSize:I

Landroid/util/ArraySet;-><init>(Ljava/util/Collection;)V

Landroid/util/ArraySet;->allocArrays(I)V

Landroid/util/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V

Landroid/util/ArraySet;->indexOf(Ljava/lang/Object;I)I

Landroid/util/ArraySet;->indexOfNull()I

Landroid/util/ArraySet;->mArray:[Ljava/lang/Object;

Landroid/util/ArraySet;->mHashes:[I

Landroid/util/ArraySet;->mSize:I

Landroid/util/Base64;-><init>()V

Landroid/util/Base64OutputStream;-><init>(Ljava/io/OutputStream;IZ)V

Landroid/util/DebugUtils;->buildShortClassTag(Ljava/lang/Object;Ljava/lang/StringBuilder;)V

Landroid/util/DisplayMetrics;->DENSITY_DEVICE:I

Landroid/util/DisplayMetrics;->noncompatDensityDpi:I

Landroid/util/DisplayMetrics;->noncompatHeightPixels:I

Landroid/util/DisplayMetrics;->noncompatWidthPixels:I

Landroid/util/EventLog$Event;-><init>([B)V

Landroid/util/IconDrawableFactory;->getBadgedIcon(Landroid/content/pm/ApplicationInfo;)Landroid/graphics/drawable/Drawable;

Landroid/util/LocalLog;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V

Landroid/util/Log;->println_native(IILjava/lang/String;Ljava/lang/String;)I

Landroid/util/Log;->wtf(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ZZ)I

Landroid/util/LogWriter;-><init>(ILjava/lang/String;)V

Landroid/util/LongSparseLongArray;->mKeys:[J

Landroid/util/LongSparseLongArray;->mSize:I

Landroid/util/LongSparseLongArray;->mValues:[J

Landroid/util/LruCache;->map:Ljava/util/LinkedHashMap;

Landroid/util/MathUtils;->abs(F)F

Landroid/util/MathUtils;->constrain(FFF)F

Landroid/util/MathUtils;->constrain(III)I

Landroid/util/MathUtils;->lerp(FFF)F

Landroid/util/MathUtils;->max(II)F

Landroid/util/NtpTrustedTime;->currentTimeMillis()J

Landroid/util/NtpTrustedTime;->forceRefresh()Z

Landroid/util/NtpTrustedTime;->getCachedNtpTime()J

Landroid/util/NtpTrustedTime;->getCachedNtpTimeReference()J

Landroid/util/NtpTrustedTime;->getInstance(Landroid/content/Context;)Landroid/util/NtpTrustedTime;

Landroid/util/NtpTrustedTime;->hasCache()Z

Landroid/util/PathParser;->createPathFromPathData(Ljava/lang/String;)Landroid/graphics/Path;

Landroid/util/Pools$Pool;->acquire()Ljava/lang/Object;

Landroid/util/Pools$Pool;->release(Ljava/lang/Object;)Z

Landroid/util/Pools$SimplePool;-><init>(I)V

Landroid/util/Pools$SimplePool;->acquire()Ljava/lang/Object;

Landroid/util/Pools$SimplePool;->mPool:[Ljava/lang/Object;

Landroid/util/Pools$SimplePool;->release(Ljava/lang/Object;)Z

Landroid/util/Pools$SynchronizedPool;-><init>(I)V

Landroid/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;

Landroid/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z

Landroid/util/Rational;->mDenominator:I

Landroid/util/Rational;->mNumerator:I

Landroid/util/Singleton;-><init>()V

Landroid/util/Singleton;->get()Ljava/lang/Object;

Landroid/util/Singleton;->mInstance:Ljava/lang/Object;

Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I

Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->v(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I

Landroid/util/Slog;->wtf(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I

Landroid/util/Slog;->wtfStack(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/SparseArray;->mKeys:[I

Landroid/util/SparseArray;->mSize:I

Landroid/util/SparseArray;->mValues:[Ljava/lang/Object;

Landroid/util/SparseBooleanArray;->mKeys:[I

Landroid/util/SparseBooleanArray;->mSize:I

Landroid/util/SparseBooleanArray;->mValues:[Z

Landroid/util/SparseIntArray;->mKeys:[I

Landroid/util/SparseIntArray;->mSize:I

Landroid/util/SparseIntArray;->mValues:[I

Landroid/util/TimeUtils;->formatDuration(JLjava/io/PrintWriter;)V

Landroid/util/TimeUtils;->formatDuration(JLjava/io/PrintWriter;I)V

Landroid/util/TimeUtils;->logTimeOfDay(J)Ljava/lang/String;

Landroid/util/TrustedTime;->currentTimeMillis()J

Landroid/util/TrustedTime;->forceRefresh()Z

Landroid/util/TrustedTime;->getCacheAge()J

Landroid/util/TrustedTime;->hasCache()Z

Landroid/view/accessibility/AccessibilityEvent;->mAction:I

Landroid/view/accessibility/AccessibilityEvent;->mEventType:I

Landroid/view/accessibility/AccessibilityInteractionClient;->clearCache()V

config/hiddenapi-vendor-list.txt

+0 −16
Original line number Diff line number Diff line
@@ -475,22 +475,6 @@ Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z 
Landroid/telephony/TelephonyManager;->putIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;II)Z

Landroid/telephony/TelephonyManager;->setPreferredNetworkType(II)Z

Landroid/text/TextUtils;->isPrintableAsciiOnly(Ljava/lang/CharSequence;)Z

Landroid/util/IconDrawableFactory;->getBadgedIcon(Landroid/content/pm/PackageItemInfo;Landroid/content/pm/ApplicationInfo;I)Landroid/graphics/drawable/Drawable;

Landroid/util/IconDrawableFactory;->newInstance(Landroid/content/Context;)Landroid/util/IconDrawableFactory;

Landroid/util/LocalLog$ReadOnlyLocalLog;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V

Landroid/util/LocalLog;-><init>(I)V

Landroid/util/LocalLog;->log(Ljava/lang/String;)V

Landroid/util/LocalLog;->readOnlyLocalLog()Landroid/util/LocalLog$ReadOnlyLocalLog;

Landroid/util/LongArray;-><init>()V

Landroid/util/LongArray;->add(IJ)V

Landroid/util/LongArray;->get(I)J

Landroid/util/LongArray;->size()I

Landroid/util/RecurrenceRule;->buildRecurringMonthly(ILjava/time/ZoneId;)Landroid/util/RecurrenceRule;

Landroid/util/RecurrenceRule;->start:Ljava/time/ZonedDateTime;

Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I

Landroid/util/Slog;->println(ILjava/lang/String;Ljava/lang/String;)I

Landroid/util/Slog;->wtf(Ljava/lang/String;Ljava/lang/String;)I

Landroid/view/AppTransitionAnimationSpec;-><init>(ILandroid/graphics/GraphicBuffer;Landroid/graphics/Rect;)V

Landroid/view/BatchedInputEventReceiver;-><init>(Landroid/view/InputChannel;Landroid/os/Looper;Landroid/view/Choreographer;)V

Landroid/view/Choreographer;->getSfInstance()Landroid/view/Choreographer;

core/java/android/util/ArrayMap.java

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.util; 


import libcore.util.EmptyArray;



import android.annotation.UnsupportedAppUsage;

import java.util.Collection;

import java.util.ConcurrentModificationException;

import java.util.Map;
@@ -70,16 +71,19 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
    /**

     * Maximum number of entries to have in array caches.

     */

    @UnsupportedAppUsage

    private static final int CACHE_SIZE = 10;



    /**

     * Special hash array value that indicates the container is immutable.

     */

    @UnsupportedAppUsage

    static final int[] EMPTY_IMMUTABLE_INTS = new int[0];



    /**

     * @hide Special immutable empty ArrayMap.

     */

    @UnsupportedAppUsage

    public static final ArrayMap EMPTY = new ArrayMap<>(-1);



    /**
@@ -88,14 +92,21 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
     * The first entry in the array is a pointer to the next array in the

     * list; the second entry is a pointer to the int[] hash code array for it.

     */

    @UnsupportedAppUsage

    static Object[] mBaseCache;

    @UnsupportedAppUsage

    static int mBaseCacheSize;

    @UnsupportedAppUsage

    static Object[] mTwiceBaseCache;

    @UnsupportedAppUsage

    static int mTwiceBaseCacheSize;



    final boolean mIdentityHashCode;

    @UnsupportedAppUsage

    int[] mHashes;

    @UnsupportedAppUsage

    Object[] mArray;

    @UnsupportedAppUsage

    int mSize;

    MapCollections<K, V> mCollections;
@@ -111,6 +122,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
        }

    }



    @UnsupportedAppUsage

    int indexOf(Object key, int hash) {

        final int N = mSize;
@@ -149,6 +161,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
        return ~end;

    }



    @UnsupportedAppUsage

    int indexOfNull() {

        final int N = mSize;
@@ -187,6 +200,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
        return ~end;

    }



    @UnsupportedAppUsage

    private void allocArrays(final int size) {

        if (mHashes == EMPTY_IMMUTABLE_INTS) {

            throw new UnsupportedOperationException("ArrayMap is immutable");
@@ -225,6 +239,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
        mArray = new Object[size<<1];

    }



    @UnsupportedAppUsage

    private static void freeArrays(final int[] hashes, final Object[] array, final int size) {

        if (hashes.length == (BASE_SIZE*2)) {

            synchronized (ArrayMap.class) {
@@ -378,6 +393,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
                : indexOf(key, mIdentityHashCode ? System.identityHashCode(key) : key.hashCode());

    }



    @UnsupportedAppUsage

    int indexOfValue(Object value) {

        final int N = mSize*2;

        final Object[] array = mArray;
@@ -535,6 +551,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { 
     * The array must already be large enough to contain the item.

     * @hide

     */

    @UnsupportedAppUsage

    public void append(K key, V value) {

        int index = mSize;

        final int hash = key == null ? 0

core/java/android/util/ArraySet.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.util; 


import libcore.util.EmptyArray;



import android.annotation.UnsupportedAppUsage;

import java.lang.reflect.Array;

import java.util.Collection;

import java.util.Iterator;
@@ -70,11 +71,15 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { 
    static int sTwiceBaseCacheSize;



    final boolean mIdentityHashCode;

    @UnsupportedAppUsage

    int[] mHashes;

    @UnsupportedAppUsage

    Object[] mArray;

    @UnsupportedAppUsage

    int mSize;

    MapCollections<E, E> mCollections;



    @UnsupportedAppUsage

    private int indexOf(Object key, int hash) {

        final int N = mSize;
@@ -113,6 +118,7 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { 
        return ~end;

    }



    @UnsupportedAppUsage

    private int indexOfNull() {

        final int N = mSize;
@@ -151,6 +157,7 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { 
        return ~end;

    }



    @UnsupportedAppUsage

    private void allocArrays(final int size) {

        if (size == (BASE_SIZE * 2)) {

            synchronized (ArraySet.class) {
@@ -208,6 +215,7 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { 
        mArray = new Object[size];

    }



    @UnsupportedAppUsage

    private static void freeArrays(final int[] hashes, final Object[] array, final int size) {

        if (hashes.length == (BASE_SIZE * 2)) {

            synchronized (ArraySet.class) {
@@ -282,6 +290,7 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { 
    }



    /** {@hide} */

    @UnsupportedAppUsage

    public ArraySet(Collection<E> set) {

        this();

        if (set != null) {

core/java/android/util/Base64.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.util;



import android.annotation.UnsupportedAppUsage;

import java.io.UnsupportedEncodingException;



/**
@@ -737,5 +738,6 @@ public class Base64 { 
        }

    }



    @UnsupportedAppUsage

    private Base64() { }   // don't instantiate

}