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

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

Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c am: 582d18c0 

am: 9f0aff0d

Change-Id: I5ad5d586548bb5e94b4b2be7c3ab0e15a062dd3d
parents 354e18dc 9f0aff0d

config/hiddenapi-light-greylist.txt

+0 −4
Original line number Diff line number Diff line
@@ -4523,10 +4523,6 @@ Landroid/preference/VolumePreference$VolumeStore;->originalVolume:I 
Landroid/preference/VolumePreference$VolumeStore;->volume:I

Landroid/preference/VolumePreference;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V

Landroid/preference/VolumePreference;->mStreamType:I

Landroid/print/PrinterId;->getServiceName()Landroid/content/ComponentName;

Landroid/print/PrintJobInfo;->getAdvancedOptions()Landroid/os/Bundle;

Landroid/print/PrintJobInfo;->getDocumentInfo()Landroid/print/PrintDocumentInfo;

Landroid/print/PrintManager;->addPrintJobStateChangeListener(Landroid/print/PrintManager$PrintJobStateChangeListener;)V

Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String;

Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V

Landroid/provider/BrowserContract$Accounts;->CONTENT_URI:Landroid/net/Uri;

config/hiddenapi-vendor-list.txt

+0 −2
Original line number Diff line number Diff line
@@ -377,8 +377,6 @@ Landroid/os/SystemVibrator;-><init>()V 
Landroid/os/UserHandle;->isSameApp(II)Z

Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z

Landroid/os/UserManager;->isAdminUser()Z

Landroid/print/PrintDocumentAdapter$LayoutResultCallback;-><init>()V

Landroid/print/PrintDocumentAdapter$WriteResultCallback;-><init>()V

Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String;

Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;

Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;

core/java/android/print/PrintDocumentAdapter.java

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


package android.print;



import android.annotation.UnsupportedAppUsage;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.ParcelFileDescriptor;
@@ -260,6 +261,7 @@ public abstract class PrintDocumentAdapter { 
        /**

         * @hide

         */

        @UnsupportedAppUsage

        public WriteResultCallback() {

            /* do nothing - hide constructor */

        }
@@ -304,6 +306,7 @@ public abstract class PrintDocumentAdapter { 
        /**

         * @hide

         */

        @UnsupportedAppUsage

        public LayoutResultCallback() {

            /* do nothing - hide constructor */

        }

core/java/android/print/PrintJobInfo.java

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

import android.annotation.StringRes;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Bundle;
@@ -549,6 +550,7 @@ public final class PrintJobInfo implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public PrintDocumentInfo getDocumentInfo() {

        return mDocumentInfo;

    }
@@ -630,6 +632,7 @@ public final class PrintJobInfo implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public Bundle getAdvancedOptions() {

        return mAdvancedOptions;

    }

core/java/android/print/PrintManager.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.RequiresFeature; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.Application.ActivityLifecycleCallbacks;

import android.content.ComponentName;
@@ -311,6 +312,7 @@ public final class PrintManager { 
     * @param listener The listener to add.

     * @hide

     */

    @UnsupportedAppUsage

    public void addPrintJobStateChangeListener(PrintJobStateChangeListener listener) {

        if (mService == null) {

            Log.w(LOG_TAG, "Feature android.software.print not available");