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

Commit f8abe13d authored by Mathew Inwood's avatar Mathew Inwood Committed by Gerrit Code Review
Browse files

Merge "Add maxTargetSdk restriction to unused APIs."

parents 7bd2a5e4 5d123b67

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public class JobInfo implements Parcelable { 
    public static final int PRIORITY_BOUND_FOREGROUND_SERVICE = 30;



    /** @hide For backward compatibility. */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int PRIORITY_FOREGROUND_APP = PRIORITY_BOUND_FOREGROUND_SERVICE;



    /**
@@ -218,7 +218,7 @@ public class JobInfo implements Parcelable { 
     * JobInfo priority if it is smaller).

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int PRIORITY_FOREGROUND_SERVICE = 35;



    /**
@@ -257,7 +257,7 @@ public class JobInfo implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int FLAG_WILL_BE_FOREGROUND = 1 << 0;



    /**
@@ -1007,14 +1007,14 @@ public class JobInfo implements Parcelable { 
        }



        /** @hide */

        @UnsupportedAppUsage

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

        public Builder setPriority(int priority) {

            mPriority = priority;

            return this;

        }



        /** @hide */

        @UnsupportedAppUsage

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

        public Builder setFlags(int flags) {

            mFlags = flags;

            return this;

apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl

+2 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ interface IDeviceIdleController { 
    String[] getSystemPowerWhitelistExceptIdle();

    String[] getSystemPowerWhitelist();

    String[] getUserPowerWhitelist();

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    String[] getFullPowerWhitelistExceptIdle();

    String[] getFullPowerWhitelist();

    int[] getAppIdWhitelistExceptIdle();

    int[] getAppIdWhitelist();

    int[] getAppIdUserWhitelist();

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    int[] getAppIdTempWhitelist();

    boolean isPowerSaveWhitelistExceptIdleApp(String name);

    boolean isPowerSaveWhitelistApp(String name);

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public void setCapabilities(int capabilities) {

        mCapabilities = capabilities;

    }

core/java/android/accounts/Account.java

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

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;
@@ -38,7 +39,7 @@ import java.util.Set; 
 * suitable for use as the key of a {@link java.util.Map}

 */

public class Account implements Parcelable {

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private static final String TAG = "Account";



    @GuardedBy("sAccessedAccounts")
@@ -47,7 +48,7 @@ public class Account implements Parcelable { 
    public final String name;

    public final String type;

    private String mSafeName;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private final @Nullable String accessId;



    public boolean equals(Object o) {

core/java/android/accounts/AccountManager.java

+3 −3
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ public class AccountManager { 
    /**

     * @hide used for testing only

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public AccountManager(Context context, IAccountManager service, Handler handler) {

        mContext = context;

        mService = service;
@@ -712,7 +712,7 @@ public class AccountManager { 


    /** @hide Same as {@link #getAccountsByType(String)} but for a specific user. */

    @NonNull

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public Account[] getAccountsByTypeAsUser(String type, UserHandle userHandle) {

        try {

            return mService.getAccountsAsUser(type, userHandle.getIdentifier(),
@@ -2003,7 +2003,7 @@ public class AccountManager { 
     * Same as {@link #confirmCredentials(Account, Bundle, Activity, AccountManagerCallback, Handler)}

     * but for the specified user.

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public AccountManagerFuture<Bundle> confirmCredentialsAsUser(final Account account,

            final Bundle options,

            final Activity activity,