From 1394a019e793989bf44324784e89eb1421a0d9c8 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Thu, 12 Nov 2020 18:26:09 -0800 Subject: [PATCH] Remove legacy style metalava suppression @SuppressLint("Doclava125") is a legacy way of suppressing RequiresPermission check. Updating to the new style of suppression so metalava no longer has to support the legacy mode. sed -i "s/@SuppressLint(\"Doclava125/@SuppressLint(\"RequiresPermission/" \ core/java/android/app/admin/DevicePolicyManager.java \ core/java/android/hardware/hdmi/HdmiControlManager.java \ core/java/android/hardware/location/ContextHubManager.java \ core/java/android/hardware/usb/UsbDeviceConnection.java \ core/java/android/net/TrafficStats.java \ core/java/android/os/RecoverySystem.java \ core/java/android/os/storage/StorageManager.java \ core/java/android/service/persistentdata/PersistentDataBlockManager.java \ location/java/android/location/LocationManager.java \ media/java/android/media/AudioManager.java \ telecomm/java/android/telecom/TelecomManager.java \ telephony/java/android/telephony/CarrierConfigManager.java \ telephony/java/android/telephony/TelephonyManager.java \ wifi/java/android/net/wifi/RttManager.java \ wifi/java/android/net/wifi/WifiScanner.java Test: make Exempt-From-Owner-Approval: No-op change Change-Id: I6d5df95cfca2950ea86872d2f0afc1ba828841dc --- .../android/app/admin/DevicePolicyManager.java | 4 ++-- .../android/hardware/hdmi/HdmiControlManager.java | 10 +++++----- .../hardware/location/ContextHubManager.java | 6 +++--- .../android/hardware/usb/UsbDeviceConnection.java | 2 +- core/java/android/net/TrafficStats.java | 4 ++-- core/java/android/os/RecoverySystem.java | 2 +- core/java/android/os/storage/StorageManager.java | 6 +++--- .../persistentdata/PersistentDataBlockManager.java | 6 +++--- media/java/android/media/AudioManager.java | 6 +++--- telecomm/java/android/telecom/TelecomManager.java | 8 ++++---- .../android/telephony/CarrierConfigManager.java | 2 +- .../java/android/telephony/TelephonyManager.java | 14 +++++++------- wifi/java/android/net/wifi/RttManager.java | 2 +- wifi/java/android/net/wifi/WifiScanner.java | 12 ++++++------ 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f09e7526d6c13..16ae081049ef8 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6776,7 +6776,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public boolean isDeviceManaged() { try { return mService.hasDeviceOwner(); @@ -10487,7 +10487,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public @Nullable CharSequence getDeviceOwnerOrganizationName() { try { return mService.getDeviceOwnerOrganizationName(); diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 500b2998e0091..f1534d95a16cf 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -577,7 +577,7 @@ public final class HdmiControlManager { */ @Nullable @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public HdmiClient getClient(int type) { if (mService == null) { return null; @@ -610,7 +610,7 @@ public final class HdmiControlManager { */ @Nullable @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public HdmiPlaybackClient getPlaybackClient() { return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK); } @@ -628,7 +628,7 @@ public final class HdmiControlManager { */ @Nullable @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public HdmiTvClient getTvClient() { return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV); } @@ -646,7 +646,7 @@ public final class HdmiControlManager { * @hide */ @Nullable - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public HdmiAudioSystemClient getAudioSystemClient() { return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM); } @@ -661,7 +661,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); } diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index 1ed791d66f747..d44480796d756 100644 --- 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) { diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 21634cc544e7d..1c35cb66ada8f 100644 --- 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(); } diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 737683050528d..4e019cf0732ed 100644 --- 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); } diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 13b30f43ff7a9..72cd8ba204fdd 100644 --- 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); diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 5d3c66cc3f34f..cfc3e01c23c5b 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -2215,7 +2215,7 @@ public class StorageManager { /** @hide */ @SystemApi @WorkerThread - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public long getAllocatableBytes(@NonNull UUID storageUuid, @RequiresPermission @AllocateFlags int flags) throws IOException { try { @@ -2264,7 +2264,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 { @@ -2314,7 +2314,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); diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java index 0bf68b734b8ac..8242f4e2c9dca 100644 --- 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(); diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 29477366379bd..457888361f737 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -4009,8 +4009,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); @@ -5602,7 +5602,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(); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index b335a9032b3e9..5bba747894dc7 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1238,7 +1238,7 @@ public class TelecomManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") @Deprecated public List getPhoneAccountsForPackage() { try { @@ -1367,7 +1367,7 @@ public class TelecomManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void clearPhoneAccounts() { clearAccounts(); } @@ -1377,7 +1377,7 @@ public class TelecomManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void clearAccounts() { try { if (isServiceConnected()) { @@ -1409,7 +1409,7 @@ public class TelecomManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public ComponentName getDefaultPhoneApp() { try { if (isServiceConnected()) { diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b806313e32f83..902dc0619014f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4792,7 +4792,7 @@ public class CarrierConfigManager { */ @NonNull @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public static PersistableBundle getDefaultConfig() { return new PersistableBundle(sDefaults); } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 96f3ce0b39e8f..4eacad3fd0acc 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4661,7 +4661,7 @@ public class TelephonyManager { * be implemented instead. */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void setVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle, boolean enabled){ } @@ -4676,7 +4676,7 @@ public class TelephonyManager { */ @SystemApi @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public boolean isVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle){ return false; } @@ -4695,7 +4695,7 @@ public class TelephonyManager { * @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") @Nullable public Bundle getVisualVoicemailSettings(){ try { @@ -8621,7 +8621,7 @@ public class TelephonyManager { /** @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public int checkCarrierPrivilegesForPackage(String pkgName) { try { ITelephony telephony = getITelephony(); @@ -8637,7 +8637,7 @@ public class TelephonyManager { /** @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) { try { ITelephony telephony = getITelephony(); @@ -8713,7 +8713,7 @@ public class TelephonyManager { /** @hide */ @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void dial(String number) { try { ITelephony telephony = getITelephony(); @@ -8772,7 +8772,7 @@ public class TelephonyManager { */ @Deprecated @SystemApi - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void silenceRinger() { // No-op } diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java index 73c52ab0ab1b2..034defb083def 100644 --- 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"); diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 41d0857214f36..7c051f0962c4e 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -1267,7 +1267,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 */ @@ -1301,7 +1301,7 @@ public class WifiScanner { * provided on {@link #stopTrackingWifiChange} */ @Deprecated - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void startTrackingWifiChange(WifiChangeListener listener) { throw new UnsupportedOperationException(); } @@ -1312,7 +1312,7 @@ public class WifiScanner { * #stopTrackingWifiChange} */ @Deprecated - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void stopTrackingWifiChange(WifiChangeListener listener) { throw new UnsupportedOperationException(); } @@ -1320,7 +1320,7 @@ public class WifiScanner { /** @hide */ @SystemApi @Deprecated - @SuppressLint("Doclava125") + @SuppressLint("RequiresPermission") public void configureWifiChange(WifiChangeSettings settings) { throw new UnsupportedOperationException(); } @@ -1376,7 +1376,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(); @@ -1387,7 +1387,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(); }