Merge "Remove legacy style metalava suppression"

2020-11-16 17:40:07 +00:00
parent 8cddd53381 46a165215b
commit e1bb600fc7
14 changed files with 42 additions and 42 deletions
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6680,7 +6680,7 @@ public class DevicePolicyManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public boolean isDeviceManaged() {
        try {
            return mService.hasDeviceOwner();
@@ -10392,7 +10392,7 @@ public class DevicePolicyManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public @Nullable CharSequence getDeviceOwnerOrganizationName() {
        try {
            return mService.getDeviceOwnerOrganizationName();
--- a/core/java/android/hardware/hdmi/HdmiControlManager.java
+++ b/core/java/android/hardware/hdmi/HdmiControlManager.java
@@ -407,7 +407,7 @@ public final class HdmiControlManager {
     */
    @Nullable
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public HdmiClient getClient(int type) {
        if (mService == null) {
            return null;
@@ -440,7 +440,7 @@ public final class HdmiControlManager {
     */
    @Nullable
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public HdmiPlaybackClient getPlaybackClient() {
        return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);
    }
@@ -458,7 +458,7 @@ public final class HdmiControlManager {
     */
    @Nullable
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public HdmiTvClient getTvClient() {
        return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);
    }
@@ -476,7 +476,7 @@ public final class HdmiControlManager {
     * @hide
     */
    @Nullable
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public HdmiAudioSystemClient getAudioSystemClient() {
        return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
    }
@@ -491,7 +491,7 @@ public final class HdmiControlManager {
     * @return {@link HdmiSwitchClient} instance. {@code null} on failure.
     */
    @Nullable
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public HdmiSwitchClient getSwitchClient() {
        return (HdmiSwitchClient) getClient(HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH);
    }
--- a/core/java/android/hardware/location/ContextHubManager.java
+++ b/core/java/android/hardware/location/ContextHubManager.java
@@ -654,7 +654,7 @@ public final class ContextHubManager {
     *             register a {@link android.hardware.location.ContextHubClientCallback}.
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public int registerCallback(@NonNull Callback callback) {
        return registerCallback(callback, null);
    }
@@ -688,7 +688,7 @@ public final class ContextHubManager {
     *             register a {@link android.hardware.location.ContextHubClientCallback}.
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public int registerCallback(Callback callback, Handler handler) {
        synchronized(this) {
            if (mCallback != null) {
@@ -892,7 +892,7 @@ public final class ContextHubManager {
     * @deprecated Use {@link android.hardware.location.ContextHubClient#close()} to unregister
     *             a {@link android.hardware.location.ContextHubClientCallback}.
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    @Deprecated
    public int unregisterCallback(@NonNull Callback callback) {
      synchronized(this) {
--- a/core/java/android/hardware/usb/UsbDeviceConnection.java
+++ b/core/java/android/hardware/usb/UsbDeviceConnection.java
@@ -299,7 +299,7 @@ public class UsbDeviceConnection {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public boolean resetDevice() {
        return native_reset_device();
    }
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -301,7 +301,7 @@ public class TrafficStats {
     * Changes only take effect during subsequent calls to
     * {@link #tagSocket(Socket)}.
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public static void setThreadStatsUid(int uid) {
        NetworkManagementSocketTagger.setThreadSocketStatsUid(uid);
    }
@@ -339,7 +339,7 @@ public class TrafficStats {
     *
     * @see #setThreadStatsUid(int)
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public static void clearThreadStatsUid() {
        NetworkManagementSocketTagger.setThreadSocketStatsUid(-1);
    }
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -422,7 +422,7 @@ public class RecoverySystem {
     * {@hide}
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public static boolean verifyPackageCompatibility(File compatibilityFile) throws IOException {
        try (InputStream inputStream = new FileInputStream(compatibilityFile)) {
            return verifyPackageCompatibility(inputStream);
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -2221,7 +2221,7 @@ public class StorageManager {
    /** @hide */
    @SystemApi
    @WorkerThread
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public long getAllocatableBytes(@NonNull UUID storageUuid,
            @RequiresPermission @AllocateFlags int flags) throws IOException {
        try {
@@ -2270,7 +2270,7 @@ public class StorageManager {
    /** @hide */
    @SystemApi
    @WorkerThread
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void allocateBytes(@NonNull UUID storageUuid, @BytesLong long bytes,
            @RequiresPermission @AllocateFlags int flags) throws IOException {
        try {
@@ -2320,7 +2320,7 @@ public class StorageManager {
    /** @hide */
    @SystemApi
    @WorkerThread
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void allocateBytes(FileDescriptor fd, @BytesLong long bytes,
            @RequiresPermission @AllocateFlags int flags) throws IOException {
        final File file = ParcelFileDescriptor.getFile(fd);
--- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java
+++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java
@@ -90,7 +90,7 @@ public class PersistentDataBlockManager {
     *
     * @param data the data to write
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public int write(byte[] data) {
        try {
            return sService.write(data);
@@ -102,7 +102,7 @@ public class PersistentDataBlockManager {
    /**
     * Returns the data block stored on the persistent partition.
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public byte[] read() {
        try {
            return sService.read();
@@ -130,7 +130,7 @@ public class PersistentDataBlockManager {
     *
     * Returns -1 on error.
     */
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public long getMaximumDataBlockSize() {
        try {
            return sService.getMaximumDataBlockSize();
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -3542,8 +3542,8 @@ public class AudioManager {
     * @deprecated use {@link #abandonAudioFocusRequest(AudioFocusRequest)}
     */
    @SystemApi
-    @SuppressLint("Doclava125") // no permission enforcement, but only "undoes" what would have been
-                                // done by a matching requestAudioFocus
+    @SuppressLint("RequiresPermission") // no permission enforcement, but only "undoes" what would
+    // have been done by a matching requestAudioFocus
    public int abandonAudioFocus(OnAudioFocusChangeListener l, AudioAttributes aa) {
        int status = AUDIOFOCUS_REQUEST_FAILED;
        unregisterAudioFocusRequest(l);
@@ -5146,7 +5146,7 @@ public class AudioManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125") // FIXME is this still used?
+    @SuppressLint("RequiresPermission") // FIXME is this still used?
    public boolean isHdmiSystemAudioSupported() {
        try {
            return getService().isHdmiSystemAudioSupported();
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1228,7 +1228,7 @@ public class TelecomManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public List<PhoneAccountHandle> getPhoneAccountsForPackage() {
        try {
            if (isServiceConnected()) {
@@ -1356,7 +1356,7 @@ public class TelecomManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void clearPhoneAccounts() {
        clearAccounts();
    }
@@ -1366,7 +1366,7 @@ public class TelecomManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void clearAccounts() {
        try {
            if (isServiceConnected()) {
@@ -1398,7 +1398,7 @@ public class TelecomManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public ComponentName getDefaultPhoneApp() {
        try {
            if (isServiceConnected()) {
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -4782,7 +4782,7 @@ public class CarrierConfigManager {
     */
    @NonNull
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public static PersistableBundle getDefaultConfig() {
        return new PersistableBundle(sDefaults);
    }
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4656,7 +4656,7 @@ public class TelephonyManager {
     * be implemented instead.
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void setVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle, boolean enabled){
    }

@@ -4671,7 +4671,7 @@ public class TelephonyManager {
     */
    @SystemApi
    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public boolean isVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle){
        return false;
    }
@@ -4690,7 +4690,7 @@ public class TelephonyManager {
     * @hide
     */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    @Nullable
    public Bundle getVisualVoicemailSettings(){
        try {
@@ -8524,7 +8524,7 @@ public class TelephonyManager {

    /** @hide */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public int checkCarrierPrivilegesForPackage(String pkgName) {
        try {
            ITelephony telephony = getITelephony();
@@ -8540,7 +8540,7 @@ public class TelephonyManager {

    /** @hide */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
        try {
            ITelephony telephony = getITelephony();
@@ -8616,7 +8616,7 @@ public class TelephonyManager {

    /** @hide */
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void dial(String number) {
        try {
            ITelephony telephony = getITelephony();
@@ -8675,7 +8675,7 @@ public class TelephonyManager {
     */
    @Deprecated
    @SystemApi
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void silenceRinger() {
        // No-op
    }
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -173,7 +173,7 @@ public class RttManager {

    /** @deprecated Use the new {@link android.net.wifi.RttManager#getRttCapabilities()} API.*/
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public Capabilities getCapabilities() {
        throw new UnsupportedOperationException(
                "getCapabilities is not supported in the adaptation layer");
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -1239,7 +1239,7 @@ public class WifiScanner {
     * @param bssidInfos access points to watch
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void configureWifiChange(
            int rssiSampleSize,                             /* sample size for RSSI averaging */
            int lostApSampleSize,                           /* samples to confirm AP's loss */
@@ -1273,7 +1273,7 @@ public class WifiScanner {
     *                 provided on {@link #stopTrackingWifiChange}
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void startTrackingWifiChange(WifiChangeListener listener) {
        throw new UnsupportedOperationException();
    }
@@ -1284,7 +1284,7 @@ public class WifiScanner {
     * #stopTrackingWifiChange}
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void stopTrackingWifiChange(WifiChangeListener listener) {
        throw new UnsupportedOperationException();
    }
@@ -1292,7 +1292,7 @@ public class WifiScanner {
    /** @hide */
    @SystemApi
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void configureWifiChange(WifiChangeSettings settings) {
        throw new UnsupportedOperationException();
    }
@@ -1348,7 +1348,7 @@ public class WifiScanner {
     *                 also be provided on {@link #stopTrackingBssids}
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void startTrackingBssids(BssidInfo[] bssidInfos,
                                    int apLostThreshold, BssidListener listener) {
        throw new UnsupportedOperationException();
@@ -1359,7 +1359,7 @@ public class WifiScanner {
     * @param listener same object provided in {@link #startTrackingBssids}
     */
    @Deprecated
-    @SuppressLint("Doclava125")
+    @SuppressLint("RequiresPermission")
    public void stopTrackingBssids(BssidListener listener) {
        throw new UnsupportedOperationException();
    }