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

Commit 286c33a5 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add maxTargetSdk restriction to unused APIs.""

parents b2f811d3 050275cd

apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl

+3 −3
Original line number Diff line number Diff line
@@ -29,16 +29,16 @@ import android.os.WorkSource; 
 */

interface IAlarmManager {

	/** windowLength == 0 means exact; windowLength < 0 means the let the OS decide */

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage

    void set(String callingPackage, int type, long triggerAtTime, long windowLength,

            long interval, int flags, in PendingIntent operation, in IAlarmListener listener,

            String listenerTag, in WorkSource workSource, in AlarmManager.AlarmClockInfo alarmClock);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage

    boolean setTime(long millis);

    void setTimeZone(String zone);

    void remove(in PendingIntent operation, in IAlarmListener listener);

    long getNextWakeFromIdleTime();

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage

    AlarmManager.AlarmClockInfo getNextAlarmClock(int userId);

    long currentNetworkTimeMillis();

}

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(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage

    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(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage

    public static final int PRIORITY_FOREGROUND_SERVICE = 35;



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

     * @hide

     */

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

    @UnsupportedAppUsage

    public static final int FLAG_WILL_BE_FOREGROUND = 1 << 0;



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



        /** @hide */

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

        @UnsupportedAppUsage

        public Builder setPriority(int priority) {

            mPriority = priority;

            return this;

        }



        /** @hide */

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

        @UnsupportedAppUsage

        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(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage

    String[] getFullPowerWhitelistExceptIdle();

    String[] getFullPowerWhitelist();

    int[] getAppIdWhitelistExceptIdle();

    int[] getAppIdWhitelist();

    int[] getAppIdUserWhitelist();

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage

    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
@@ -888,7 +888,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @hide

     */

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

    @UnsupportedAppUsage

    public void setCapabilities(int capabilities) {

        mCapabilities = capabilities;

    }

core/java/android/accounts/Account.java

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -39,7 +38,7 @@ import java.util.Set; 
 * suitable for use as the key of a {@link java.util.Map}

 */

public class Account implements Parcelable {

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

    @UnsupportedAppUsage

    private static final String TAG = "Account";



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

    public final String type;

    private String mSafeName;

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

    @UnsupportedAppUsage

    private final @Nullable String accessId;



    public boolean equals(@Nullable Object o) {