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

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

Merge "Add @UnsupportedAppUsage annotations" 

am: 3683071f

Change-Id: I694c02ed61470d771789eccd32b999494403482c
parents 198936ce 3683071f

config/hiddenapi-light-greylist.txt

+0 −47
Original line number Diff line number Diff line
@@ -1772,56 +1772,9 @@ Landroid/content/UndoOperation;-><init>(Landroid/content/UndoOwner;)V 
Landroid/content/UndoOperation;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V

Landroid/content/UriMatcher;->mChildren:Ljava/util/ArrayList;

Landroid/content/UriMatcher;->mText:Ljava/lang/String;

Landroid/database/AbstractCursor;->mExtras:Landroid/os/Bundle;

Landroid/database/AbstractCursor;->mNotifyUri:Landroid/net/Uri;

Landroid/database/AbstractWindowedCursor;->clearOrCreateWindow(Ljava/lang/String;)V

Landroid/database/AbstractWindowedCursor;->closeWindow()V

Landroid/database/AbstractWindowedCursor;->onDeactivateOrClose()V

Landroid/database/ContentObserver;->releaseContentObserver()Landroid/database/IContentObserver;

Landroid/database/CursorWindow;->mWindowPtr:J

Landroid/database/CursorWindow;->printStats()Ljava/lang/String;

Landroid/database/CursorWindow;->sCursorWindowSize:I

Landroid/database/CursorWindow;->sWindowToPidMap:Landroid/util/LongSparseArray;

Landroid/database/CursorWrapper;->mCursor:Landroid/database/Cursor;

Landroid/database/DatabaseUtils;->cursorPickFillWindowStartPosition(II)I

Landroid/database/DatabaseUtils;->getTypeOfObject(Ljava/lang/Object;)I

Landroid/database/IContentObserver$Stub;-><init>()V

Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver;

Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V

Landroid/database/MatrixCursor;->data:[Ljava/lang/Object;

Landroid/database/MatrixCursor;->get(I)Ljava/lang/Object;

Landroid/database/MatrixCursor;->rowCount:I

Landroid/database/sqlite/DatabaseObjectNotClosedException;-><init>()V

Landroid/database/sqlite/SQLiteClosable;->mReferenceCount:I

Landroid/database/sqlite/SQLiteCursor;->fillWindow(I)V

Landroid/database/sqlite/SQLiteCursor;->mEditTable:Ljava/lang/String;

Landroid/database/sqlite/SQLiteCursor;->mQuery:Landroid/database/sqlite/SQLiteQuery;

Landroid/database/sqlite/SQLiteCustomFunction;->dispatchCallback([Ljava/lang/String;)V

Landroid/database/sqlite/SQLiteCustomFunction;->name:Ljava/lang/String;

Landroid/database/sqlite/SQLiteCustomFunction;->numArgs:I

Landroid/database/sqlite/SQLiteDatabase;->beginTransaction(Landroid/database/sqlite/SQLiteTransactionListener;Z)V

Landroid/database/sqlite/SQLiteDatabase;->collectDbStats(Ljava/util/ArrayList;)V

Landroid/database/sqlite/SQLiteDatabase;->CONFLICT_VALUES:[Ljava/lang/String;

Landroid/database/sqlite/SQLiteDatabase;->getActiveDatabases()Ljava/util/ArrayList;

Landroid/database/sqlite/SQLiteDatabase;->getThreadSession()Landroid/database/sqlite/SQLiteSession;

Landroid/database/sqlite/SQLiteDatabase;->mConfigurationLocked:Landroid/database/sqlite/SQLiteDatabaseConfiguration;

Landroid/database/sqlite/SQLiteDatabase;->mConnectionPoolLocked:Landroid/database/sqlite/SQLiteConnectionPool;

Landroid/database/sqlite/SQLiteDatabase;->mThreadSession:Ljava/lang/ThreadLocal;

Landroid/database/sqlite/SQLiteDatabase;->openDatabase(Ljava/lang/String;Landroid/database/sqlite/SQLiteDatabase$OpenParams;)Landroid/database/sqlite/SQLiteDatabase;

Landroid/database/sqlite/SQLiteDatabase;->reopenReadWrite()V

Landroid/database/sqlite/SQLiteDatabaseConfiguration;->maxSqlCacheSize:I

Landroid/database/sqlite/SQLiteOpenHelper;->mName:Ljava/lang/String;

Landroid/database/sqlite/SQLiteProgram;->mBindArgs:[Ljava/lang/Object;

Landroid/database/sqlite/SQLiteProgram;->mSql:Ljava/lang/String;

Landroid/database/sqlite/SQLiteQueryBuilder;->computeProjection([Ljava/lang/String;)[Ljava/lang/String;

Landroid/database/sqlite/SQLiteQueryBuilder;->mDistinct:Z

Landroid/database/sqlite/SQLiteQueryBuilder;->mTables:Ljava/lang/String;

Landroid/database/sqlite/SQLiteQueryBuilder;->mWhereClause:Ljava/lang/StringBuilder;

Landroid/database/sqlite/SQLiteSession;->beginTransaction(ILandroid/database/sqlite/SQLiteTransactionListener;ILandroid/os/CancellationSignal;)V

Landroid/database/sqlite/SQLiteStatement;-><init>(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V

Landroid/database/sqlite/SqliteWrapper;->checkSQLiteException(Landroid/content/Context;Landroid/database/sqlite/SQLiteException;)V

Landroid/database/sqlite/SqliteWrapper;->delete(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I

Landroid/database/sqlite/SqliteWrapper;->update(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I

Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V

Landroid/graphics/FontFamily;->mNativePtr:J

Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig;

config/hiddenapi-vendor-list.txt

+0 −2
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ Landroid/content/pm/IPackageManager;->getApplicationInfo(Ljava/lang/String;II)La 
Landroid/content/pm/IPackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName;

Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;

Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V

Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;

Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;

Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V

Landroid/location/IGeocodeProvider;->getFromLocation(DDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;

Landroid/location/IGeocodeProvider;->getFromLocationName(Ljava/lang/String;DDDDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;

core/java/android/database/AbstractCursor.java

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


package android.database;



import android.annotation.UnsupportedAppUsage;

import android.content.ContentResolver;

import android.net.Uri;

import android.os.Bundle;
@@ -68,6 +69,7 @@ public abstract class AbstractCursor implements CrossProcessCursor { 
    @Deprecated

    protected ContentResolver mContentResolver;



    @UnsupportedAppUsage

    private Uri mNotifyUri;



    private final Object mSelfObserverLock = new Object();
@@ -77,6 +79,7 @@ public abstract class AbstractCursor implements CrossProcessCursor { 
    private final DataSetObservable mDataSetObservable = new DataSetObservable();

    private final ContentObservable mContentObservable = new ContentObservable();



    @UnsupportedAppUsage

    private Bundle mExtras = Bundle.EMPTY;



    /* -------------------------------------------------------- */

core/java/android/database/AbstractWindowedCursor.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.database;



import android.annotation.UnsupportedAppUsage;



/**

 * A base class for Cursors that store their data in {@link CursorWindow}s.

 * <p>
@@ -179,6 +181,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { 
     * Closes the cursor window and sets {@link #mWindow} to null.

     * @hide

     */

    @UnsupportedAppUsage

    protected void closeWindow() {

        if (mWindow != null) {

            mWindow.close();
@@ -193,6 +196,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { 
     * @param name The window name.

     * @hide

     */

    @UnsupportedAppUsage

    protected void clearOrCreateWindow(String name) {

        if (mWindow == null) {

            mWindow = new CursorWindow(name);
@@ -203,6 +207,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { 


    /** @hide */

    @Override

    @UnsupportedAppUsage

    protected void onDeactivateOrClose() {

        super.onDeactivateOrClose();

        closeWindow();

core/java/android/database/ContentObserver.java

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


package android.database;



import android.annotation.UnsupportedAppUsage;

import android.net.Uri;

import android.os.Handler;

import android.os.UserHandle;
@@ -59,6 +60,7 @@ public abstract class ContentObserver { 
     *

     * {@hide}

     */

    @UnsupportedAppUsage

    public IContentObserver releaseContentObserver() {

        synchronized (mLock) {

            final Transport oldTransport = mTransport;