From 0128b3c58c7a626f6c67c362535fafaf19c7ed89 Mon Sep 17 00:00:00 2001 From: Grace Jia Date: Tue, 23 Jun 2020 12:53:17 -0700 Subject: Deprecate TelecomManager#getPhoneAccountsForPackage for security. Bug: 153995334 Test: make Change-Id: I66d757139f3b7e25481b302e9378327873c7912c --- telecomm/java/android/telecom/TelecomManager.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'telecomm/java') diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index bcb1736f416e..464f318a8bac 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1209,11 +1209,14 @@ public class TelecomManager { /** * Returns a list of all {@link PhoneAccount}s registered for the calling package. * + * @deprecated Use {@link #getSelfManagedPhoneAccounts()} instead to get only self-managed + * {@link PhoneAccountHandle} for the calling package. * @return A list of {@code PhoneAccountHandle} objects. * @hide */ @SystemApi @SuppressLint("Doclava125") + @Deprecated public List getPhoneAccountsForPackage() { try { if (isServiceConnected()) { -- cgit v1.2.3-59-g8ed1b From c903f6ac26409d443000b602e56fdc854a372c28 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Thu, 3 Sep 2020 15:31:38 -0700 Subject: [telecom] system_server should not call non forUser Settings.Secure.get* methods BUG: 166312046 Test: builds Change-Id: I69e91c84ff170abd6e82e0ff322e168c11004daa --- telecomm/java/android/telecom/Logging/SessionManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'telecomm/java') diff --git a/telecomm/java/android/telecom/Logging/SessionManager.java b/telecomm/java/android/telecom/Logging/SessionManager.java index 67e5eabf54eb..9d17219c1ae4 100644 --- a/telecomm/java/android/telecom/Logging/SessionManager.java +++ b/telecomm/java/android/telecom/Logging/SessionManager.java @@ -17,6 +17,7 @@ package android.telecom.Logging; import android.annotation.Nullable; +import android.content.ContentResolver; import android.content.Context; import android.os.Handler; import android.os.Looper; @@ -453,7 +454,9 @@ public class SessionManager { * perform a sweep to check and make sure that the session is still not incomplete (stale). */ private long getCleanupTimeout(Context context) { - return Settings.Secure.getLong(context.getContentResolver(), TIMEOUTS_PREFIX + - "stale_session_cleanup_timeout_millis", DEFAULT_SESSION_TIMEOUT_MS); + final ContentResolver cr = context.getContentResolver(); + return Settings.Secure.getLongForUser(cr, TIMEOUTS_PREFIX + + "stale_session_cleanup_timeout_millis", DEFAULT_SESSION_TIMEOUT_MS, + cr.getUserId()); } } -- cgit v1.2.3-59-g8ed1b From 221f804a007c7275b4eeedbb9eb8c4ce0a032078 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Wed, 23 Sep 2020 15:36:58 -0700 Subject: API tweaks in response to feedback Update documentation on PhoneAccount#EXTRA_SORT_ORDER to make it more clear what the sorting order is in edge cases. Make DisconnectCause#REASON_EMULATING_SINGLE_CALL public, since it might get propogated up to dialer apps. Fixes: 169153499 Test: docs only Change-Id: I7f810f909a8a61b422283c3bafcc97307e4d863b --- api/current.txt | 1 + api/system-current.txt | 4 ---- non-updatable-api/current.txt | 1 + non-updatable-api/system-current.txt | 4 ---- telecomm/java/android/telecom/DisconnectCause.java | 4 ---- telecomm/java/android/telecom/PhoneAccount.java | 12 +++++++++++- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'telecomm/java') diff --git a/api/current.txt b/api/current.txt index 81088ab85ba6..dbbdce9b61b0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46086,6 +46086,7 @@ package android.telecom { field public static final int MISSED = 5; // 0x5 field public static final int OTHER = 9; // 0x9 field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED"; + field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED"; field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; field public static final int REJECTED = 6; // 0x6 diff --git a/api/system-current.txt b/api/system-current.txt index c4f9067b507d..a02f393aecef 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10437,10 +10437,6 @@ package android.telecom { method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference); } - public final class DisconnectCause implements android.os.Parcelable { - field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; - } - public abstract class InCallService extends android.app.Service { method @Deprecated public android.telecom.Phone getPhone(); method @Deprecated public void onPhoneCreated(android.telecom.Phone); diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index bcc239f35afe..db5cd150a079 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -44223,6 +44223,7 @@ package android.telecom { field public static final int MISSED = 5; // 0x5 field public static final int OTHER = 9; // 0x9 field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED"; + field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED"; field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; field public static final int REJECTED = 6; // 0x6 diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index 10fe058bb76f..215078a82c17 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -9299,10 +9299,6 @@ package android.telecom { method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference); } - public final class DisconnectCause implements android.os.Parcelable { - field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; - } - public abstract class InCallService extends android.app.Service { method @Deprecated public android.telecom.Phone getPhone(); method @Deprecated public void onPhoneCreated(android.telecom.Phone); diff --git a/telecomm/java/android/telecom/DisconnectCause.java b/telecomm/java/android/telecom/DisconnectCause.java index f7fe1ba1f998..1472a4ac27bc 100644 --- a/telecomm/java/android/telecom/DisconnectCause.java +++ b/telecomm/java/android/telecom/DisconnectCause.java @@ -16,7 +16,6 @@ package android.telecom; -import android.annotation.SystemApi; import android.media.ToneGenerator; import android.os.Parcel; import android.os.Parcelable; @@ -97,10 +96,7 @@ public final class DisconnectCause implements Parcelable { * * This reason code is only used for communication between a {@link ConnectionService} and * Telecom and should not be surfaced to the user. - * - * @hide */ - @SystemApi public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL"; /** diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index c20e5ad8ce7c..4a3561b5d509 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -28,6 +28,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.telephony.TelephonyManager; import android.text.TextUtils; import java.util.ArrayList; @@ -52,8 +53,17 @@ public final class PhoneAccount implements Parcelable { * * This is an extras key set via {@link Builder#setExtras} which determines the order in which * {@link PhoneAccount}s from the same {@link ConnectionService} are sorted. The accounts - * are sorted by this key via standard lexicographical order, and this ordering is used to + * are sorted by this key via standard lexicographical order, (as implemented in + * {@link String#compareTo}), and this ordering is used to * determine priority when a call can be placed via multiple accounts. + * + * When multiple {@link PhoneAccount}s are supplied with the same sort order key, no ordering is + * guaranteed between those {@link PhoneAccount}s. Additionally, no ordering is guaranteed + * between {@link PhoneAccount}s that do not supply this extra, and all such accounts + * will be sorted after the accounts that do supply this extra. + * + * An example of a sort order key is slot index (see {@link TelephonyManager#getSlotIndex()}), + * which is the one used by the cell Telephony stack. * @hide */ @SystemApi -- cgit v1.2.3-59-g8ed1b From 4bb53ec753ec7d1f6871e17a942a54e31b2fff55 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Tue, 29 Sep 2020 15:15:24 -0700 Subject: Update documentation for phone account sort order Update documentation to reflect that the sort order extra should contain integers. Bug: 169153499 Test: docs only Change-Id: Ic5269d577f007e01a0c9eaa95cd7e8814ab8f79a --- telecomm/java/android/telecom/PhoneAccount.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'telecomm/java') diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 4a3561b5d509..866e17148a1a 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -49,12 +49,11 @@ import java.util.Objects; public final class PhoneAccount implements Parcelable { /** - * String extra which determines the order in which {@link PhoneAccount}s are sorted + * Integer extra which determines the order in which {@link PhoneAccount}s are sorted * * This is an extras key set via {@link Builder#setExtras} which determines the order in which * {@link PhoneAccount}s from the same {@link ConnectionService} are sorted. The accounts - * are sorted by this key via standard lexicographical order, (as implemented in - * {@link String#compareTo}), and this ordering is used to + * are sorted in ascending order by this key, and this ordering is used to * determine priority when a call can be placed via multiple accounts. * * When multiple {@link PhoneAccount}s are supplied with the same sort order key, no ordering is -- cgit v1.2.3-59-g8ed1b From 2d2e07e2ff43a13bf039fa755e5069849b5a8c51 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 6 Oct 2020 11:18:09 -0600 Subject: Tighten up Binder.clearCallingIdentity() usage. The recently added AndroidFrameworkBinderIdentity Error Prone checker examines code to ensure that any cleared identities are restored to avoid obscure security vulnerabilities. This change is a purely mechanical refactoring that adds the "final" keyword to the cleared identity to ensure that it's not accidentally modified before eventually being cleared. Here's the exact command used to generate this CL: $ find . -name "*.java" -exec sed -Ei \ 's/ (long \w+ = .+?clearCallingIdentity)/ final \1/' \ {} \; Bug: 155703208 Test: make Exempt-From-Owner-Approval: trivial refactoring Change-Id: I832c9d70c3dfcd8d669cf71939d97837becc973a --- .../server/appsearch/AppSearchManagerService.java | 14 +-- .../com/android/server/DeviceIdleController.java | 36 +++---- .../android/server/job/JobSchedulerService.java | 14 +-- .../framework/java/android/app/StatsManager.java | 2 +- core/java/android/app/AppOpsManager.java | 2 +- core/java/android/app/backup/BackupAgent.java | 12 +-- .../android/app/role/RoleControllerManager.java | 4 +- core/java/android/app/role/RoleManager.java | 4 +- core/java/android/os/Binder.java | 4 +- .../permission/PermissionControllerManager.java | 8 +- .../view/accessibility/AccessibilityManager.java | 2 +- .../internal/util/LocationPermissionChecker.java | 2 +- .../android/BinderIdentityCheckerTest.java | 2 +- .../android/graphics/GraphicsStatsService.java | 4 +- .../java/android/media/midi/MidiDeviceServer.java | 2 +- .../systemui/recents/OverviewProxyService.java | 42 ++++---- .../accessibility/AccessibilitySecurityPolicy.java | 2 +- .../FingerprintGestureDispatcher.java | 6 +- .../appprediction/AppPredictionManagerService.java | 2 +- .../server/appwidget/AppWidgetServiceImpl.java | 4 +- .../server/backup/BackupManagerService.java | 4 +- .../server/backup/UserBackupManagerService.java | 20 ++-- .../backup/restore/ActiveRestoreSession.java | 8 +- .../companion/CompanionDeviceManagerService.java | 2 +- .../java/com/android/server/BatteryService.java | 6 +- .../android/server/BluetoothManagerService.java | 6 +- .../java/com/android/server/MmsServiceBroker.java | 2 +- .../com/android/server/StorageManagerService.java | 2 +- .../java/com/android/server/TelephonyRegistry.java | 8 +- .../java/com/android/server/UpdateLockService.java | 2 +- .../java/com/android/server/VibratorService.java | 4 +- .../server/accounts/AccountManagerService.java | 106 ++++++++++----------- .../android/server/am/ActivityManagerService.java | 24 ++--- .../core/java/com/android/server/am/AppErrors.java | 2 +- .../com/android/server/am/AppExitInfoTracker.java | 2 +- .../com/android/server/am/BatteryStatsService.java | 6 +- .../android/server/am/ContentProviderHelper.java | 4 +- .../java/com/android/server/am/ProcessRecord.java | 2 +- .../com/android/server/am/ProcessStatsService.java | 2 +- .../java/com/android/server/am/UserController.java | 2 +- .../com/android/server/appop/AppOpsService.java | 10 +- .../com/android/server/audio/AudioService.java | 2 +- .../java/com/android/server/connectivity/Vpn.java | 10 +- .../com/android/server/content/ContentService.java | 38 ++++---- .../com/android/server/content/SyncManager.java | 2 +- .../android/server/hdmi/HdmiControlService.java | 2 +- .../inputmethod/InputContentUriTokenHandler.java | 2 +- .../inputmethod/InputMethodManagerService.java | 6 +- .../server/location/AbstractLocationProvider.java | 8 +- .../server/location/LocationProviderManager.java | 26 ++--- .../location/PassiveLocationProviderManager.java | 2 +- .../server/location/geofence/GeofenceManager.java | 4 +- .../location/gnss/GnssListenerMultiplexer.java | 4 +- .../server/location/gnss/GnssLocationProvider.java | 2 +- .../location/util/SystemAppForegroundHelper.java | 2 +- .../server/location/util/SystemAppOpsHelper.java | 10 +- .../util/SystemLocationPermissionsHelper.java | 2 +- .../server/location/util/SystemSettingsHelper.java | 16 ++-- .../server/location/util/SystemUserInfoHelper.java | 6 +- .../server/locksettings/LockSettingsService.java | 6 +- .../projection/MediaProjectionManagerService.java | 4 +- .../notification/NotificationManagerService.java | 46 ++++----- .../server/notification/NotificationShellCmd.java | 2 +- .../notification/ScheduleConditionProvider.java | 2 +- .../android/server/notification/SnoozeHelper.java | 2 +- .../server/pm/InstantAppResolverConnection.java | 2 +- .../com/android/server/pm/LauncherAppsService.java | 14 +-- .../android/server/pm/PackageInstallerService.java | 2 +- .../android/server/pm/PackageManagerService.java | 20 ++-- .../core/java/com/android/server/pm/Settings.java | 2 +- .../com/android/server/pm/UserManagerService.java | 14 +-- .../android/server/pm/dex/ArtManagerService.java | 2 +- .../com/android/server/pm/dex/ViewCompiler.java | 2 +- .../pm/permission/PermissionManagerService.java | 8 +- .../android/server/role/RoleManagerService.java | 4 +- .../com/android/server/search/Searchables.java | 2 +- .../android/server/slice/SliceManagerService.java | 6 +- .../android/server/slice/SliceShellCommand.java | 2 +- .../server/stats/pull/StatsPullAtomService.java | 6 +- .../server/statusbar/StatusBarManagerService.java | 44 ++++----- .../server/timedetector/TimeDetectorService.java | 2 +- .../timezonedetector/TimeZoneDetectorService.java | 6 +- .../android/server/trust/TrustManagerService.java | 6 +- .../server/wallpaper/WallpaperManagerService.java | 4 +- .../server/webkit/WebViewUpdateService.java | 6 +- .../server/wm/ActivityTaskManagerService.java | 34 +++---- .../java/com/android/server/wm/AppTaskImpl.java | 6 +- .../server/wm/DragAndDropPermissionsHandler.java | 2 +- .../core/java/com/android/server/wm/Session.java | 16 ++-- .../android/server/wm/WindowManagerService.java | 28 +++--- .../server/wm/WindowOrganizerController.java | 8 +- .../devicepolicy/DevicePolicyManagerService.java | 2 +- .../java/com/android/server/midi/MidiService.java | 4 +- .../restrictions/RestrictionsManagerService.java | 8 +- .../server/devicepolicy/DpmMockContext.java | 2 +- .../com/android/server/usb/UsbSerialReader.java | 2 +- .../java/com/android/server/usb/UsbService.java | 4 +- .../server/usb/UsbUserPermissionManager.java | 2 +- .../server/soundtrigger/SoundTriggerHelper.java | 4 +- .../server/soundtrigger/SoundTriggerService.java | 4 +- .../VoiceInteractionSessionConnection.java | 2 +- .../java/android/telecom/DefaultDialerManager.java | 4 +- .../android/telephony/LocationAccessPolicy.java | 2 +- .../internal/telephony/util/TelephonyUtils.java | 4 +- .../android/telephony/ims/ImsMmTelManager.java | 2 +- .../java/android/telephony/ims/ImsRcsManager.java | 2 +- .../android/telephony/ims/ProvisioningManager.java | 4 +- .../java/android/telephony/ims/RcsUceAdapter.java | 6 +- .../android/telephony/ims/RegistrationManager.java | 10 +- .../mbms/InternalDownloadProgressListener.java | 2 +- .../mbms/InternalDownloadSessionCallback.java | 6 +- .../mbms/InternalDownloadStatusListener.java | 2 +- .../telephony/mbms/InternalGroupCallCallback.java | 6 +- .../mbms/InternalGroupCallSessionCallback.java | 8 +- .../mbms/InternalStreamingServiceCallback.java | 10 +- .../mbms/InternalStreamingSessionCallback.java | 6 +- 116 files changed, 477 insertions(+), 477 deletions(-) (limited to 'telecomm/java') diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java index 75fad82d3fff..d6b6077a187f 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java @@ -66,7 +66,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { SchemaProto schema = SchemaProto.parseFrom(schemaBytes); AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); @@ -88,7 +88,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); String databaseName = makeDatabaseName(callingUid); @@ -119,7 +119,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); String databaseName = makeDatabaseName(callingUid); @@ -161,7 +161,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { SearchSpecProto searchSpecProto = SearchSpecProto.parseFrom(searchSpecBytes); ResultSpecProto resultSpecProto = ResultSpecProto.parseFrom(resultSpecBytes); @@ -194,7 +194,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); String databaseName = makeDatabaseName(callingUid); @@ -224,7 +224,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); String databaseName = makeDatabaseName(callingUid); @@ -252,7 +252,7 @@ public class AppSearchManagerService extends SystemService { Preconditions.checkNotNull(callback); int callingUid = Binder.getCallingUidOrThrow(); int callingUserId = UserHandle.getUserId(callingUid); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId); String databaseName = makeDatabaseName(callingUid); diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java index 59915e145c49..1a81587990f2 100644 --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java @@ -1682,7 +1682,7 @@ public class DeviceIdleController extends SystemService } getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return addPowerSaveWhitelistAppsInternal(packageNames); } finally { @@ -1696,7 +1696,7 @@ public class DeviceIdleController extends SystemService } getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (!removePowerSaveWhitelistAppInternal(name) && mPowerSaveWhitelistAppsExceptIdle.containsKey(name)) { @@ -1713,7 +1713,7 @@ public class DeviceIdleController extends SystemService } getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { removeSystemPowerWhitelistAppInternal(name); } finally { @@ -1727,7 +1727,7 @@ public class DeviceIdleController extends SystemService } getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { restoreSystemPowerWhitelistAppInternal(name); } finally { @@ -1815,7 +1815,7 @@ public class DeviceIdleController extends SystemService @Override public void exitIdle(String reason) { getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { exitIdleInternal(reason); } finally { @@ -1826,7 +1826,7 @@ public class DeviceIdleController extends SystemService @Override public int setPreIdleTimeoutMode(int mode) { getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return DeviceIdleController.this.setPreIdleTimeoutMode(mode); } finally { @@ -1837,7 +1837,7 @@ public class DeviceIdleController extends SystemService @Override public void resetPreIdleTimeoutMode() { getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { DeviceIdleController.this.resetPreIdleTimeoutMode(); } finally { @@ -4031,7 +4031,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); String arg = shell.getNextArg(); try { if (arg == null || "deep".equals(arg)) { @@ -4052,7 +4052,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); String arg = shell.getNextArg(); try { if (arg == null || "deep".equals(arg)) { @@ -4100,7 +4100,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mForceIdle = true; becomeInactiveIfAppropriateLocked(); @@ -4116,7 +4116,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { exitForceIdleLocked(); pw.print("Light state: "); @@ -4133,7 +4133,7 @@ public class DeviceIdleController extends SystemService synchronized (this) { String arg = shell.getNextArg(); if (arg != null) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { switch (arg) { case "light": pw.println(lightStateToString(mLightState)); break; @@ -4156,7 +4156,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); String arg = shell.getNextArg(); try { boolean becomeActive = false; @@ -4193,7 +4193,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); String arg = shell.getNextArg(); try { boolean becomeInactive = false; @@ -4242,7 +4242,7 @@ public class DeviceIdleController extends SystemService if (arg != null) { getContext().enforceCallingOrSelfPermission( android.Manifest.permission.DEVICE_POWER, null); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { do { if (arg.length() < 1 || (arg.charAt(0) != '-' @@ -4418,7 +4418,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { motionLocked(); pw.print("Light state: "); @@ -4433,7 +4433,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); int ret = SET_IDLE_FACTOR_RESULT_UNINIT; try { String arg = shell.getNextArg(); @@ -4468,7 +4468,7 @@ public class DeviceIdleController extends SystemService getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); synchronized (this) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { resetPreIdleTimeoutMode(); } finally { diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 4512d77e650e..6c14233dba13 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -2673,7 +2673,7 @@ public class JobSchedulerService extends com.android.server.SystemService validateJobFlags(job, uid); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return JobSchedulerService.this.scheduleAsPackage(job, null, uid, null, userId, null); @@ -2701,7 +2701,7 @@ public class JobSchedulerService extends com.android.server.SystemService validateJobFlags(job, uid); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return JobSchedulerService.this.scheduleAsPackage(job, work, uid, null, userId, null); @@ -2732,7 +2732,7 @@ public class JobSchedulerService extends com.android.server.SystemService validateJobFlags(job, callerUid); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return JobSchedulerService.this.scheduleAsPackage(job, null, callerUid, packageName, userId, tag); @@ -2745,7 +2745,7 @@ public class JobSchedulerService extends com.android.server.SystemService public ParceledListSlice getAllPendingJobs() throws RemoteException { final int uid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return new ParceledListSlice<>(JobSchedulerService.this.getPendingJobs(uid)); } finally { @@ -2757,7 +2757,7 @@ public class JobSchedulerService extends com.android.server.SystemService public JobInfo getPendingJob(int jobId) throws RemoteException { final int uid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return JobSchedulerService.this.getPendingJob(uid, jobId); } finally { @@ -2768,7 +2768,7 @@ public class JobSchedulerService extends com.android.server.SystemService @Override public void cancelAll() throws RemoteException { final int uid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { JobSchedulerService.this.cancelJobsForUid(uid, "cancelAll() called by app, callingUid=" + uid); @@ -2781,7 +2781,7 @@ public class JobSchedulerService extends com.android.server.SystemService public void cancel(int jobId) throws RemoteException { final int uid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { JobSchedulerService.this.cancelJob(uid, jobId, uid); } finally { diff --git a/apex/statsd/framework/java/android/app/StatsManager.java b/apex/statsd/framework/java/android/app/StatsManager.java index a7d20572ca96..41803cfd6960 100644 --- a/apex/statsd/framework/java/android/app/StatsManager.java +++ b/apex/statsd/framework/java/android/app/StatsManager.java @@ -547,7 +547,7 @@ public final class StatsManager { @Override public void onPullAtom(int atomTag, IPullAtomResultReceiver resultReceiver) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> { List data = new ArrayList<>(); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index ef4f099f441d..a8cd9aac39b1 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -8477,7 +8477,7 @@ public class AppOpsManager { public void opNoted(AsyncNotedAppOp op) { Objects.requireNonNull(op); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { getAsyncNotedExecutor().execute(() -> onAsyncNoted(op)); } finally { diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java index 056cfc7c28f1..a62459523c83 100644 --- a/core/java/android/app/backup/BackupAgent.java +++ b/core/java/android/app/backup/BackupAgent.java @@ -1055,7 +1055,7 @@ public abstract class BackupAgent extends ContextWrapper { IBackupCallback callbackBinder, int transportFlags) throws RemoteException { // Ensure that we're running with the app's normal permission level - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); if (DEBUG) Log.v(TAG, "doBackup() invoked"); BackupDataOutput output = new BackupDataOutput( @@ -1112,7 +1112,7 @@ public abstract class BackupAgent extends ContextWrapper { ParcelFileDescriptor newState, int token, IBackupManager callbackBinder, List excludedKeys) throws RemoteException { // Ensure that we're running with the app's normal permission level - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); if (DEBUG) Log.v(TAG, "doRestore() invoked"); @@ -1153,7 +1153,7 @@ public abstract class BackupAgent extends ContextWrapper { public void doFullBackup(ParcelFileDescriptor data, long quotaBytes, int token, IBackupManager callbackBinder, int transportFlags) { // Ensure that we're running with the app's normal permission level - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); if (DEBUG) Log.v(TAG, "doFullBackup() invoked"); @@ -1228,7 +1228,7 @@ public abstract class BackupAgent extends ContextWrapper { public void doRestoreFile(ParcelFileDescriptor data, long size, int type, String domain, String path, long mode, long mtime, int token, IBackupManager callbackBinder) throws RemoteException { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { BackupAgent.this.onRestoreFile(data, size, type, domain, path, mode, mtime); } catch (IOException e) { @@ -1255,7 +1255,7 @@ public abstract class BackupAgent extends ContextWrapper { @Override public void doRestoreFinished(int token, IBackupManager callbackBinder) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { BackupAgent.this.onRestoreFinished(); } catch (Exception e) { @@ -1284,7 +1284,7 @@ public abstract class BackupAgent extends ContextWrapper { long backupDataBytes, long quotaBytes, IBackupCallback callbackBinder) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); long result = RESULT_ERROR; try { diff --git a/core/java/android/app/role/RoleControllerManager.java b/core/java/android/app/role/RoleControllerManager.java index 96a4debd3d6a..8dde2c55d7d3 100644 --- a/core/java/android/app/role/RoleControllerManager.java +++ b/core/java/android/app/role/RoleControllerManager.java @@ -258,7 +258,7 @@ public class RoleControllerManager { Consumer destination) { operation.orTimeout(REQUEST_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) .whenComplete((res, err) -> executor.execute(() -> { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (err != null) { Log.e(LOG_TAG, "Error calling " + opName + "()", err); @@ -276,7 +276,7 @@ public class RoleControllerManager { RemoteCallback destination) { operation.orTimeout(REQUEST_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) .whenComplete((res, err) -> { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (err != null) { Log.e(LOG_TAG, "Error calling " + opName + "()", err); diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index 87e1df3fb234..82159235ae28 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -413,7 +413,7 @@ public final class RoleManager { @NonNull Consumer callback) { return new RemoteCallback(result -> executor.execute(() -> { boolean successful = result != null; - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { callback.accept(successful); } finally { @@ -660,7 +660,7 @@ public final class RoleManager { @Override public void onRoleHoldersChanged(@NonNull String roleName, @UserIdInt int userId) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(PooledLambda.obtainRunnable( OnRoleHoldersChangedListener::onRoleHoldersChanged, mListener, roleName, diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index bec96f98dbcd..b737c9f49c18 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -391,7 +391,7 @@ public class Binder implements IBinder { * @hide */ public static final void withCleanCallingIdentity(@NonNull ThrowingRunnable action) { - long callingIdentity = clearCallingIdentity(); + final long callingIdentity = clearCallingIdentity(); Throwable throwableToPropagate = null; try { action.runOrThrow(); @@ -415,7 +415,7 @@ public class Binder implements IBinder { * @hide */ public static final T withCleanCallingIdentity(@NonNull ThrowingSupplier action) { - long callingIdentity = clearCallingIdentity(); + final long callingIdentity = clearCallingIdentity(); Throwable throwableToPropagate = null; try { return action.getOrThrow(); diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java index 17a78a8f301e..d6c95db95e85 100644 --- a/core/java/android/permission/PermissionControllerManager.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -308,7 +308,7 @@ public final class PermissionControllerManager { revokeRuntimePermissionsResult); return revokeRuntimePermissionsResult; }).whenCompleteAsync((revoked, err) -> { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (err != null) { Log.e(TAG, "Failure when revoking runtime permissions " + revoked, err); @@ -358,7 +358,7 @@ public final class PermissionControllerManager { setRuntimePermissionGrantStateResult); return setRuntimePermissionGrantStateResult; }).whenCompleteAsync((setRuntimePermissionGrantStateResult, err) -> { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (err != null) { Log.e(TAG, "Error setting permissions state for device admin " + packageName, @@ -477,7 +477,7 @@ public final class PermissionControllerManager { applyStagedRuntimePermissionBackupResult); return applyStagedRuntimePermissionBackupResult; }).whenCompleteAsync((applyStagedRuntimePermissionBackupResult, err) -> { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (err != null) { Log.e(TAG, "Error restoring delayed permissions for " + packageName, err); @@ -623,7 +623,7 @@ public final class PermissionControllerManager { Log.e(TAG, "Error getting permission usages", err); callback.onPermissionUsageResult(Collections.emptyList()); } else { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { callback.onPermissionUsageResult( CollectionUtils.emptyIfNull(getPermissionUsagesResult)); diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 16f35ad8c24c..aed9b89747d0 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -606,7 +606,7 @@ public final class AccessibilityManager { // it is possible that this manager is in the same process as the service but // client using it is called through Binder from another process. Example: MMS // app adds a SMS notification and the NotificationManagerService calls this method - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); try { service.sendAccessibilityEvent(dispatchedEvent, userId); } finally { diff --git a/core/java/com/android/internal/util/LocationPermissionChecker.java b/core/java/com/android/internal/util/LocationPermissionChecker.java index cd8fc350362d..59c0c0009640 100644 --- a/core/java/com/android/internal/util/LocationPermissionChecker.java +++ b/core/java/com/android/internal/util/LocationPermissionChecker.java @@ -218,7 +218,7 @@ public class LocationPermissionChecker { } private boolean isTargetSdkLessThan(String packageName, int versionCode, int callingUid) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (mContext.getPackageManager().getApplicationInfoAsUser( packageName, 0, diff --git a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java index 9448344f7abb..a009d578039b 100644 --- a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java +++ b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java @@ -89,7 +89,7 @@ public class BinderIdentityCheckerTest { " }", " void noFinal() {", " // BUG: Diagnostic contains:", - " long token = Binder.clearCallingIdentity();", + " final long token = Binder.clearCallingIdentity();", " try {", " FooService.class.toString();", " } finally {", diff --git a/graphics/java/android/graphics/GraphicsStatsService.java b/graphics/java/android/graphics/GraphicsStatsService.java index 2d6848b618a1..dc785c5b0309 100644 --- a/graphics/java/android/graphics/GraphicsStatsService.java +++ b/graphics/java/android/graphics/GraphicsStatsService.java @@ -175,7 +175,7 @@ public class GraphicsStatsService extends IGraphicsStats.Stub { int uid = Binder.getCallingUid(); int pid = Binder.getCallingPid(); ParcelFileDescriptor pfd = null; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mAppOps.checkPackage(uid, packageName); PackageInfo info = mContext.getPackageManager().getPackageInfoAsUser( @@ -214,7 +214,7 @@ public class GraphicsStatsService extends IGraphicsStats.Stub { } } - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { pullGraphicsStatsImpl(lastFullDay, pulledData); } finally { diff --git a/media/java/android/media/midi/MidiDeviceServer.java b/media/java/android/media/midi/MidiDeviceServer.java index 51d552066bc6..e0fcc67218d4 100644 --- a/media/java/android/media/midi/MidiDeviceServer.java +++ b/media/java/android/media/midi/MidiDeviceServer.java @@ -384,7 +384,7 @@ public final class MidiDeviceServer implements Closeable { private void updateDeviceStatus() { // clear calling identity, since we may be in a Binder call from one of our clients - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); MidiDeviceStatus status = new MidiDeviceStatus(mDeviceInfo, mInputPortOpen, mOutputPortOpenCount); diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 3b0415b31eb5..5279a20a67a7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -168,7 +168,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("startScreenPinning")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> { mStatusBarOptionalLazy.ifPresent( @@ -185,7 +185,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("stopScreenPinning")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> { try { @@ -205,7 +205,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("onStatusBarMotionEvent")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { // TODO move this logic to message queue mStatusBarOptionalLazy.ifPresent(statusBarLazy -> { @@ -240,7 +240,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("onOverviewShown")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> { for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) { @@ -257,7 +257,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("getNonMinimizedSplitScreenSecondaryBounds")) { return null; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return mSplitScreenOptional.map(splitScreen -> splitScreen.getDividerView().getNonMinimizedSplitScreenSecondaryBounds()) @@ -272,7 +272,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("setNavBarButtonAlpha")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mNavBarButtonAlpha = alpha; mHandler.post(() -> notifyNavBarButtonAlphaChanged(alpha, animate)); @@ -291,7 +291,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("onAssistantProgress")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> notifyAssistantProgress(progress)); } finally { @@ -304,7 +304,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("onAssistantGestureCompletion")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> notifyAssistantGestureCompletion(velocity)); } finally { @@ -317,7 +317,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("startAssistant")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> notifyStartAssistant(bundle)); } finally { @@ -330,7 +330,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("monitorGestureInput")) { return null; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { final InputMonitor monitor = InputManager.getInstance().monitorGestureInput(name, displayId); @@ -348,7 +348,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("notifyAccessibilityButtonClicked")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { AccessibilityManager.getInstance(mContext) .notifyAccessibilityButtonClicked(displayId); @@ -362,7 +362,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("notifyAccessibilityButtonLongClicked")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { final Intent intent = new Intent(AccessibilityManager.ACTION_CHOOSE_ACCESSIBILITY_BUTTON); @@ -382,7 +382,7 @@ public class OverviewProxyService extends CurrentUserTracker implements "ByPass setShelfHeight, FEATURE_PICTURE_IN_PICTURE:" + mHasPipFeature); return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mPipOptional.ifPresent( pip -> pip.setShelfHeight(visible, shelfHeight)); @@ -410,7 +410,7 @@ public class OverviewProxyService extends CurrentUserTracker implements + mHasPipFeature); return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mPipOptional.ifPresent( pip -> pip.setPinnedStackAnimationType( @@ -428,7 +428,7 @@ public class OverviewProxyService extends CurrentUserTracker implements return; } mIPinnedStackAnimationListener = listener; - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mPipOptional.ifPresent( pip -> pip.setPinnedStackAnimationListener(mPinnedStackAnimationCallback)); @@ -442,7 +442,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("onQuickSwitchToNewTask")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> notifyQuickSwitchToNewTask(rotation)); } finally { @@ -455,7 +455,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("startOneHandedMode")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mOneHandedOptional.ifPresent(oneHanded -> oneHanded.startOneHanded()); } finally { @@ -468,7 +468,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("stopOneHandedMode")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mOneHandedOptional.ifPresent(oneHanded -> oneHanded.stopOneHanded( OneHandedEvents.EVENT_ONE_HANDED_TRIGGER_GESTURE_OUT)); @@ -497,7 +497,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("expandNotificationPanel")) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mCommandQueue.handleSystemKey(KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN); } finally { @@ -512,7 +512,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("startSwipePipToHome") || !mHasPipFeature) { return null; } - long binderToken = Binder.clearCallingIdentity(); + final long binderToken = Binder.clearCallingIdentity(); try { return mPipOptional.map(pip -> pip.startSwipePipToHome(componentName, activityInfo, @@ -528,7 +528,7 @@ public class OverviewProxyService extends CurrentUserTracker implements if (!verifyCaller("stopSwipePipToHome") || !mHasPipFeature) { return; } - long binderToken = Binder.clearCallingIdentity(); + final long binderToken = Binder.clearCallingIdentity(); try { mPipOptional.ifPresent(pip -> pip.stopSwipePipToHome( componentName, destinationBounds)); diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java index 41f32075fb77..d7664312e2e6 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilitySecurityPolicy.java @@ -456,7 +456,7 @@ public class AccessibilitySecurityPolicy { } private boolean isShellAllowedToRetrieveWindowLocked(int userId, int windowId) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { IBinder windowToken = mAccessibilityWindowManager .getWindowTokenForUserAndWindowIdLocked(userId, windowId); diff --git a/services/accessibility/java/com/android/server/accessibility/FingerprintGestureDispatcher.java b/services/accessibility/java/com/android/server/accessibility/FingerprintGestureDispatcher.java index 96418aac7ffa..c9ec16edc54e 100644 --- a/services/accessibility/java/com/android/server/accessibility/FingerprintGestureDispatcher.java +++ b/services/accessibility/java/com/android/server/accessibility/FingerprintGestureDispatcher.java @@ -118,7 +118,7 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba public boolean isFingerprintGestureDetectionAvailable() { if (!mHardwareSupportsGestures) return false; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return !mFingerprintService.isClientActive(); } catch (RemoteException re) { @@ -173,7 +173,7 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba @Override public boolean handleMessage(Message message) { if (message.what == MSG_REGISTER) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mFingerprintService.addClientActiveCallback(this); mRegisteredReadOnlyExceptInHandler = true; @@ -184,7 +184,7 @@ public class FingerprintGestureDispatcher extends IFingerprintClientActiveCallba } return false; } else if (message.what == MSG_UNREGISTER) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mFingerprintService.removeClientActiveCallback(this); } catch (RemoteException re) { diff --git a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java index 59ba82e4616a..e9a099ae43a9 100644 --- a/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java +++ b/services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java @@ -189,7 +189,7 @@ public class AppPredictionManagerService extends throw new SecurityException(msg); } - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mLock) { final AppPredictionPerUserService service = getServiceForUserLocked(userId); diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 060d0971e391..824653d93bca 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -2408,7 +2408,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds); intent.setComponent(provider.info.provider); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { provider.broadcast = PendingIntent.getBroadcastAsUser(mContext, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT, provider.info.getProfile()); @@ -3616,7 +3616,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } private boolean isProfileWithLockedParent(int userId) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { UserInfo userInfo = mUserManager.getUserInfo(userId); if (userInfo != null && userInfo.isManagedProfile()) { diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 186812bc15c7..81f4798aa860 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -478,7 +478,7 @@ public class BackupManagerService extends IBackupManager.Stub { if (getUserManager().isUserUnlocked(userId)) { // Clear calling identity as initialization enforces the system identity but we // can be coming from shell. - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { startServiceForUser(userId); } finally { @@ -1412,7 +1412,7 @@ public class BackupManagerService extends IBackupManager.Stub { return null; } int callingUserId = Binder.getCallingUserHandle().getIdentifier(); - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); final int[] userIds; try { userIds = getUserManager().getProfileIds(callingUserId, false); diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index e68c07ed73f7..b6659cb31128 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -2889,7 +2889,7 @@ public class UserBackupManagerService { mBackupHandler.sendMessageDelayed(msg, TRANSPORT_RETRY_INTERVAL); return; } - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); OnTaskFinishedListener listener = caller -> mTransportManager.disposeOfTransportClient(transportClient, caller); @@ -2910,7 +2910,7 @@ public class UserBackupManagerService { public void backupNow() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP, "backupNow"); - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { final PowerSaveState result = mPowerManager.getPowerSaveState(ServiceType.KEYVALUE_BACKUP); @@ -2999,7 +2999,7 @@ public class UserBackupManagerService { } } - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { if (!mSetupComplete) { Slog.i(TAG, addUserIdToLogMessage(mUserId, "Backup not supported before setup")); @@ -3156,7 +3156,7 @@ public class UserBackupManagerService { throw new IllegalStateException("Restore supported only for the device owner"); } - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { if (!mSetupComplete) { @@ -3287,7 +3287,7 @@ public class UserBackupManagerService { mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "acknowledgeAdbBackupOrRestore"); - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { AdbParams params; @@ -3348,7 +3348,7 @@ public class UserBackupManagerService { Slog.i(TAG, addUserIdToLogMessage(mUserId, "Backup enabled => " + enable)); - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { boolean wasEnabled = mEnabled; synchronized (this) { @@ -3477,7 +3477,7 @@ public class UserBackupManagerService { public ComponentName getCurrentTransportComponent() { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "getCurrentTransportComponent"); - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { return mTransportManager.getCurrentTransportComponent(); } catch (TransportNotRegisteredException e) { @@ -4165,7 +4165,7 @@ public class UserBackupManagerService { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "isAppEligibleForBackup"); - long oldToken = Binder.clearCallingIdentity(); + final long oldToken = Binder.clearCallingIdentity(); try { String callerLogString = "BMS.isAppEligibleForBackup"; TransportClient transportClient = @@ -4187,7 +4187,7 @@ public class UserBackupManagerService { mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "filterAppsEligibleForBackup"); - long oldToken = Binder.clearCallingIdentity(); + final long oldToken = Binder.clearCallingIdentity(); try { String callerLogString = "BMS.filterAppsEligibleForBackup"; TransportClient transportClient = @@ -4221,7 +4221,7 @@ public class UserBackupManagerService { /** Prints service state for 'dumpsys backup'. */ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); try { if (args != null) { for (String arg : args) { diff --git a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java index 3102b5f4a04d..602dc24541b2 100644 --- a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java +++ b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java @@ -98,7 +98,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { TransportClient transportClient = mTransportManager.getTransportClient( @@ -173,7 +173,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { synchronized (mBackupManagerService.getQueueLock()) { for (int i = 0; i < mRestoreSets.length; i++) { if (token == mRestoreSets[i].token) { - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { return sendRestoreToHandlerLocked( (transportClient, listener) -> @@ -265,7 +265,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { synchronized (mBackupManagerService.getQueueLock()) { for (int i = 0; i < mRestoreSets.length; i++) { if (token == mRestoreSets[i].token) { - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { return sendRestoreToHandlerLocked( (transportClient, listener) -> @@ -341,7 +341,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { } // So far so good; we're allowed to try to restore this package. - long oldId = Binder.clearCallingIdentity(); + final long oldId = Binder.clearCallingIdentity(); try { // Check whether there is data for it in the current dataset, falling back // to the ancestral dataset if not. diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 40b171869cf2..61570043de16 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -408,7 +408,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind PackageItemInfo.SAFE_LABEL_FLAG_TRIM | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE) .toString()); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return PendingIntent.getActivityAsUser(getContext(), 0 /* request code */, diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index d92706d2dd19..9455051ad740 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -916,7 +916,7 @@ public final class BatteryService extends SystemService { mHealthInfo.chargerAcOnline = false; mHealthInfo.chargerUsbOnline = false; mHealthInfo.chargerWirelessOnline = false; - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mUpdatesStopped = true; processValuesFromShellLocked(pw, opts); @@ -979,7 +979,7 @@ public final class BatteryService extends SystemService { break; } if (update) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mUpdatesStopped = true; processValuesFromShellLocked(pw, opts); @@ -996,7 +996,7 @@ public final class BatteryService extends SystemService { int opts = parseOptions(shell); getContext().enforceCallingOrSelfPermission( android.Manifest.permission.DEVICE_POWER, null); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (mUpdatesStopped) { mUpdatesStopped = false; diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 4e405cc7f7ea..011231c016e2 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -604,7 +604,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { Slog.d(TAG, "Persisting Bluetooth Setting: " + value); } // waive WRITE_SECURE_SETTINGS permission check - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLUETOOTH_ON, value); Binder.restoreCallingIdentity(callingIdentity); } @@ -2378,7 +2378,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { int foregroundUser; int callingUser = UserHandle.getCallingUserId(); int callingUid = Binder.getCallingUid(); - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE); UserInfo ui = um.getProfileParent(callingUser); int parentUser = (ui != null) ? ui.id : UserHandle.USER_NULL; @@ -2605,7 +2605,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } private boolean isBluetoothDisallowed() { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { return mContext.getSystemService(UserManager.class) .hasUserRestriction(UserManager.DISALLOW_BLUETOOTH, UserHandle.SYSTEM); diff --git a/services/core/java/com/android/server/MmsServiceBroker.java b/services/core/java/com/android/server/MmsServiceBroker.java index 1804b7f66fa2..593c406ed47b 100644 --- a/services/core/java/com/android/server/MmsServiceBroker.java +++ b/services/core/java/com/android/server/MmsServiceBroker.java @@ -511,7 +511,7 @@ public class MmsServiceBroker extends SystemService { contentUri = ContentProvider.maybeAddUserId(contentUri, callingUserId); } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { final UriGrantsManagerInternal ugm = LocalServices .getService(UriGrantsManagerInternal.class); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 7775354a8077..ab933a8c2be8 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1742,7 +1742,7 @@ class StorageManagerService extends IStorageManager.Stub UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE); final int callingUserId = UserHandle.getCallingUserId(); boolean isAdmin; - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { isAdmin = um.getUserInfo(callingUserId).isAdmin(); } finally { diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index ba2e147a2acf..b6a3e234ebe9 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -2418,7 +2418,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { public static final String ACTION_SIGNAL_STRENGTH_CHANGED = "android.intent.action.SIG_STR"; private void broadcastServiceStateChanged(ServiceState state, int phoneId, int subId) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mBatteryStats.notePhoneState(state.getState()); } catch (RemoteException re) { @@ -2442,7 +2442,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { private void broadcastSignalStrengthChanged(SignalStrength signalStrength, int phoneId, int subId) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mBatteryStats.notePhoneSignalStrength(signalStrength); } catch (RemoteException e) { @@ -2487,7 +2487,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { */ private void broadcastCallStateChanged(int state, String incomingNumber, int phoneId, int subId) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (state == TelephonyManager.CALL_STATE_IDLE) { mBatteryStats.notePhoneOff(); @@ -2676,7 +2676,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { private boolean validateEventsAndUserLocked(Record r, int events) { int foregroundUser; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); boolean valid = false; try { foregroundUser = ActivityManager.getCurrentUser(); diff --git a/services/core/java/com/android/server/UpdateLockService.java b/services/core/java/com/android/server/UpdateLockService.java index 06f73e28829e..38bbbdf742df 100644 --- a/services/core/java/com/android/server/UpdateLockService.java +++ b/services/core/java/com/android/server/UpdateLockService.java @@ -74,7 +74,7 @@ public class UpdateLockService extends IUpdateLock.Stub { void sendLockChangedBroadcast(boolean state) { // Safe early during boot because this broadcast only goes to registered receivers. - long oldIdent = Binder.clearCallingIdentity(); + final long oldIdent = Binder.clearCallingIdentity(); try { Intent intent = new Intent(UpdateLock.UPDATE_LOCK_CHANGED) .putExtra(UpdateLock.NOW_IS_CONVENIENT, state) diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index cb6f616f5078..7e7b403c95b9 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -845,7 +845,7 @@ public class VibratorService extends IVibratorService.Stub return; } linkVibration(vib); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { doCancelVibrateLocked(); startVibrationLocked(vib); @@ -897,7 +897,7 @@ public class VibratorService extends IVibratorService.Stub if (DEBUG) { Slog.d(TAG, "Canceling vibration."); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { doCancelVibrateLocked(); } finally { diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index aaff831aeb96..5ddc0b846dd9 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -477,7 +477,7 @@ public class AccountManagerService * TODO: Only allow accounts that were shared to be added by a limited user. */ // fails if the account already exists - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return addAccountInternal(accounts, account, password, extras, callingUid, @@ -506,7 +506,7 @@ public class AccountManagerService managedTypes.add(accountType); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return getAccountsAndVisibilityForPackage(packageName, managedTypes, callingUid, @@ -555,7 +555,7 @@ public class AccountManagerService throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); synchronized (accounts.dbLock) { @@ -604,7 +604,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); if (AccountManager.PACKAGE_NAME_KEY_LEGACY_VISIBLE.equals(packageName)) { @@ -664,7 +664,7 @@ public class AccountManagerService Objects.requireNonNull(packageName, "packageName cannot be null"); int uid = -1; try { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { uid = mPackageManager.getPackageUidAsUser(packageName, accounts.userId); } finally { @@ -736,7 +736,7 @@ public class AccountManagerService */ private boolean isPreOApplication(String packageName) { try { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); ApplicationInfo applicationInfo; try { applicationInfo = mPackageManager.getApplicationInfo(packageName, 0); @@ -769,7 +769,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return setAccountVisibility(account, packageName, newVisibility, true /* notify */, @@ -883,7 +883,7 @@ public class AccountManagerService mAppOpsManager.checkPackage(callingUid, opPackageName); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); registerAccountListener(accountTypes, opPackageName, accounts); @@ -916,7 +916,7 @@ public class AccountManagerService int callingUid = Binder.getCallingUid(); mAppOpsManager.checkPackage(callingUid, opPackageName); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); unregisterAccountListener(accountTypes, opPackageName, accounts); @@ -1033,7 +1033,7 @@ public class AccountManagerService private boolean packageExistsForUser(String packageName, int userId) { try { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { mPackageManager.getPackageUidAsUser(packageName, userId); return true; @@ -1499,7 +1499,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return readPasswordInternal(accounts, account); @@ -1534,7 +1534,7 @@ public class AccountManagerService } Objects.requireNonNull(account, "account cannot be null"); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return readPreviousNameInternal(accounts, account); @@ -1584,7 +1584,7 @@ public class AccountManagerService Log.w(TAG, "User " + userId + " data is locked. callingUid " + callingUid); return null; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); if (!accountExistsCache(accounts, account)) { @@ -1679,7 +1679,7 @@ public class AccountManagerService Slog.d(TAG, "Copying account " + account.toSafeString() + " from user " + userFrom + " to user " + userTo); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { new Session(fromAccounts, response, account.type, false, false /* stripAuthTokenFromResult */, account.name, @@ -1737,7 +1737,7 @@ public class AccountManagerService return false; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return updateLastAuthenticatedTime(account); @@ -1759,7 +1759,7 @@ public class AccountManagerService final Bundle accountCredentials, final Account account, final UserAccounts targetUser, final int parentUserId){ Bundle.setDefusable(accountCredentials, true); - long id = clearCallingIdentity(); + final long id = clearCallingIdentity(); try { new Session(targetUser, response, account.type, false, false /* stripAuthTokenFromResult */, account.name, @@ -1926,7 +1926,7 @@ public class AccountManagerService checkReadAccountsPermitted(callingUid, account.type, userId, opPackageName); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new TestFeaturesSession(accounts, response, account, features).bind(); @@ -2010,7 +2010,7 @@ public class AccountManagerService accountToRename.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); Account resultingAccount = renameAccountInternal(accounts, accountToRename, newName); @@ -2193,7 +2193,7 @@ public class AccountManagerService } return; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); UserAccounts accounts = getUserAccounts(userId); cancelNotification(getSigninRequiredNotificationId(accounts, account), user); synchronized(accounts.credentialsPermissionNotificationIds) { @@ -2250,7 +2250,7 @@ public class AccountManagerService accountId, accounts, callingUid); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { return removeAccountInternal(accounts, account, callingUid); } finally { @@ -2367,7 +2367,7 @@ public class AccountManagerService } } } - long id = Binder.clearCallingIdentity(); + final long id = Binder.clearCallingIdentity(); try { int parentUserId = accounts.userId; if (canHaveProfile(parentUserId)) { @@ -2413,7 +2413,7 @@ public class AccountManagerService + ", pid " + Binder.getCallingPid()); } int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); List> deletedTokens; @@ -2537,7 +2537,7 @@ public class AccountManagerService + callingUid); return null; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return readAuthTokenInternal(accounts, account, authTokenType); @@ -2565,7 +2565,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); saveAuthTokenToDatabase(accounts, account, authTokenType, authToken); @@ -2591,7 +2591,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); setPasswordInternal(accounts, account, password, callingUid); @@ -2657,7 +2657,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); setPasswordInternal(accounts, account, null, callingUid); @@ -2685,7 +2685,7 @@ public class AccountManagerService account.type); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); if (!accountExistsCache(accounts, account)) { @@ -2771,7 +2771,7 @@ public class AccountManagerService throw new SecurityException("can only call from system"); } int userId = UserHandle.getUserId(callingUid); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new Session(accounts, response, accountType, false /* expectActivityLaunch */, @@ -2843,7 +2843,7 @@ public class AccountManagerService return; } int userId = UserHandle.getCallingUserId(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); final UserAccounts accounts; final RegisteredServicesCache.ServiceInfo authenticatorInfo; try { @@ -2887,7 +2887,7 @@ public class AccountManagerService loginOptions.putBoolean(AccountManager.KEY_NOTIFY_ON_FAILURE, true); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { // Distill the caller's package signatures into a single digest. final byte[] callerPkgSigDigest = calculatePackageSignatureDigest(callerPkg); @@ -3194,7 +3194,7 @@ public class AccountManagerService options.putInt(AccountManager.KEY_CALLER_PID, pid); int usrId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(usrId); logRecordWithUid( @@ -3275,7 +3275,7 @@ public class AccountManagerService options.putInt(AccountManager.KEY_CALLER_UID, uid); options.putInt(AccountManager.KEY_CALLER_PID, pid); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); logRecordWithUid( @@ -3358,7 +3358,7 @@ public class AccountManagerService boolean isPasswordForwardingAllowed = checkPermissionAndNote( callerPkg, uid, Manifest.permission.GET_PASSWORD); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); logRecordWithUid(accounts, AccountsDb.DEBUG_ACTION_CALLED_START_ACCOUNT_ADD, @@ -3599,7 +3599,7 @@ public class AccountManagerService return; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); logRecordWithUid( @@ -3648,7 +3648,7 @@ public class AccountManagerService if (intent == null) { intent = getDefaultCantAddAccountIntent(errorCode); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { mContext.startActivityAsUser(intent, new UserHandle(userId)); } finally { @@ -3692,7 +3692,7 @@ public class AccountManagerService } if (response == null) throw new IllegalArgumentException("response is null"); if (account == null) throw new IllegalArgumentException("account is null"); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new Session(accounts, response, account.type, expectActivityLaunch, @@ -3729,7 +3729,7 @@ public class AccountManagerService if (response == null) throw new IllegalArgumentException("response is null"); if (account == null) throw new IllegalArgumentException("account is null"); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new Session(accounts, response, account.type, expectActivityLaunch, @@ -3783,7 +3783,7 @@ public class AccountManagerService boolean isPasswordForwardingAllowed = checkPermissionAndNote( callerPkg, uid, Manifest.permission.GET_PASSWORD); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new StartAccountSession( @@ -3839,7 +3839,7 @@ public class AccountManagerService } int usrId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(usrId); new Session(accounts, response, account.type, false /* expectActivityLaunch */, @@ -3924,7 +3924,7 @@ public class AccountManagerService accountType); throw new SecurityException(msg); } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); new Session(accounts, response, accountType, expectActivityLaunch, @@ -4228,7 +4228,7 @@ public class AccountManagerService if (visibleAccountTypes.isEmpty()) { return EMPTY_ACCOUNT_ARRAY; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return getAccountsInternal( @@ -4352,7 +4352,7 @@ public class AccountManagerService } // else aggregate all the visible accounts (it won't matter if the // list is empty). - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts accounts = getUserAccounts(userId); return getAccountsInternal( @@ -4558,7 +4558,7 @@ public class AccountManagerService int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts userAccounts = getUserAccounts(userId); if (ArrayUtils.isEmpty(features)) { @@ -4636,7 +4636,7 @@ public class AccountManagerService return; } - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { UserAccounts userAccounts = getUserAccounts(userId); if (features == null || features.length == 0) { @@ -4781,7 +4781,7 @@ public class AccountManagerService | Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)); - long bid = Binder.clearCallingIdentity(); + final long bid = Binder.clearCallingIdentity(); try { PackageManager pm = mContext.getPackageManager(); ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mAccounts.userId); @@ -5281,7 +5281,7 @@ public class AccountManagerService private void doNotification(UserAccounts accounts, Account account, CharSequence message, Intent intent, String packageName, final int userId) { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "doNotification: " + message + " intent:" + intent); @@ -5340,7 +5340,7 @@ public class AccountManagerService } private void cancelNotification(NotificationId id, String packageName, UserHandle user) { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { INotificationManager service = mInjector.getNotificationManager(); service.cancelNotificationWithTag( @@ -5409,7 +5409,7 @@ public class AccountManagerService private boolean isPrivileged(int callingUid) { String[] packages; - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); try { packages = mPackageManager.getPackagesForUid(callingUid); if (packages == null) { @@ -5501,7 +5501,7 @@ public class AccountManagerService if (accountType == null) { return false; } - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); Collection> serviceInfos; try { serviceInfos = mAuthenticatorCache.getAllServices(userId); @@ -5530,7 +5530,7 @@ public class AccountManagerService return SIGNATURE_CHECK_MISMATCH; } - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); Collection> serviceInfos; try { serviceInfos = mAuthenticatorCache.getAllServices(userId); @@ -5576,7 +5576,7 @@ public class AccountManagerService private List getTypesForCaller( int callingUid, int userId, boolean isOtherwisePermitted) { List managedAccountTypes = new ArrayList<>(); - long identityToken = Binder.clearCallingIdentity(); + final long identityToken = Binder.clearCallingIdentity(); Collection> serviceInfos; try { serviceInfos = mAuthenticatorCache.getAllServices(userId); @@ -5659,7 +5659,7 @@ public class AccountManagerService private boolean isSystemUid(int callingUid) { String[] packages = null; - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { packages = mPackageManager.getPackagesForUid(callingUid); if (packages != null) { @@ -6188,7 +6188,7 @@ public class AccountManagerService final int uid; try { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { uid = mPackageManager.getPackageUidAsUser(packageName, userId); } finally { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 1fe0012615da..74cbeba46370 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -3356,7 +3356,7 @@ public class ActivityManagerService extends IActivityManager.Stub final ApplicationInfo appInfo; final boolean isInstantApp; - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { IPackageManager pm = AppGlobals.getPackageManager(); synchronized(this) { @@ -3497,7 +3497,7 @@ public class ActivityManagerService extends IActivityManager.Stub userId, true, ALLOW_FULL_ONLY, "killBackgroundProcesses", null); final int[] userIds = mUserController.expandUserId(userId); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { IPackageManager pm = AppGlobals.getPackageManager(); for (int targetUserId : userIds) { @@ -3596,7 +3596,7 @@ public class ActivityManagerService extends IActivityManager.Stub final int callingPid = Binder.getCallingPid(); userId = mUserController.handleIncomingUser(callingPid, Binder.getCallingUid(), userId, true, ALLOW_FULL_ONLY, "forceStopPackage", null); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { IPackageManager pm = AppGlobals.getPackageManager(); synchronized(this) { @@ -6155,7 +6155,7 @@ public class ActivityManagerService extends IActivityManager.Stub enforceCallingPermission(android.Manifest.permission.SET_DEBUG_APP, "setDebugApp()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { // Note that this is not really thread safe if there are multiple // callers into it at the same time, but that's not a situation we @@ -6256,7 +6256,7 @@ public class ActivityManagerService extends IActivityManager.Stub enforceCallingPermission(android.Manifest.permission.SET_ALWAYS_FINISH, "setAlwaysFinish()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Settings.Global.putInt( mContext.getContentResolver(), @@ -7022,7 +7022,7 @@ public class ActivityManagerService extends IActivityManager.Stub + android.Manifest.permission.FORCE_STOP_PACKAGES); } int callerUid = Binder.getCallingUid(); - long iden = Binder.clearCallingIdentity(); + final long iden = Binder.clearCallingIdentity(); try { mProcessList.killProcessesWhenImperceptible(pids, reason, callerUid); } finally { @@ -7407,7 +7407,7 @@ public class ActivityManagerService extends IActivityManager.Stub t.traceBegin("sendUserStartBroadcast"); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Intent intent = new Intent(Intent.ACTION_USER_STARTED); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY @@ -8171,7 +8171,7 @@ public class ActivityManagerService extends IActivityManager.Stub */ int enforceDumpPermissionForPackage(String packageName, int userId, int callingUid, String function) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); int uid = Process.INVALID_UID; try { uid = mPackageManagerInt.getPackageUid(packageName, @@ -8431,7 +8431,7 @@ public class ActivityManagerService extends IActivityManager.Stub } } - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); if (useProto) { final ProtoOutputStream proto = new ProtoOutputStream(fd); @@ -12699,7 +12699,7 @@ public class ActivityManagerService extends IActivityManager.Stub } } - long oldIdent = Binder.clearCallingIdentity(); + final long oldIdent = Binder.clearCallingIdentity(); try { IBackupManager bm = IBackupManager.Stub.asInterface( ServiceManager.getService(Context.BACKUP_SERVICE)); @@ -15060,7 +15060,7 @@ public class ActivityManagerService extends IActivityManager.Stub final int callingPid = Binder.getCallingPid(); userId = mUserController.handleIncomingUser(callingPid, Binder.getCallingUid(), userId, true, ALLOW_FULL_ONLY, "makePackageIdle", null); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); synchronized(this) { try { IPackageManager pm = AppGlobals.getPackageManager(); @@ -16752,7 +16752,7 @@ public class ActivityManagerService extends IActivityManager.Stub "Cannot kill the dependents of a package without its name."); } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); IPackageManager pm = AppGlobals.getPackageManager(); int pkgUid = -1; try { diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 3f55bffc1f3e..138f998394d6 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -546,7 +546,7 @@ class AppErrors { } } if (res == AppErrorDialog.FORCE_QUIT) { - long orig = Binder.clearCallingIdentity(); + final long orig = Binder.clearCallingIdentity(); try { // Kill it with fire! mService.mAtmInternal.onHandleAppCrash(r.getWindowProcessController()); diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java index 374c215fc6d0..20cad185d8d0 100644 --- a/services/core/java/com/android/server/am/AppExitInfoTracker.java +++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java @@ -503,7 +503,7 @@ public final class AppExitInfoTracker { @VisibleForTesting void getExitInfo(final String packageName, final int filterUid, final int filterPid, final int maxNum, final ArrayList results) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mLock) { boolean emptyPackageName = TextUtils.isEmpty(packageName); diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 76125aabc978..3eb4ddebaf06 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -2090,7 +2090,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub return; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (BatteryStatsHelper.checkWifiOnly(mContext)) { flags |= BatteryStats.DUMP_DEVICE_WIFI_ONLY; @@ -2250,7 +2250,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BATTERY_STATS, null); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { // Wait for the completion of pending works if there is any awaitCompletion(); @@ -2277,7 +2277,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub mContext.enforceCallingOrSelfPermission( android.Manifest.permission.BATTERY_STATS, null); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); int i=-1; try { // Wait for the completion of pending works if there is any diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java index 1155569c6b36..950f0a0f56a3 100644 --- a/services/core/java/com/android/server/am/ContentProviderHelper.java +++ b/services/core/java/com/android/server/am/ContentProviderHelper.java @@ -682,7 +682,7 @@ public class ContentProviderHelper { */ void removeContentProvider(IBinder connection, boolean stable) { mService.enforceNotIsolatedCaller("removeContentProvider"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mService) { ContentProviderConnection conn; @@ -711,7 +711,7 @@ public class ContentProviderHelper { mService.enforceCallingPermission( android.Manifest.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY, "Do not have permission in call removeContentProviderExternal()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { removeContentProviderExternalUnchecked(name, token, userId); } finally { diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index ebc5b59363df..fbcfcf949d18 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -887,7 +887,7 @@ class ProcessRecord implements WindowProcessListener { Slog.w(TAG, "scheduleCrash: trying to crash system process!"); return; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { thread.scheduleCrash(message); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/am/ProcessStatsService.java b/services/core/java/com/android/server/am/ProcessStatsService.java index d925defdbc73..c10a07862123 100644 --- a/services/core/java/com/android/server/am/ProcessStatsService.java +++ b/services/core/java/com/android/server/am/ProcessStatsService.java @@ -855,7 +855,7 @@ public final class ProcessStatsService extends IProcessStats.Stub { if (!com.android.internal.util.DumpUtils.checkDumpAndUsageStatsPermission(mAm.mContext, TAG, pw)) return; - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { if (args.length > 0) { if ("--proto".equals(args[0])) { diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 6c088262a7bf..f1bad9819394 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -1814,7 +1814,7 @@ class UserController implements Handler.Callback { void sendUserSwitchBroadcasts(int oldUserId, int newUserId) { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Intent intent; if (oldUserId >= 0) { diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 7dbb39e3cb39..53a27941573e 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -2356,7 +2356,7 @@ public class AppOpsService extends IAppOpsService.Stub { + permissionInfo.backgroundPermission); } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { packageManager.updatePermissionFlags(permissionInfo.backgroundPermission, packageName, PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, @@ -2380,7 +2380,7 @@ public class AppOpsService extends IAppOpsService.Stub { + switchCode + ", mode=" + mode + ", permission=" + permissionName); } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { packageManager.updatePermissionFlags(permissionName, packageName, PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, isRevokedCompat @@ -3261,7 +3261,7 @@ public class AppOpsService extends IAppOpsService.Stub { int callingUid = Binder.getCallingUid(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { synchronized (this) { Pair key = getAsyncNotedOpsKey(packageName, uid); @@ -4937,7 +4937,7 @@ public class AppOpsService extends IAppOpsService.Stub { case "write-settings": { shell.mInternal.enforceManageAppOpsModes(Binder.getCallingPid(), Binder.getCallingUid(), -1); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { synchronized (shell.mInternal) { shell.mInternal.mHandler.removeCallbacks(shell.mInternal.mWriteRunner); @@ -4952,7 +4952,7 @@ public class AppOpsService extends IAppOpsService.Stub { case "read-settings": { shell.mInternal.enforceManageAppOpsModes(Binder.getCallingPid(), Binder.getCallingUid(), -1); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { shell.mInternal.readState(); pw.println("Last settings read."); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 7ad0f21c2f69..ff6367b96626 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -9384,7 +9384,7 @@ public class AudioService extends IAudioService.Stub if (DEBUG_VOL) { Log.d(TAG, "Persisting Volume Behavior for DeviceType: " + deviceType); } - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { System.putIntForUser(mContentResolver, getSettingsNameForDeviceVolumeBehavior(deviceType), diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index a45d94bfc002..b3e9c402d9af 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -966,7 +966,7 @@ public class Vpn { /** Prepare the VPN for the given package. Does not perform permission checks. */ @GuardedBy("this") private void prepareInternal(String newPackage) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { // Reset the interface. if (mInterface != null) { @@ -1251,7 +1251,7 @@ public class Vpn { mNetworkCapabilities.setAdministratorUids(new int[] {mOwnerUID}); mNetworkCapabilities.setUids(createUserAndRestrictedProfilesRanges(mUserId, mConfig.allowedApplications, mConfig.disallowedApplications)); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mNetworkAgent = new NetworkAgent(mLooper, mContext, NETWORKTYPE /* logtag */, mNetworkInfo, mNetworkCapabilities, lp, @@ -1270,7 +1270,7 @@ public class Vpn { } private boolean canHaveRestrictedProfile(int userId) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return UserManager.get(mContext).canHaveRestrictedProfile(userId); } finally { @@ -1317,7 +1317,7 @@ public class Vpn { // Check if the service is properly declared. Intent intent = new Intent(VpnConfig.SERVICE_INTERFACE); intent.setClassName(mPackage, config.user); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { // Restricted users are not allowed to create VPNs, they are tied to Owner enforceNotRestrictedUser(); @@ -2045,7 +2045,7 @@ public class Vpn { */ public void startLegacyVpn(VpnProfile profile, KeyStore keyStore, LinkProperties egress) { enforceControlPermission(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { startLegacyVpnPrivileged(profile, keyStore, egress); } finally { diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java index 1294e9030f62..a2c427b8036a 100644 --- a/services/core/java/com/android/server/content/ContentService.java +++ b/services/core/java/com/android/server/content/ContentService.java @@ -596,7 +596,7 @@ public final class ContentService extends IContentService.Stub { // This makes it so that future permission checks will be in the context of this // process rather than the caller's process. We will restore this before returning. - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -650,7 +650,7 @@ public final class ContentService extends IContentService.Stub { // This makes it so that future permission checks will be in the context of this // process rather than the caller's process. We will restore this before returning. - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager == null) { @@ -718,7 +718,7 @@ public final class ContentService extends IContentService.Stub { "no permission to modify the sync settings for user " + userId); // This makes it so that future permission checks will be in the context of this // process rather than the caller's process. We will restore this before returning. - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); if (cname != null) { Slog.e(TAG, "cname not null."); return; @@ -751,7 +751,7 @@ public final class ContentService extends IContentService.Stub { Bundle extras = new Bundle(request.getBundle()); validateExtras(callingUid, extras); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncStorageEngine.EndPoint info; @@ -834,7 +834,7 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_SETTINGS, "no permission to read the sync settings"); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -866,7 +866,7 @@ public final class ContentService extends IContentService.Stub { final int callingPid = Binder.getCallingPid(); final int syncExemptionFlag = getSyncExemptionForCaller(callingUid); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -899,7 +899,7 @@ public final class ContentService extends IContentService.Stub { pollFrequency = clampPeriod(pollFrequency); long defaultFlex = SyncStorageEngine.calculateDefaultFlexTime(pollFrequency); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncStorageEngine.EndPoint info = new SyncStorageEngine.EndPoint(account, authority, userId); @@ -927,7 +927,7 @@ public final class ContentService extends IContentService.Stub { final int callingUid = Binder.getCallingUid(); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { getSyncManager() .removePeriodicSync( @@ -951,7 +951,7 @@ public final class ContentService extends IContentService.Stub { "no permission to read the sync settings"); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { return getSyncManager().getPeriodicSyncs( new SyncStorageEngine.EndPoint(account, providerName, userId)); @@ -976,7 +976,7 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_SETTINGS, "no permission to read the sync settings"); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -1012,7 +1012,7 @@ public final class ContentService extends IContentService.Stub { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -1040,7 +1040,7 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_SETTINGS, "no permission to read the sync settings"); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -1067,7 +1067,7 @@ public final class ContentService extends IContentService.Stub { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null) { @@ -1084,7 +1084,7 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS, "no permission to read the sync stats"); int userId = UserHandle.getCallingUserId(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager == null) { @@ -1116,7 +1116,7 @@ public final class ContentService extends IContentService.Stub { final boolean canAccessAccounts = mContext.checkCallingOrSelfPermission(Manifest.permission.GET_ACCOUNTS) == PackageManager.PERMISSION_GRANTED; - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { return getSyncManager().getSyncStorageEngine() .getCurrentSyncsCopy(userId, canAccessAccounts); @@ -1146,7 +1146,7 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS, "no permission to read the sync stats"); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager == null) { @@ -1176,7 +1176,7 @@ public final class ContentService extends IContentService.Stub { "no permission to read the sync stats"); enforceCrossUserPermission(userId, "no permission to retrieve the sync settings for user " + userId); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); SyncManager syncManager = getSyncManager(); if (syncManager == null) return false; @@ -1196,7 +1196,7 @@ public final class ContentService extends IContentService.Stub { @Override public void addStatusChangeListener(int mask, ISyncStatusObserver callback) { final int callingUid = Binder.getCallingUid(); - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null && callback != null) { @@ -1210,7 +1210,7 @@ public final class ContentService extends IContentService.Stub { @Override public void removeStatusChangeListener(ISyncStatusObserver callback) { - long identityToken = clearCallingIdentity(); + final long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); if (syncManager != null && callback != null) { diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index 91fa15a913a3..c686ba4c4b5c 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -2773,7 +2773,7 @@ public class SyncManager { } private void onReady() { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mOnReadyCallback.onReady(); } finally { diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index a60a676cfa95..27bd0563cea5 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -2240,7 +2240,7 @@ public class HdmiControlService extends SystemService { @Override public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) { enforceAccessPermission(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { HdmiControlService.this.setHdmiCecVolumeControlEnabled( isHdmiCecVolumeControlEnabled); diff --git a/services/core/java/com/android/server/inputmethod/InputContentUriTokenHandler.java b/services/core/java/com/android/server/inputmethod/InputContentUriTokenHandler.java index 845fca1127dd..78c414452ddd 100644 --- a/services/core/java/com/android/server/inputmethod/InputContentUriTokenHandler.java +++ b/services/core/java/com/android/server/inputmethod/InputContentUriTokenHandler.java @@ -73,7 +73,7 @@ final class InputContentUriTokenHandler extends IInputContentUriToken.Stub { } private void doTakeLocked(@NonNull IBinder permissionOwner) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { try { UriGrantsManager.getService().grantUriPermissionFromOwner( diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 2eccaf1434b4..aa4936d9fa61 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -1517,7 +1517,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub @Override public void sessionCreated(IInputMethodSession session) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mParentIMMS.onSessionCreated(mMethod, session, mChannel); } finally { @@ -4174,7 +4174,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!calledWithValidTokenLocked(token)) { return; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { hideCurrentInputLocked( mLastImeTargetWindow, flags, null, @@ -4192,7 +4192,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!calledWithValidTokenLocked(token)) { return; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { showCurrentInputLocked(mLastImeTargetWindow, flags, null, SoftInputShowHideReason.SHOW_MY_SOFT_INPUT); diff --git a/services/core/java/com/android/server/location/AbstractLocationProvider.java b/services/core/java/com/android/server/location/AbstractLocationProvider.java index 56982a81f83b..bd2676e60825 100644 --- a/services/core/java/com/android/server/location/AbstractLocationProvider.java +++ b/services/core/java/com/android/server/location/AbstractLocationProvider.java @@ -222,7 +222,7 @@ public abstract class AbstractLocationProvider { // we know that we only updated the state, so the listener for the old state is the same as // the listener for the new state. if (oldInternalState.listener != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { oldInternalState.listener.onStateChanged(oldInternalState.state, newState); } finally { @@ -246,7 +246,7 @@ public abstract class AbstractLocationProvider { // we know that we only updated the state, so the listener for the old state is the same as // the listener for the new state. if (oldInternalState.listener != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { oldInternalState.listener.onStateChanged(oldInternalState.state, newState); } finally { @@ -305,7 +305,7 @@ public abstract class AbstractLocationProvider { protected void reportLocation(Location location) { Listener listener = mInternalState.get().listener; if (listener != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // copy location so if provider makes further changes they do not propagate listener.onReportLocation(new Location(location)); @@ -321,7 +321,7 @@ public abstract class AbstractLocationProvider { protected void reportLocation(List locations) { Listener listener = mInternalState.get().listener; if (listener != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // copy location so if provider makes further changes they do not propagate ArrayList copy = new ArrayList<>(locations.size()); diff --git a/services/core/java/com/android/server/location/LocationProviderManager.java b/services/core/java/com/android/server/location/LocationProviderManager.java index ecf82e8f8bd6..3b3c6f0c6cf9 100644 --- a/services/core/java/com/android/server/location/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/LocationProviderManager.java @@ -1232,7 +1232,7 @@ class LocationProviderManager extends mUserHelper.addListener(mUserChangedListener); mSettingsHelper.addOnLocationEnabledChangedListener(mLocationEnabledChangedListener); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // initialize enabled state onUserStarted(UserHandle.USER_ALL); @@ -1249,7 +1249,7 @@ class LocationProviderManager extends mStarted = false; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { onEnabledChanged(UserHandle.USER_ALL); removeRegistrationIf(key -> true); @@ -1317,7 +1317,7 @@ class LocationProviderManager extends synchronized (mLock) { Preconditions.checkState(mStarted); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mProvider.setRealProvider(provider); } finally { @@ -1332,7 +1332,7 @@ class LocationProviderManager extends mLocationEventLog.logProviderMocked(mName, provider != null); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mProvider.setMockProvider(provider); } finally { @@ -1359,7 +1359,7 @@ class LocationProviderManager extends throw new IllegalArgumentException(mName + " provider is not a test provider"); } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mProvider.setMockProviderAllowed(enabled); } finally { @@ -1374,7 +1374,7 @@ class LocationProviderManager extends throw new IllegalArgumentException(mName + " provider is not a test provider"); } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { String locationProvider = location.getProvider(); if (!TextUtils.isEmpty(locationProvider) && !mName.equals(locationProvider)) { @@ -1537,7 +1537,7 @@ class LocationProviderManager extends permissionLevel); synchronized (mLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { addRegistration(callback.asBinder(), registration); if (!registration.isActive()) { @@ -1561,7 +1561,7 @@ class LocationProviderManager extends } public void sendExtraCommand(int uid, int pid, String command, Bundle extras) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mProvider.sendExtraCommand(uid, pid, command, extras); } finally { @@ -1578,7 +1578,7 @@ class LocationProviderManager extends permissionLevel); synchronized (mLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { addRegistration(listener.asBinder(), registration); } finally { @@ -1596,7 +1596,7 @@ class LocationProviderManager extends permissionLevel); synchronized (mLock) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { addRegistration(pendingIntent, registration); } finally { @@ -1607,7 +1607,7 @@ class LocationProviderManager extends public void unregisterLocationRequest(ILocationListener listener) { synchronized (mLock) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { removeRegistration(listener.asBinder()); } finally { @@ -1618,7 +1618,7 @@ class LocationProviderManager extends public void unregisterLocationRequest(PendingIntent pendingIntent) { synchronized (mLock) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { removeRegistration(pendingIntent); } finally { @@ -2394,7 +2394,7 @@ class LocationProviderManager extends return; } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { callback.run(); } catch (RuntimeException e) { diff --git a/services/core/java/com/android/server/location/PassiveLocationProviderManager.java b/services/core/java/com/android/server/location/PassiveLocationProviderManager.java index 2870d41e5248..fc10d5fcf1b7 100644 --- a/services/core/java/com/android/server/location/PassiveLocationProviderManager.java +++ b/services/core/java/com/android/server/location/PassiveLocationProviderManager.java @@ -52,7 +52,7 @@ class PassiveLocationProviderManager extends LocationProviderManager { PassiveProvider passiveProvider = (PassiveProvider) mProvider.getProvider(); Preconditions.checkState(passiveProvider != null); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { passiveProvider.updateLocation(location); } finally { diff --git a/services/core/java/com/android/server/location/geofence/GeofenceManager.java b/services/core/java/com/android/server/location/geofence/GeofenceManager.java index baa01b1506af..c91ee824ff61 100644 --- a/services/core/java/com/android/server/location/geofence/GeofenceManager.java +++ b/services/core/java/com/android/server/location/geofence/GeofenceManager.java @@ -302,7 +302,7 @@ public class GeofenceManager extends CallerIdentity callerIdentity = CallerIdentity.fromBinder(mContext, packageName, attributionTag, AppOpsManager.toReceiverId(pendingIntent)); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { addRegistration(new GeofenceKey(pendingIntent, geofence), new GeofenceRegistration(geofence, callerIdentity, pendingIntent)); @@ -315,7 +315,7 @@ public class GeofenceManager extends * Removes the geofence associated with the PendingIntent. */ public void removeGeofence(PendingIntent pendingIntent) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { removeRegistrationIf(key -> key.getPendingIntent().equals(pendingIntent)); } finally { diff --git a/services/core/java/com/android/server/location/gnss/GnssListenerMultiplexer.java b/services/core/java/com/android/server/location/gnss/GnssListenerMultiplexer.java index 1cdb118f5787..b94f1555cfaa 100644 --- a/services/core/java/com/android/server/location/gnss/GnssListenerMultiplexer.java +++ b/services/core/java/com/android/server/location/gnss/GnssListenerMultiplexer.java @@ -229,7 +229,7 @@ public abstract class GnssListenerMultiplexer value = mCachedValue; if (userId != mCachedUserId) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { String setting = Settings.Secure.getStringForUser(mContext.getContentResolver(), mSettingName, userId); @@ -548,7 +548,7 @@ public class SystemSettingsHelper extends SettingsHelper { } public boolean getValue(boolean defaultValue) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return Settings.Global.getInt(mContext.getContentResolver(), mSettingName, defaultValue ? 1 : 0) != 0; @@ -574,7 +574,7 @@ public class SystemSettingsHelper extends SettingsHelper { } public long getValue(long defaultValue) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return Settings.Global.getLong(mContext.getContentResolver(), mSettingName, defaultValue); @@ -612,7 +612,7 @@ public class SystemSettingsHelper extends SettingsHelper { public synchronized Set getValue() { ArraySet value = mCachedValue; if (!mValid) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { value = new ArraySet<>(mBaseValuesSupplier.get()); String setting = Settings.Global.getString(mContext.getContentResolver(), diff --git a/services/core/java/com/android/server/location/util/SystemUserInfoHelper.java b/services/core/java/com/android/server/location/util/SystemUserInfoHelper.java index e9836aad0472..141afa7eef4c 100644 --- a/services/core/java/com/android/server/location/util/SystemUserInfoHelper.java +++ b/services/core/java/com/android/server/location/util/SystemUserInfoHelper.java @@ -97,7 +97,7 @@ public class SystemUserInfoHelper extends UserInfoHelper { public int[] getRunningUserIds() { IActivityManager activityManager = getActivityManager(); if (activityManager != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return activityManager.getRunningUserIds(); } catch (RemoteException e) { @@ -118,7 +118,7 @@ public class SystemUserInfoHelper extends UserInfoHelper { public boolean isCurrentUserId(@UserIdInt int userId) { ActivityManagerInternal activityManagerInternal = getActivityManagerInternal(); if (activityManagerInternal != null) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return activityManagerInternal.isCurrentProfile(userId); } finally { @@ -136,7 +136,7 @@ public class SystemUserInfoHelper extends UserInfoHelper { // if you're hitting this precondition then you are invoking this before the system is ready Preconditions.checkState(userManager != null); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return userManager.getEnabledProfileIds(userId); } finally { diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 7e53e6f3e2c3..c42c84f75051 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1388,7 +1388,7 @@ public class LockSettingsService extends ILockSettings.Stub { // Now we have unlocked the parent user and attempted to unlock the profile we should // show notifications if the profile is still locked. if (!alreadyUnlocked) { - long ident = clearCallingIdentity(); + final long ident = clearCallingIdentity(); try { maybeShowEncryptionNotificationForUser(profile.id); } finally { @@ -2227,7 +2227,7 @@ public class LockSettingsService extends ILockSettings.Stub { final IStorageManager service = mInjector.getStorageManager(); // TODO(b/120484642): Update vold to return a password as a byte array String password; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { password = service.getPassword(); service.clearPassword(); @@ -3447,7 +3447,7 @@ public class LockSettingsService extends ILockSettings.Stub { @Override public PasswordMetrics getUserPasswordMetrics(int userHandle) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { if (isManagedProfileWithUnifiedLock(userHandle)) { // A managed profile with unified challenge is supposed to be protected by the diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java index 94776f8c7cb4..3ce8e4659737 100644 --- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java +++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java @@ -261,7 +261,7 @@ public final class MediaProjectionManagerService extends SystemService @Override // Binder call public boolean hasProjectionPermission(int uid, String packageName) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); boolean hasPermission = false; try { hasPermission |= checkPermission(packageName, @@ -288,7 +288,7 @@ public final class MediaProjectionManagerService extends SystemService } final UserHandle callingUser = Binder.getCallingUserHandle(); - long callingToken = Binder.clearCallingIdentity(); + final long callingToken = Binder.clearCallingIdentity(); MediaProjection projection; try { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index cab33770c0fc..e6147ab96b61 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -868,7 +868,7 @@ public class NotificationManagerService extends SystemService { (status & StatusBarManager.DISABLE_NOTIFICATION_ALERTS) != 0; if (disableNotificationEffects(null) != null) { // cancel whatever's going on - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { final IRingtonePlayer player = mAudioManager.getRingtonePlayer(); if (player != null) { @@ -1339,7 +1339,7 @@ public class NotificationManagerService extends SystemService { @GuardedBy("mNotificationLock") void clearSoundLocked() { mSoundNotificationKey = null; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { final IRingtonePlayer player = mAudioManager.getRingtonePlayer(); if (player != null) { @@ -1354,7 +1354,7 @@ public class NotificationManagerService extends SystemService { @GuardedBy("mNotificationLock") void clearVibrateLocked() { mVibrateNotificationKey = null; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mVibrator.cancel(); } finally { @@ -2865,7 +2865,7 @@ public class NotificationManagerService extends SystemService { callingUid); final boolean appIsForeground; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { appIsForeground = mActivityManager.getUidImportance(callingUid) == IMPORTANCE_FOREGROUND; @@ -2885,7 +2885,7 @@ public class NotificationManagerService extends SystemService { if (isAppRenderedToast && !isSystemToast && !isPackageInForegroundForToast(pkg, callingUid)) { boolean block; - long id = Binder.clearCallingIdentity(); + final long id = Binder.clearCallingIdentity(); try { // CHANGE_BACKGROUND_CUSTOM_TOAST_BLOCK is gated on targetSdk, so block will be // false for apps with targetSdk < R. For apps with targetSdk R+, text toasts @@ -2911,7 +2911,7 @@ public class NotificationManagerService extends SystemService { synchronized (mToastQueue) { int callingPid = Binder.getCallingPid(); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { ToastRecord record; int index = indexOfToastLocked(pkg, token); @@ -2990,7 +2990,7 @@ public class NotificationManagerService extends SystemService { } synchronized (mToastQueue) { - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { int index = indexOfToastLocked(pkg, token); if (index >= 0) { @@ -3008,7 +3008,7 @@ public class NotificationManagerService extends SystemService { @Override public void finishToken(String pkg, IBinder token) { synchronized (mToastQueue) { - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { int index = indexOfToastLocked(pkg, token); if (index >= 0) { @@ -3950,7 +3950,7 @@ public class NotificationManagerService extends SystemService { public void cancelNotificationsFromListener(INotificationListener token, String[] keys) { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); @@ -3988,7 +3988,7 @@ public class NotificationManagerService extends SystemService { @Override public void requestBindListener(ComponentName component) { checkCallerIsSystemOrSameApp(component.getPackageName()); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { ManagedServices manager = mAssistants.isComponentEnabledForCurrentProfiles(component) @@ -4002,7 +4002,7 @@ public class NotificationManagerService extends SystemService { @Override public void requestUnbindListener(INotificationListener token) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // allow bound services to disable themselves synchronized (mNotificationLock) { @@ -4016,7 +4016,7 @@ public class NotificationManagerService extends SystemService { @Override public void setNotificationsShownFromListener(INotificationListener token, String[] keys) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); @@ -4075,7 +4075,7 @@ public class NotificationManagerService extends SystemService { @Override public void snoozeNotificationUntilContextFromListener(INotificationListener token, String key, String snoozeCriterionId) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); @@ -4094,7 +4094,7 @@ public class NotificationManagerService extends SystemService { @Override public void snoozeNotificationUntilFromListener(INotificationListener token, String key, long duration) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); @@ -4112,7 +4112,7 @@ public class NotificationManagerService extends SystemService { */ @Override public void unsnoozeNotificationFromAssistant(INotificationListener token, String key) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = @@ -4132,7 +4132,7 @@ public class NotificationManagerService extends SystemService { @Override public void unsnoozeNotificationFromSystemListener(INotificationListener token, String key) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = @@ -4159,7 +4159,7 @@ public class NotificationManagerService extends SystemService { String tag, int id) { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { synchronized (mNotificationLock) { final ManagedServiceInfo info = mListeners.checkServiceTokenLocked(token); @@ -4456,7 +4456,7 @@ public class NotificationManagerService extends SystemService { @Override public void requestUnbindProvider(IConditionProvider provider) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // allow bound services to disable themselves final ManagedServiceInfo info = mConditionProviders.checkServiceToken(provider); @@ -4469,7 +4469,7 @@ public class NotificationManagerService extends SystemService { @Override public void requestBindProvider(ComponentName component) { checkCallerIsSystemOrSameApp(component.getPackageName()); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mConditionProviders.setComponentState(component, true); } finally { @@ -5036,7 +5036,7 @@ public class NotificationManagerService extends SystemService { private int getUidForPackageAndUser(String pkg, UserHandle user) throws RemoteException { int uid = 0; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { uid = mPackageManager.getPackageUid(pkg, 0, user.getIdentifier()); } finally { @@ -7111,7 +7111,7 @@ public class NotificationManagerService extends SystemService { boolean delayVibForSound) { // Escalate privileges so we can use the vibrator even if the // notifying app does not have the VIBRATE permission. - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { final VibrationEffect effect; try { @@ -7719,7 +7719,7 @@ public class NotificationManagerService extends SystemService { // vibrate if (canceledKey.equals(mVibrateNotificationKey)) { mVibrateNotificationKey = null; - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mVibrator.cancel(); } @@ -8644,7 +8644,7 @@ public class NotificationManagerService extends SystemService { if (mCompanionManager == null) { return false; } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { List associations = mCompanionManager.getAssociations( info.component.getPackageName(), info.userid); diff --git a/services/core/java/com/android/server/notification/NotificationShellCmd.java b/services/core/java/com/android/server/notification/NotificationShellCmd.java index 927dc25ac6ce..73272a012671 100644 --- a/services/core/java/com/android/server/notification/NotificationShellCmd.java +++ b/services/core/java/com/android/server/notification/NotificationShellCmd.java @@ -133,7 +133,7 @@ public class NotificationShellCmd extends ShellCommand { } String callingPackage = null; final int callingUid = Binder.getCallingUid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { if (callingUid == Process.ROOT_UID) { callingPackage = NotificationManagerService.ROOT_PKG; diff --git a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java index 35170332a077..14affe7b4dd5 100644 --- a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java +++ b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java @@ -302,7 +302,7 @@ public class ScheduleConditionProvider extends SystemConditionProviderService { private void readSnoozed() { synchronized (mSnoozedForAlarm) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { final String setting = Settings.Secure.getStringForUser( mContext.getContentResolver(), diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 9a9e733cb390..f7d69fdc09d2 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -496,7 +496,7 @@ public class SnoozeHelper { private void scheduleRepostAtTime(String pkg, String key, int userId, long time) { Runnable runnable = () -> { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { final PendingIntent pi = createPendingIntent(pkg, key, userId); mAm.cancel(pi); diff --git a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java index a9a4589fdb94..4f75f04b11b6 100644 --- a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java +++ b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java @@ -139,7 +139,7 @@ final class InstantAppResolverConnection implements DeathRecipient { @WorkerThread private IInstantAppResolver getRemoteInstanceLazy(String token) throws ConnectionException, TimeoutException, InterruptedException { - long binderToken = Binder.clearCallingIdentity(); + final long binderToken = Binder.clearCallingIdentity(); try { return bind(token); } finally { diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index 4c1b700d958e..9bb6f7892972 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -261,7 +261,7 @@ public class LauncherAppsService extends SystemService { verifyCallingPackage(callingPackage); List sessionInfos = new ArrayList<>(); int[] userIds = mUm.getEnabledProfileIds(getCallingUserId()); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { for (int userId : userIds) { sessionInfos.addAll(getPackageInstallerService().getAllSessions(userId) @@ -541,7 +541,7 @@ public class LauncherAppsService extends SystemService { } final int callingUid = injectBinderCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); @@ -615,7 +615,7 @@ public class LauncherAppsService extends SystemService { } final int callingUid = injectBinderCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); @@ -649,7 +649,7 @@ public class LauncherAppsService extends SystemService { } final int callingUid = injectBinderCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); @@ -928,7 +928,7 @@ public class LauncherAppsService extends SystemService { } final int callingUid = injectBinderCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final int state = mIPM.getComponentEnabledSetting(component, user.getIdentifier()); switch (state) { @@ -999,7 +999,7 @@ public class LauncherAppsService extends SystemService { boolean canLaunch = false; final int callingUid = injectBinderCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); @@ -1050,7 +1050,7 @@ public class LauncherAppsService extends SystemService { } final Intent intent; - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { String packageName = component.getPackageName(); intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 31ee59717dba..b9893f1a85d9 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -980,7 +980,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } else if (canSilentlyInstallPackage) { // Allow the device owner and affiliated profile owner to silently delete packages // Need to clear the calling identity to get DELETE_PACKAGES permission - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mPm.deletePackageVersioned(versionedPackage, adapter.getBinder(), userId, flags); } finally { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 0f9a5cc331a0..9f1df735693f 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -5699,7 +5699,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { PackageInfo packageInfo = getPackageInfoVersioned(declaringPackage, flags | PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId); @@ -7632,7 +7632,7 @@ public class PackageManagerService extends IPackageManager.Stub } private boolean isUserEnabled(int userId) { - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { UserInfo userInfo = mUserManager.getUserInfo(userId); return userInfo != null && userInfo.isEnabled(); @@ -8043,7 +8043,7 @@ public class PackageManagerService extends IPackageManager.Stub private ResolveInfo createForwardingResolveInfoUnchecked(IntentFilter filter, int sourceUserId, int targetUserId) { ResolveInfo forwardingResolveInfo = new ResolveInfo(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); boolean targetIsProfile; try { targetIsProfile = mUserManager.getUserInfo(targetUserId).isManagedProfile(); @@ -10178,7 +10178,7 @@ public class PackageManagerService extends IPackageManager.Stub mPackageUsage.maybeWriteAsync(mSettings.mPackages); mCompilerStats.maybeWriteAsync(); } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { synchronized (mInstallLock) { return performDexOptInternalWithDependenciesLI(p, pkgSetting, options); @@ -13173,7 +13173,7 @@ public class PackageManagerService extends IPackageManager.Stub return false; } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { boolean sendAdded = false; boolean sendRemoved = false; @@ -13340,7 +13340,7 @@ public class PackageManagerService extends IPackageManager.Stub true /* requireFullPermission */, false /* checkShell */, "getApplicationHidden for user " + userId); PackageSetting ps; - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { // writer synchronized (mLock) { @@ -13395,7 +13395,7 @@ public class PackageManagerService extends IPackageManager.Stub return PackageManager.INSTALL_FAILED_USER_RESTRICTED; } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { boolean installed = false; final boolean instantApp = @@ -14486,7 +14486,7 @@ public class PackageManagerService extends IPackageManager.Stub // was never set. EventLog.writeEvent(0x534e4554, "150857253", callingUid, ""); - long binderToken = Binder.clearCallingIdentity(); + final long binderToken = Binder.clearCallingIdentity(); try { if (mInjector.getCompatibility().isChangeEnabledByUid( THROW_EXCEPTION_ON_REQUIRE_INSTALL_PACKAGES_TO_ADD_INSTALLER_PACKAGE, @@ -21154,7 +21154,7 @@ public class PackageManagerService extends IPackageManager.Stub if (packageName == null) { return null; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (getPackageInfo(packageName, MATCH_FACTORY_ONLY, UserHandle.USER_SYSTEM) == null) { PackageInfo packageInfo = getPackageInfo(packageName, 0, UserHandle.USER_SYSTEM); @@ -21515,7 +21515,7 @@ public class PackageManagerService extends IPackageManager.Stub } } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { if (sendNow) { int packageUid = UserHandle.getUid(userId, pkgSetting.appId); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 1dc035f26d83..4c8d2b9b0a9e 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -4387,7 +4387,7 @@ public final class Settings { */ private static List getUsers(UserManagerService userManager, boolean excludeDying, boolean excludePreCreated) { - long id = Binder.clearCallingIdentity(); + final long id = Binder.clearCallingIdentity(); try { return userManager.getUsers(/* excludePartial= */ true, excludeDying, excludePreCreated); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0a8c8f6cbebc..2ada6131b0d2 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1660,7 +1660,7 @@ public class UserManagerService extends IUserManager.Stub { } } if (changed) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { sendUserInfoChangedBroadcast(userId); } finally { @@ -3769,7 +3769,7 @@ public class UserManagerService extends IUserManager.Stub { if (user == null) { return null; } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user.id); // Change the setting before applying the DISALLOW_SHARE_LOCATION restriction, otherwise @@ -3822,7 +3822,7 @@ public class UserManagerService extends IUserManager.Stub { return false; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final UserData userData; synchronized (mPackagesLock) { @@ -3883,7 +3883,7 @@ public class UserManagerService extends IUserManager.Stub { } private boolean removeUserUnchecked(@UserIdInt int userId) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final UserData userData; int currentUser = ActivityManager.getCurrentUser(); @@ -3991,7 +3991,7 @@ public class UserManagerService extends IUserManager.Stub { // Let other services shutdown any activity and clean up their state before completely // wiping the user's system directory and removing from the user list - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Intent removedIntent = new Intent(Intent.ACTION_USER_REMOVED); removedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId); @@ -4153,7 +4153,7 @@ public class UserManagerService extends IUserManager.Stub { } private int getUidForPackage(String packageName) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return mContext.getPackageManager().getApplicationInfo(packageName, PackageManager.MATCH_ANY_USER).uid; @@ -5067,7 +5067,7 @@ public class UserManagerService extends IUserManager.Stub { @Override public void setUserIcon(@UserIdInt int userId, Bitmap bitmap) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mPackagesLock) { UserData userData = getUserDataNoChecks(userId); diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 37127233be13..f74913c03ce2 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -501,7 +501,7 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { } Log.i("PackageManager", "Compiling layouts in " + packageName + " (" + apkPath + ") to " + outDexFile); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { synchronized (mInstallLock) { return mInstaller.compileLayouts(apkPath, packageName, outDexFile, diff --git a/services/core/java/com/android/server/pm/dex/ViewCompiler.java b/services/core/java/com/android/server/pm/dex/ViewCompiler.java index a5672664f6fd..8afe62aabd59 100644 --- a/services/core/java/com/android/server/pm/dex/ViewCompiler.java +++ b/services/core/java/com/android/server/pm/dex/ViewCompiler.java @@ -46,7 +46,7 @@ public class ViewCompiler { final String outDexFile = dataDir.getAbsolutePath() + "/code_cache/compiled_view.dex"; Log.i("PackageManager", "Compiling layouts in " + packageName + " (" + apkPath + ") to " + outDexFile); - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { synchronized (mInstallLock) { return mInstaller.compileLayouts(apkPath, packageName, outDexFile, diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index d7ff9a117e9d..40f4748e6781 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -695,7 +695,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { boolean overridePolicy = false; if (callingUid != Process.SYSTEM_UID && callingUid != Process.ROOT_UID) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { if ((flagMask & FLAG_PERMISSION_POLICY_FIXED) != 0) { if (checkAdjustPolicyFlagPermission) { @@ -1051,7 +1051,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { // check. if (packageName != null) { // Allow access to a package that has been granted the READ_DEVICE_IDENTIFIERS appop. - long token = mInjector.clearCallingIdentity(); + final long token = mInjector.clearCallingIdentity(); AppOpsManager appOpsManager = (AppOpsManager) mInjector.getSystemService( Context.APP_OPS_SERVICE); try { @@ -3192,7 +3192,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { + " to register permissions as one time."); Objects.requireNonNull(packageName); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { getOneTimePermissionUserManager(userId).startPackageOneTimeSession(packageName, timeoutMillis, importanceToResetTimer, importanceToKeepSessionAlive); @@ -3208,7 +3208,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { + " to remove permissions as one time."); Objects.requireNonNull(packageName); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { getOneTimePermissionUserManager(userId).stopPackageOneTimeSession(packageName); } finally { diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java index a291cef5b39e..e7b1b4e4a687 100644 --- a/services/core/java/com/android/server/role/RoleManagerService.java +++ b/services/core/java/com/android/server/role/RoleManagerService.java @@ -660,7 +660,7 @@ public class RoleManagerService extends SystemService implements RoleUserState.C @Override public String getDefaultSmsPackage(int userId) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return CollectionUtils.firstOrNull( getRoleHoldersAsUser(RoleManager.ROLE_SMS, userId)); @@ -699,7 +699,7 @@ public class RoleManagerService extends SystemService implements RoleUserState.C } private int getUidForPackage(String packageName) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return getContext().getPackageManager().getApplicationInfo(packageName, PackageManager.MATCH_ANY_USER).uid; diff --git a/services/core/java/com/android/server/search/Searchables.java b/services/core/java/com/android/server/search/Searchables.java index ca7f0366df60..6e1e979b1bac 100644 --- a/services/core/java/com/android/server/search/Searchables.java +++ b/services/core/java/com/android/server/search/Searchables.java @@ -234,7 +234,7 @@ public class Searchables { List searchList; final Intent intent = new Intent(Intent.ACTION_SEARCH); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { searchList = queryIntentActivities(intent, PackageManager.GET_META_DATA | PackageManager.MATCH_DEBUG_TRIAGED_MISSING); diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java index 2a74b3d23829..ee9694f90216 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -281,7 +281,7 @@ public class SliceManagerService extends ISliceManager.Stub { String providerPkg = getProviderPkg(grantUri, providerUser); mPermissions.grantSliceAccess(pkg, userId, providerPkg, providerUser, grantUri); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mContext.getContentResolver().notifyChange(uri, null); } finally { @@ -402,7 +402,7 @@ public class SliceManagerService extends ISliceManager.Stub { } private String getProviderPkg(Uri uri, int user) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { String providerName = getUriWithoutUserId(uri).getAuthority(); ProviderInfo provider = mContext.getPackageManager().resolveContentProviderAsUser( @@ -438,7 +438,7 @@ public class SliceManagerService extends ISliceManager.Stub { } private boolean hasFullSliceAccess(String pkg, int userId) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { boolean ret = isDefaultHomeApp(pkg, userId) || isAssistant(pkg, userId) || isGrantedFullAccess(pkg, userId); diff --git a/services/core/java/com/android/server/slice/SliceShellCommand.java b/services/core/java/com/android/server/slice/SliceShellCommand.java index 9137a3bcbf2b..bdc8bbd13509 100644 --- a/services/core/java/com/android/server/slice/SliceShellCommand.java +++ b/services/core/java/com/android/server/slice/SliceShellCommand.java @@ -69,7 +69,7 @@ public class SliceShellCommand extends ShellCommand { return -1; } Context context = mService.getContext(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Uri uri = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index c871a5e9647f..e0b671f38426 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -1574,7 +1574,7 @@ public class StatsPullAtomService extends SystemService { } int pullWifiActivityInfoLocked(int atomTag, List pulledData) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { SynchronousResultReceiver wifiReceiver = new SynchronousResultReceiver("wifi"); mWifiManager.getWifiActivityEnergyInfoAsync( @@ -1622,7 +1622,7 @@ public class StatsPullAtomService extends SystemService { } int pullModemActivityInfoLocked(int atomTag, List pulledData) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { SynchronousResultReceiver modemReceiver = new SynchronousResultReceiver("telephony"); mTelephony.requestModemActivityInfo(modemReceiver); @@ -2723,7 +2723,7 @@ public class StatsPullAtomService extends SystemService { // Add a RoleHolder atom for each package that holds a role. int pullRoleHolderLocked(int atomTag, List pulledData) { - long callingToken = Binder.clearCallingIdentity(); + final long callingToken = Binder.clearCallingIdentity(); try { PackageManager pm = mContext.getPackageManager(); RoleManagerInternal rmi = LocalServices.getService(RoleManagerInternal.class); diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index d1fd0adb44c2..6a68dc1fb2a2 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -1158,7 +1158,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onPanelRevealed(boolean clearNotificationEffects, int numItems) { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onPanelRevealed(clearNotificationEffects, numItems); } finally { @@ -1169,7 +1169,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void clearNotificationEffects() throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.clearEffects(); } finally { @@ -1180,7 +1180,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onPanelHidden() throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onPanelHidden(); } finally { @@ -1196,7 +1196,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); String reason = PowerManager.SHUTDOWN_USER_REQUESTED; ShutdownCheckPoints.recordCheckPoint(Binder.getCallingPid(), reason); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.prepareForPossibleShutdown(); // ShutdownThread displays UI, so give it a UI context. @@ -1217,7 +1217,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D ? PowerManager.REBOOT_SAFE_MODE : PowerManager.SHUTDOWN_USER_REQUESTED; ShutdownCheckPoints.recordCheckPoint(Binder.getCallingPid(), reason); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.prepareForPossibleShutdown(); mHandler.post(() -> { @@ -1236,7 +1236,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onGlobalActionsShown() { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { if (mGlobalActionListener == null) return; mGlobalActionListener.onGlobalActionsShown(); @@ -1248,7 +1248,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onGlobalActionsHidden() { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { if (mGlobalActionListener == null) return; mGlobalActionListener.onGlobalActionsDismissed(); @@ -1262,7 +1262,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationClick(callingUid, callingPid, key, nv); } finally { @@ -1277,7 +1277,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationActionClick(callingUid, callingPid, key, actionIndex, action, nv, generatedByAssistant); @@ -1292,7 +1292,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { // WARNING: this will call back into us to do the remove. Don't hold any locks. mNotificationDelegate.onNotificationError(callingUid, callingPid, @@ -1310,7 +1310,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationClear(callingUid, callingPid, pkg, tag, id, userId, key, dismissalSurface, dismissalSentiment, nv); @@ -1324,7 +1324,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D NotificationVisibility[] newlyVisibleKeys, NotificationVisibility[] noLongerVisibleKeys) throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationVisibilityChanged( newlyVisibleKeys, noLongerVisibleKeys); @@ -1337,7 +1337,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D public void onNotificationExpansionChanged(String key, boolean userAction, boolean expanded, int location) throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationExpansionChanged( key, userAction, expanded, location); @@ -1349,7 +1349,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onNotificationDirectReplied(String key) throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationDirectReplied(key); } finally { @@ -1361,7 +1361,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D public void onNotificationSmartSuggestionsAdded(String key, int smartReplyCount, int smartActionCount, boolean generatedByAssistant, boolean editBeforeSending) { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationSmartSuggestionsAdded(key, smartReplyCount, smartActionCount, generatedByAssistant, editBeforeSending); @@ -1375,7 +1375,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D String key, int replyIndex, CharSequence reply, int notificationLocation, boolean modifiedBeforeSending) throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationSmartReplySent(key, replyIndex, reply, notificationLocation, modifiedBeforeSending); @@ -1387,7 +1387,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onNotificationSettingsViewed(String key) throws RemoteException { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationSettingsViewed(key); } finally { @@ -1400,7 +1400,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D enforceStatusBarService(); final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onClearAll(callingUid, callingPid, userId); } finally { @@ -1411,7 +1411,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onNotificationBubbleChanged(String key, boolean isBubble, int flags) { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onNotificationBubbleChanged(key, isBubble, flags); } finally { @@ -1422,7 +1422,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D @Override public void onBubbleNotificationSuppressionChanged(String key, boolean isNotifSuppressed) { enforceStatusBarService(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.onBubbleNotificationSuppressionChanged(key, isNotifSuppressed); } finally { @@ -1446,7 +1446,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D String packageName) { enforceStatusBarService(); int callingUid = Binder.getCallingUid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.grantInlineReplyUriPermission(key, uri, user, packageName, callingUid); @@ -1459,7 +1459,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D public void clearInlineReplyUriPermissions(String key) { enforceStatusBarService(); int callingUid = Binder.getCallingUid(); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mNotificationDelegate.clearInlineReplyUriPermissions(key, callingUid); } finally { diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java index 70ab48b9005b..59cebf769a4e 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorService.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorService.java @@ -114,7 +114,7 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { enforceSuggestManualTimePermission(); Objects.requireNonNull(timeSignal); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return mTimeDetectorStrategy.suggestManualTime(timeSignal); } finally { diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java index 6e1f89b3919d..d09cd38d7680 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java @@ -148,7 +148,7 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub enforceManageTimeZoneDetectorPermission(); int userId = mCallerIdentityInjector.getCallingUserId(); - long token = mCallerIdentityInjector.clearCallingIdentity(); + final long token = mCallerIdentityInjector.clearCallingIdentity(); try { ConfigurationInternal configurationInternal = mTimeZoneDetectorStrategy.getConfigurationInternal(userId); @@ -164,7 +164,7 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub Objects.requireNonNull(configuration); int callingUserId = mCallerIdentityInjector.getCallingUserId(); - long token = mCallerIdentityInjector.clearCallingIdentity(); + final long token = mCallerIdentityInjector.clearCallingIdentity(); try { return mTimeZoneDetectorStrategy.updateConfiguration(callingUserId, configuration); } finally { @@ -278,7 +278,7 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub Objects.requireNonNull(timeZoneSuggestion); int userId = mCallerIdentityInjector.getCallingUserId(); - long token = mCallerIdentityInjector.clearCallingIdentity(); + final long token = mCallerIdentityInjector.clearCallingIdentity(); try { return mTimeZoneDetectorStrategy.suggestManualTimeZone(userId, timeZoneSuggestion); } finally { diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 89b108c24630..0e8fd8fa9f8a 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -1125,7 +1125,7 @@ public class TrustManagerService extends SystemService { userId = ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId, false /* allowAll */, true /* requireFull */, "isDeviceLocked", null); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) { userId = resolveProfileParent(userId); @@ -1141,7 +1141,7 @@ public class TrustManagerService extends SystemService { userId = ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId, false /* allowAll */, true /* requireFull */, "isDeviceSecure", null); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (!mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)) { userId = resolveProfileParent(userId); @@ -1328,7 +1328,7 @@ public class TrustManagerService extends SystemService { } private int resolveProfileParent(int userId) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { UserInfo parent = mUserManager.getProfileParent(userId); if (parent != null) { diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 5f4d46cabdc0..8b0963b9f535 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -1444,7 +1444,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub public void engineShown(IWallpaperEngine engine) { synchronized (mLock) { if (mReply != null) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mReply.sendResult(null); } catch (RemoteException e) { @@ -2009,7 +2009,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub public boolean hasNamedWallpaper(String name) { synchronized (mLock) { List users; - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { users = ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).getUsers(); } finally { diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index 90a153be8800..ee46ce13ee73 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -171,7 +171,7 @@ public class WebViewUpdateService extends SystemService { return; } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { WebViewUpdateService.this.mImpl.notifyRelroCreationCompleted(); } finally { @@ -232,7 +232,7 @@ public class WebViewUpdateService extends SystemService { throw new SecurityException(msg); } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { return WebViewUpdateService.this.mImpl.changeProviderAndSetting( newProvider); @@ -285,7 +285,7 @@ public class WebViewUpdateService extends SystemService { throw new SecurityException(msg); } - long callingId = Binder.clearCallingIdentity(); + final long callingId = Binder.clearCallingIdentity(); try { WebViewUpdateService.this.mImpl.enableMultiProcess(enable); } finally { diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index e06c156bceab..16a5c3ffff51 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -2172,7 +2172,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public RootTaskInfo getFocusedRootTaskInfo() throws RemoteException { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "getFocusedRootTaskInfo()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { Task focusedStack = getTopDisplayFocusedStack(); @@ -2357,7 +2357,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public Rect getTaskBounds(int taskId) { mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "getTaskBounds()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); Rect rect = new Rect(); try { synchronized (mGlobalLock) { @@ -2921,7 +2921,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public List getAllRootTaskInfos() { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "getAllRootTaskInfos()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mRootWindowContainer.getAllRootTaskInfos(INVALID_DISPLAY); @@ -2934,7 +2934,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public RootTaskInfo getRootTaskInfo(int windowingMode, int activityType) { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "getRootTaskInfo()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mRootWindowContainer.getRootTaskInfo(windowingMode, activityType); @@ -2948,7 +2948,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public List getAllRootTaskInfosOnDisplay(int displayId) { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "getAllRootTaskInfosOnDisplay()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mRootWindowContainer.getAllRootTaskInfos(displayId); @@ -2962,7 +2962,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public RootTaskInfo getRootTaskInfoOnDisplay(int windowingMode, int activityType, int displayId) { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "getRootTaskInfoOnDisplay()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mRootWindowContainer.getRootTaskInfo(windowingMode, activityType, displayId); @@ -3004,7 +3004,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public void startSystemLockTaskMode(int taskId) { mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "startSystemLockTaskMode"); // This makes inner call to look as if it was initiated by system. - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final Task task = mRootWindowContainer.anyTaskForId(taskId, @@ -3055,7 +3055,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // - will put the device in fully locked mode (LockTask), if the app is allowlisted // - will start the pinned mode, otherwise final int callingUid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { // When a task is locked, dismiss the pinned stack if it exists mRootWindowContainer.removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED); @@ -3068,7 +3068,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { private void stopLockTaskModeInternal(@Nullable IBinder token, boolean isSystemCaller) { final int callingUid = Binder.getCallingUid(); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { Task task = null; @@ -3149,7 +3149,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public List getAppTasks(String callingPackage) { int callingUid = Binder.getCallingUid(); assertPackageMatchesCallingUid(callingPackage); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mRecentTasks.getAppTasksList(callingUid, callingPackage); @@ -3368,7 +3368,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public boolean resizeTask(int taskId, Rect bounds, int resizeMode) { mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "resizeTask()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final Task task = mRootWindowContainer.anyTaskForId(taskId, @@ -3433,7 +3433,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } synchronized (mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); if (mKeyguardShown != keyguardShowing) { mKeyguardShown = keyguardShowing; final Message msg = PooledLambda.obtainMessage( @@ -3498,7 +3498,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public void toggleFreeformWindowingMode(IBinder token) { synchronized (mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final ActivityRecord r = ActivityRecord.forTokenLocked(token); if (r == null) { @@ -3818,7 +3818,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public boolean showAssistFromActivity(IBinder token, Bundle args) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { ActivityRecord caller = ActivityRecord.forTokenLocked(token); @@ -3862,7 +3862,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { try { activityToCallback.app.getThread().scheduleLocalVoiceInteractionStarted(activity, voiceInteractor); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { startRunningVoiceLocked(voiceSession, activityToCallback.info.applicationInfo.uid); } finally { @@ -3999,7 +3999,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + "Device doesn't support picture-in-picture mode"); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return mRootWindowContainer.moveTopStackActivityToPinnedRootTask(rootTaskId); } finally { @@ -4177,7 +4177,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { Rect tempDockedTaskInsetBounds, Rect tempOtherTaskBounds, Rect tempOtherTaskInsetBounds) { enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "resizePrimarySplitScreen()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final TaskDisplayArea tc = mRootWindowContainer.getDefaultTaskDisplayArea(); diff --git a/services/core/java/com/android/server/wm/AppTaskImpl.java b/services/core/java/com/android/server/wm/AppTaskImpl.java index dd1d55b2d54d..3e798790f45e 100644 --- a/services/core/java/com/android/server/wm/AppTaskImpl.java +++ b/services/core/java/com/android/server/wm/AppTaskImpl.java @@ -58,7 +58,7 @@ class AppTaskImpl extends IAppTask.Stub { checkCaller(); synchronized (mService.mGlobalLock) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { // We remove the task from recents to preserve backwards if (!mService.mStackSupervisor.removeTaskById(mTaskId, false, @@ -76,7 +76,7 @@ class AppTaskImpl extends IAppTask.Stub { checkCaller(); synchronized (mService.mGlobalLock) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { Task task = mService.mRootWindowContainer.anyTaskForId(mTaskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS); @@ -162,7 +162,7 @@ class AppTaskImpl extends IAppTask.Stub { checkCaller(); synchronized (mService.mGlobalLock) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { Task task = mService.mRootWindowContainer.anyTaskForId(mTaskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS); diff --git a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java index c5c236416013..14880ed30f24 100644 --- a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java +++ b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java @@ -71,7 +71,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub } private void doTake(IBinder permissionOwner) throws RemoteException { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { for (int i = 0; i < mUris.size(); i++) { UriGrantsManager.getService().grantUriPermissionFromOwner( diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index 9ff99f5093d6..1fdb49f38cf5 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -255,7 +255,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public boolean performHapticFeedback(int effectId, boolean always) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return mService.mPolicy.performHapticFeedback(mUid, mPackageName, effectId, always, null); @@ -313,7 +313,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { if (DEBUG_TASK_POSITIONING) Slog.d( TAG_WM, "startMovingTask: {" + startX + "," + startY + "}"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return mService.mTaskPositioningController.startMovingTask(window, startX, startY); } finally { @@ -325,7 +325,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { public void finishMovingTask(IWindow window) { if (DEBUG_TASK_POSITIONING) Slog.d(TAG_WM, "finishMovingTask"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mService.mTaskPositioningController.finishTaskPositioning(window); } finally { @@ -335,7 +335,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public void reportSystemGestureExclusionChanged(IWindow window, List exclusionRects) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mService.reportSystemGestureExclusionChanged(this, window, exclusionRects); } finally { @@ -352,7 +352,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public void setWallpaperPosition(IBinder window, float x, float y, float xStep, float yStep) { synchronized (mService.mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { actionOnWallpaper(window, (wpController, windowState) -> wpController.setWindowWallpaperPosition(windowState, x, y, xStep, yStep)); @@ -369,7 +369,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { + zoom); } synchronized (mService.mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { actionOnWallpaper(window, (wpController, windowState) -> wpController.setWallpaperZoomOut(windowState, zoom)); @@ -398,7 +398,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public void setWallpaperDisplayOffset(IBinder window, int x, int y) { synchronized (mService.mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { actionOnWallpaper(window, (wpController, windowState) -> wpController.setWindowWallpaperDisplayOffset(windowState, x, y)); @@ -412,7 +412,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y, int z, Bundle extras, boolean sync) { synchronized (mService.mGlobalLock) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { final WindowState windowState = mService.windowForClientLocked(this, window, true); return windowState.getDisplayContent().mWallpaperController diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 19cfcb21c8ac..f15877d600a8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2013,7 +2013,7 @@ public class WindowManagerService extends IWindowManager.Stub } void setTransparentRegionWindow(Session session, IWindow client, Region region) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { WindowState w = windowForClientLocked(session, client, false); @@ -2031,7 +2031,7 @@ public class WindowManagerService extends IWindowManager.Stub void setInsetsWindow(Session session, IWindow client, int touchableInsets, Rect contentInsets, Rect visibleInsets, Region touchableRegion) { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { WindowState w = windowForClientLocked(session, client, false); @@ -2110,7 +2110,7 @@ public class WindowManagerService extends IWindowManager.Stub boolean configChanged; final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); synchronized (mGlobalLock) { final WindowState win = windowForClientLocked(session, client, false); if (win == null) { @@ -3057,7 +3057,7 @@ public class WindowManagerService extends IWindowManager.Stub throw new SecurityException("Requires INTERACT_ACROSS_USERS permission"); } - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { return mPolicy.isKeyguardSecure(userId); } finally { @@ -3723,7 +3723,7 @@ public class WindowManagerService extends IWindowManager.Stub + "rotation constant."); } - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final DisplayContent display = mRoot.getDisplayContent(displayId); @@ -3758,7 +3758,7 @@ public class WindowManagerService extends IWindowManager.Stub ProtoLog.v(WM_DEBUG_ORIENTATION, "thawRotation: mRotation=%d", getDefaultDisplayRotation()); - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { final DisplayContent display = mRoot.getDisplayContent(displayId); @@ -3811,7 +3811,7 @@ public class WindowManagerService extends IWindowManager.Stub Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "updateRotation"); - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { @@ -4104,7 +4104,7 @@ public class WindowManagerService extends IWindowManager.Stub throw new SecurityException("Must hold permission " + WRITE_SECURE_SETTINGS); } - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { mPolicy.setOverrideFoldedArea(area); @@ -4118,7 +4118,7 @@ public class WindowManagerService extends IWindowManager.Stub * Get the display folded area. */ @NonNull Rect getFoldedArea() { - long origId = Binder.clearCallingIdentity(); + final long origId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { return mPolicy.getFoldedArea(); @@ -4135,7 +4135,7 @@ public class WindowManagerService extends IWindowManager.Stub != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Must hold permission " + MANAGE_ACTIVITY_STACKS); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { mDisplayNotificationController.registerListener(listener); } finally { @@ -7856,7 +7856,7 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void syncInputTransactions() { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { waitForAnimationsToComplete(); @@ -8054,7 +8054,7 @@ public class WindowManagerService extends IWindowManager.Stub public boolean isLayerTracing() { mAtmInternal.enforceCallerIsRecentsOrHasPermission(android.Manifest.permission.DUMP, "isLayerTracing"); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { Parcel data = null; Parcel reply = null; @@ -8087,7 +8087,7 @@ public class WindowManagerService extends IWindowManager.Stub public void setLayerTracing(boolean enabled) { mAtmInternal.enforceCallerIsRecentsOrHasPermission(android.Manifest.permission.DUMP, "setLayerTracing"); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { Parcel data = null; try { @@ -8114,7 +8114,7 @@ public class WindowManagerService extends IWindowManager.Stub public void setLayerTracingFlags(int flags) { mAtmInternal.enforceCallerIsRecentsOrHasPermission(android.Manifest.permission.DUMP, "setLayerTracingFlags"); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { Parcel data = null; try { diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index f1641cdfcf67..0b200e2bd6d2 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -120,7 +120,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub public IBinder startTransition(int type, @Nullable IBinder transitionToken, @Nullable WindowContainerTransaction t) { enforceStackPermission("startTransition()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { Transition transition = Transition.fromBinder(transitionToken); @@ -147,7 +147,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub @Nullable WindowContainerTransaction t, @Nullable IWindowContainerTransactionCallback callback) { enforceStackPermission("finishTransition()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { int syncId = -1; @@ -176,7 +176,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub throw new IllegalArgumentException( "Null transaction passed to applySyncTransaction"); } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { int effects = 0; @@ -589,7 +589,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub @Override public void registerTransitionPlayer(ITransitionPlayer player) { enforceStackPermission("registerTransitionPlayer()"); - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { mTransitionController.registerTransitionPlayer(player); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 5f6ac10bee40..8ba2bdee3d4f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -1124,7 +1124,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } boolean storageManagerIsNonDefaultBlockEncrypted() { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return StorageManager.isNonDefaultBlockEncrypted(); } finally { diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java index 2cfdf3fd4f6f..47505a398a6f 100644 --- a/services/midi/java/com/android/server/midi/MidiService.java +++ b/services/midi/java/com/android/server/midi/MidiService.java @@ -667,7 +667,7 @@ public class MidiService extends IMidiManager.Stub { } // clear calling identity so bindService does not fail - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { client.addDeviceConnection(device, callback); } finally { @@ -692,7 +692,7 @@ public class MidiService extends IMidiManager.Stub { } // clear calling identity so bindService does not fail - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { client.addDeviceConnection(device, callback); } finally { diff --git a/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java b/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java index 946d28ee3210..62dbd89c48cb 100644 --- a/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java +++ b/services/restrictions/java/com/android/server/restrictions/RestrictionsManagerService.java @@ -76,7 +76,7 @@ public final class RestrictionsManagerService extends SystemService { public boolean hasRestrictionsProvider() throws RemoteException { int userHandle = UserHandle.getCallingUserId(); if (mDpm != null) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { return mDpm.getRestrictionsProvider(userHandle) != null; } finally { @@ -97,7 +97,7 @@ public final class RestrictionsManagerService extends SystemService { int callingUid = Binder.getCallingUid(); int userHandle = UserHandle.getUserId(callingUid); if (mDpm != null) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { ComponentName restrictionsProvider = mDpm.getRestrictionsProvider(userHandle); @@ -130,7 +130,7 @@ public final class RestrictionsManagerService extends SystemService { } final int userHandle = UserHandle.getCallingUserId(); if (mDpm != null) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { ComponentName restrictionsProvider = mDpm.getRestrictionsProvider(userHandle); @@ -163,7 +163,7 @@ public final class RestrictionsManagerService extends SystemService { int callingUid = Binder.getCallingUid(); int userHandle = UserHandle.getUserId(callingUid); if (mDpm != null) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { ComponentName permProvider = mDpm.getRestrictionsProvider(userHandle); if (permProvider == null) { diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java index 09b6d7b0cd7e..cb49a519d10a 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java @@ -113,7 +113,7 @@ public class DpmMockContext extends MockContext { } public void withCleanCallingIdentity(@NonNull FunctionalUtils.ThrowingRunnable action) { - long callingIdentity = clearCallingIdentity(); + final long callingIdentity = clearCallingIdentity(); Throwable throwableToPropagate = null; try { action.runOrThrow(); diff --git a/services/usb/java/com/android/server/usb/UsbSerialReader.java b/services/usb/java/com/android/server/usb/UsbSerialReader.java index 095e8e9b7b5b..f241e65ba755 100644 --- a/services/usb/java/com/android/server/usb/UsbSerialReader.java +++ b/services/usb/java/com/android/server/usb/UsbSerialReader.java @@ -77,7 +77,7 @@ class UsbSerialReader extends IUsbSerialReader.Stub { UserHandle user = Binder.getCallingUserHandle(); int packageTargetSdkVersion; - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { PackageInfo pkg; try { diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index 14c7f04b9e82..444cb5cb89c7 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -281,7 +281,7 @@ public class UsbService extends IUsbManager.Stub { int pid = Binder.getCallingPid(); int user = UserHandle.getUserId(uid); - long ident = clearCallingIdentity(); + final long ident = clearCallingIdentity(); try { synchronized (mLock) { if (mUserManager.isSameProfileGroup(user, mCurrentUserId)) { @@ -318,7 +318,7 @@ public class UsbService extends IUsbManager.Stub { int uid = Binder.getCallingUid(); int user = UserHandle.getUserId(uid); - long ident = clearCallingIdentity(); + final long ident = clearCallingIdentity(); try { synchronized (mLock) { if (mUserManager.isSameProfileGroup(user, mCurrentUserId)) { diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java index 333edfd91b16..44ae481d85bd 100644 --- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java +++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java @@ -505,7 +505,7 @@ class UsbUserPermissionManager { int uid, @NonNull Context userContext, @NonNull PendingIntent pi) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); Intent intent = new Intent(); if (device != null) { intent.putExtra(UsbManager.EXTRA_DEVICE, device); diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java index b6506b408714..64f8c585c80b 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java @@ -1027,7 +1027,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { // internalClearGlobalStateLocked() cleans up the telephony and power save listeners. private void internalClearGlobalStateLocked() { // Unregister from call state changes. - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); } finally { @@ -1100,7 +1100,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { if (mRecognitionRequested) { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { // Get the current call state synchronously for the first recognition. mCallActive = mTelephonyManager.getCallState() == TelephonyManager.CALL_STATE_OFFHOOK; diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index a73e73e37fff..5999044d9427 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -899,7 +899,7 @@ public class SoundTriggerService extends SystemService { mClient = new ISoundTriggerDetectionServiceClient.Stub() { @Override public void onOpFinished(int opId) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { synchronized (mRemoteServiceLock) { mRunningOpIds.remove(opId); @@ -1013,7 +1013,7 @@ public class SoundTriggerService extends SystemService { * Verify that the service has the expected properties and then bind to the service */ private void bind() { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { Intent i = new Intent(); i.setComponent(mServiceName); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java index 0ff92739f8b6..cfdc5682a117 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java @@ -309,7 +309,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, if (!"content".equals(uri.getScheme())) { return; } - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { // This will throw SecurityException for us. mUgmInternal.checkGrantUriPermission(srcUid, null, diff --git a/telecomm/java/android/telecom/DefaultDialerManager.java b/telecomm/java/android/telecom/DefaultDialerManager.java index 5b806a6e57da..1c070748400d 100644 --- a/telecomm/java/android/telecom/DefaultDialerManager.java +++ b/telecomm/java/android/telecom/DefaultDialerManager.java @@ -74,7 +74,7 @@ public class DefaultDialerManager { * */ public static boolean setDefaultDialerApplication(Context context, String packageName, int user) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { CompletableFuture future = new CompletableFuture<>(); Consumer callback = successful -> { @@ -128,7 +128,7 @@ public class DefaultDialerManager { * @hide * */ public static String getDefaultDialerApplication(Context context, int user) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return CollectionUtils.firstOrNull(context.getSystemService(RoleManager.class) .getRoleHoldersAsUser(RoleManager.ROLE_DIALER, UserHandle.of(user))); diff --git a/telephony/common/android/telephony/LocationAccessPolicy.java b/telephony/common/android/telephony/LocationAccessPolicy.java index 502bfa3749eb..85d59a216f25 100644 --- a/telephony/common/android/telephony/LocationAccessPolicy.java +++ b/telephony/common/android/telephony/LocationAccessPolicy.java @@ -377,7 +377,7 @@ public final class LocationAccessPolicy { } private static boolean isCurrentProfile(@NonNull Context context, int uid) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { if (UserHandle.getUserHandleForUid(uid).getIdentifier() == ActivityManager.getCurrentUser()) { diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java index 7736473feafb..b8ca3267cf9e 100644 --- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -96,7 +96,7 @@ public final class TelephonyUtils { */ public static void runWithCleanCallingIdentity( @NonNull Runnable action) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { action.run(); } finally { @@ -115,7 +115,7 @@ public final class TelephonyUtils { */ public static T runWithCleanCallingIdentity( @NonNull Supplier action) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { return action.get(); } finally { diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index ee2fce7e7dd5..3a0e49e204cb 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -161,7 +161,7 @@ public class ImsMmTelManager implements RegistrationManager { public void onCapabilitiesStatusChanged(int config) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onCapabilitiesStatusChanged( new MmTelFeature.MmTelCapabilities(config))); diff --git a/telephony/java/android/telephony/ims/ImsRcsManager.java b/telephony/java/android/telephony/ims/ImsRcsManager.java index 94407f1dcd3a..a7586ec4ec18 100644 --- a/telephony/java/android/telephony/ims/ImsRcsManager.java +++ b/telephony/java/android/telephony/ims/ImsRcsManager.java @@ -99,7 +99,7 @@ public class ImsRcsManager { public void onCapabilitiesStatusChanged(int config) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onAvailabilityChanged( new RcsFeature.RcsImsCapabilities(config))); diff --git a/telephony/java/android/telephony/ims/ProvisioningManager.java b/telephony/java/android/telephony/ims/ProvisioningManager.java index 2a073a1f1d81..3affdf64aae7 100644 --- a/telephony/java/android/telephony/ims/ProvisioningManager.java +++ b/telephony/java/android/telephony/ims/ProvisioningManager.java @@ -879,7 +879,7 @@ public class ProvisioningManager { @Override public final void onIntConfigChanged(int item, int value) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalConfigurationCallback.onProvisioningIntChanged(item, value)); @@ -890,7 +890,7 @@ public class ProvisioningManager { @Override public final void onStringConfigChanged(int item, String value) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalConfigurationCallback.onProvisioningStringChanged(item, value)); diff --git a/telephony/java/android/telephony/ims/RcsUceAdapter.java b/telephony/java/android/telephony/ims/RcsUceAdapter.java index a427d056f915..4606f7d625aa 100644 --- a/telephony/java/android/telephony/ims/RcsUceAdapter.java +++ b/telephony/java/android/telephony/ims/RcsUceAdapter.java @@ -206,7 +206,7 @@ public class RcsUceAdapter { public void onPublishStateChanged(int publishState) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onChanged(publishState)); } finally { @@ -322,7 +322,7 @@ public class RcsUceAdapter { IRcsUceControllerCallback internalCallback = new IRcsUceControllerCallback.Stub() { @Override public void onCapabilitiesReceived(List contactCapabilities) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { executor.execute(() -> c.onCapabilitiesReceived(contactCapabilities)); @@ -332,7 +332,7 @@ public class RcsUceAdapter { } @Override public void onError(int errorCode) { - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { executor.execute(() -> c.onError(errorCode)); } finally { diff --git a/telephony/java/android/telephony/ims/RegistrationManager.java b/telephony/java/android/telephony/ims/RegistrationManager.java index e085dec10546..1a78e166932a 100644 --- a/telephony/java/android/telephony/ims/RegistrationManager.java +++ b/telephony/java/android/telephony/ims/RegistrationManager.java @@ -105,7 +105,7 @@ public interface RegistrationManager { public void onRegistered(int imsRadioTech) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onRegistered(getAccessType(imsRadioTech))); @@ -118,7 +118,7 @@ public interface RegistrationManager { public void onRegistering(int imsRadioTech) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onRegistering(getAccessType(imsRadioTech))); @@ -131,7 +131,7 @@ public interface RegistrationManager { public void onDeregistered(ImsReasonInfo info) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onUnregistered(info)); } finally { @@ -143,7 +143,7 @@ public interface RegistrationManager { public void onTechnologyChangeFailed(int imsRadioTech, ImsReasonInfo info) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onTechnologyChangeFailed( getAccessType(imsRadioTech), info)); @@ -155,7 +155,7 @@ public interface RegistrationManager { public void onSubscriberAssociatedUriChanged(Uri[] uris) { if (mLocalCallback == null) return; - long callingIdentity = Binder.clearCallingIdentity(); + final long callingIdentity = Binder.clearCallingIdentity(); try { mExecutor.execute(() -> mLocalCallback.onSubscriberAssociatedUriChanged(uris)); } finally { diff --git a/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java b/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java index 6a135694869c..a413ef8a8738 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadProgressListener.java @@ -43,7 +43,7 @@ public class InternalDownloadProgressListener extends IDownloadProgressListener. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java b/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java index ce32477b443b..67539a0ad7ee 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadSessionCallback.java @@ -40,7 +40,7 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -59,7 +59,7 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -78,7 +78,7 @@ public class InternalDownloadSessionCallback extends IMbmsDownloadSessionCallbac return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java b/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java index 87163ff8b32c..ce96a8faeb49 100644 --- a/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java +++ b/telephony/java/android/telephony/mbms/InternalDownloadStatusListener.java @@ -42,7 +42,7 @@ public class InternalDownloadStatusListener extends IDownloadStatusListener.Stub return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java b/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java index c7600b6c7843..5e1f1f170f60 100644 --- a/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java +++ b/telephony/java/android/telephony/mbms/InternalGroupCallCallback.java @@ -38,7 +38,7 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -57,7 +57,7 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -76,7 +76,7 @@ public class InternalGroupCallCallback extends IGroupCallCallback.Stub { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java b/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java index 0b7667ec525c..ca4190c6b4f1 100644 --- a/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalGroupCallSessionCallback.java @@ -39,7 +39,7 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -58,7 +58,7 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -77,7 +77,7 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -96,7 +96,7 @@ public class InternalGroupCallSessionCallback extends IMbmsGroupCallSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java b/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java index 3a4ed08ed954..d62add193e77 100644 --- a/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java +++ b/telephony/java/android/telephony/mbms/InternalStreamingServiceCallback.java @@ -39,7 +39,7 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -58,7 +58,7 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -77,7 +77,7 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -96,7 +96,7 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -115,7 +115,7 @@ public class InternalStreamingServiceCallback extends IStreamingServiceCallback. return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override diff --git a/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java b/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java index 2eb280e74106..f4ee4dc069a9 100644 --- a/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java +++ b/telephony/java/android/telephony/mbms/InternalStreamingSessionCallback.java @@ -40,7 +40,7 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -60,7 +60,7 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override @@ -79,7 +79,7 @@ public class InternalStreamingSessionCallback extends IMbmsStreamingSessionCallb return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { mExecutor.execute(new Runnable() { @Override -- cgit v1.2.3-59-g8ed1b From 902b89d936d541f08f24fc0a042e3cdbb9076c1c Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Wed, 7 Oct 2020 14:55:25 +0900 Subject: Use TelephonyManager#isEmergencyNumber() instead Replace deprecated PhoneNumberUtils#isLocalEmergencyNumber() and isEmergencyNumber() with TelephonyManager#isEmergencyNumber(). Test: Build Bug: 132703886 Signed-off-by: Taesu Lee Change-Id: I232d7f7d23efd963b6d30938f0fa304c90fca8a8 --- .../java/com/android/internal/location/GpsNetInitiatedHandler.java | 3 +-- telecomm/java/android/telecom/CallerInfo.java | 3 ++- telecomm/java/android/telecom/CallerInfoAsyncQuery.java | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'telecomm/java') diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java index eb2e23e1b5e1..4a095c9be053 100644 --- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java +++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java @@ -28,7 +28,6 @@ import android.location.LocationManager; import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; -import android.telephony.PhoneNumberUtils; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Log; @@ -161,7 +160,7 @@ public class GpsNetInitiatedHandler { be set to true when the phone is having emergency call, and then will be set to false by mPhoneStateListener when the emergency call ends. */ - mIsInEmergencyCall = PhoneNumberUtils.isEmergencyNumber(phoneNumber); + mIsInEmergencyCall = mTelephonyManager.isEmergencyNumber(phoneNumber); if (DEBUG) Log.v(TAG, "ACTION_NEW_OUTGOING_CALL - " + getInEmergency()); } else if (action.equals(LocationManager.MODE_CHANGED_ACTION)) { updateLocationMode(); diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index fb6f99405759..aff2f0183a3b 100644 --- a/telecomm/java/android/telecom/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -405,7 +405,8 @@ public class CallerInfo { // Change the callerInfo number ONLY if it is an emergency number // or if it is the voicemail number. If it is either, take a // shortcut and skip the query. - if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) { + TelephonyManager tm = context.getSystemService(TelephonyManager.class); + if (tm.isEmergencyNumber(number)) { return new CallerInfo().markAsEmergency(context); } else if (PhoneNumberUtils.isVoiceMailNumber(null, subId, number)) { return new CallerInfo().markAsVoiceMail(context, subId); diff --git a/telecomm/java/android/telecom/CallerInfoAsyncQuery.java b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java index 4a81a8eea5cf..a9e1a8fc1952 100644 --- a/telecomm/java/android/telecom/CallerInfoAsyncQuery.java +++ b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java @@ -34,6 +34,7 @@ import android.os.UserManager; import android.provider.ContactsContract.PhoneLookup; import android.telephony.PhoneNumberUtils; import android.telephony.SubscriptionManager; +import android.telephony.TelephonyManager; import android.text.TextUtils; import java.util.ArrayList; @@ -481,7 +482,8 @@ public class CallerInfoAsyncQuery { cw.subId = subId; // check to see if these are recognized numbers, and use shortcuts if we can. - if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) { + TelephonyManager tm = context.getSystemService(TelephonyManager.class); + if (tm.isEmergencyNumber(number)) { cw.event = EVENT_EMERGENCY_NUMBER; } else if (PhoneNumberUtils.isVoiceMailNumber(context, subId, number)) { cw.event = EVENT_VOICEMAIL_NUMBER; -- cgit v1.2.3-59-g8ed1b From 586a3cf2297100177b5e1c814f435fea71c5f1f9 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 19 Oct 2020 11:38:00 +0100 Subject: Remove @TestApi from @SystemApi symbols I ran these commands: cd frameworks/base grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \ 's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs' grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \ 's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs' Bug: 171179806 Test: m checkapi Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789 --- .../java/android/os/DeviceIdleManager.java | 1 - .../java/android/os/PowerWhitelistManager.java | 2 - api/test-current.txt | 3392 +------------------- api/test-removed.txt | 9 - core/java/android/app/ActivityManager.java | 15 +- core/java/android/app/AppOpsManager.java | 132 +- core/java/android/app/NotificationChannel.java | 2 - core/java/android/app/NotificationManager.java | 6 - .../android/app/RuntimeAppOpAccessMessage.java | 2 - core/java/android/app/StatusBarManager.java | 9 - core/java/android/app/UiModeManager.java | 1 - core/java/android/app/WallpaperManager.java | 1 - .../android/app/admin/DevicePolicyManager.java | 6 +- core/java/android/app/assist/AssistStructure.java | 2 - core/java/android/app/backup/BackupManager.java | 6 - .../app/prediction/AppPredictionContext.java | 4 - .../app/prediction/AppPredictionManager.java | 2 - .../app/prediction/AppPredictionSessionId.java | 2 - core/java/android/app/prediction/AppPredictor.java | 1 - core/java/android/app/prediction/AppTarget.java | 5 - .../android/app/prediction/AppTargetEvent.java | 3 - core/java/android/app/prediction/AppTargetId.java | 3 - .../app/role/OnRoleHoldersChangedListener.java | 2 - core/java/android/app/role/RoleManager.java | 12 - core/java/android/app/usage/CacheQuotaHint.java | 2 - .../android/companion/CompanionDeviceManager.java | 2 - core/java/android/content/ApexEnvironment.java | 2 - .../android/content/ContentProviderClient.java | 2 - core/java/android/content/ContentResolver.java | 2 - core/java/android/content/Context.java | 11 +- core/java/android/content/Intent.java | 6 +- .../content/integrity/AppIntegrityManager.java | 1 - .../content/integrity/IntegrityFormula.java | 2 - core/java/android/content/integrity/Rule.java | 2 - core/java/android/content/integrity/RuleSet.java | 2 - core/java/android/content/pm/ApplicationInfo.java | 1 - core/java/android/content/pm/PackageInstaller.java | 16 +- core/java/android/content/pm/PackageManager.java | 30 +- core/java/android/content/pm/PermissionInfo.java | 11 - .../content/rollback/PackageRollbackInfo.java | 3 +- .../android/content/rollback/RollbackInfo.java | 3 +- .../android/content/rollback/RollbackManager.java | 3 +- .../android/hardware/camera2/CameraDevice.java | 5 - .../display/AmbientBrightnessDayStats.java | 2 - .../hardware/display/BrightnessChangeEvent.java | 2 - .../hardware/display/BrightnessConfiguration.java | 2 - .../hardware/display/BrightnessCorrection.java | 2 - .../android/hardware/display/DisplayManager.java | 6 - .../android/hardware/hdmi/HdmiControlManager.java | 2 - core/java/android/hardware/hdmi/HdmiPortInfo.java | 2 - .../android/hardware/hdmi/HdmiSwitchClient.java | 2 - core/java/android/hardware/lights/Light.java | 2 - core/java/android/hardware/lights/LightState.java | 2 - .../android/hardware/lights/LightsManager.java | 1 - .../android/hardware/lights/LightsRequest.java | 2 - .../hardware/soundtrigger/SoundTrigger.java | 1 - core/java/android/metrics/LogMaker.java | 2 - core/java/android/metrics/MetricsReader.java | 2 - core/java/android/net/CaptivePortal.java | 8 - core/java/android/net/CaptivePortalData.java | 2 - core/java/android/net/ConnectivityManager.java | 3 - core/java/android/net/EthernetManager.java | 1 - core/java/android/net/IpPrefix.java | 3 - core/java/android/net/LinkAddress.java | 12 - core/java/android/net/LinkProperties.java | 27 - core/java/android/net/Network.java | 4 - core/java/android/net/NetworkCapabilities.java | 5 - core/java/android/net/NetworkStack.java | 3 - core/java/android/net/RouteInfo.java | 6 - core/java/android/net/StaticIpConfiguration.java | 2 - core/java/android/net/apf/ApfCapabilities.java | 2 - core/java/android/net/metrics/ApfProgramEvent.java | 2 - core/java/android/net/metrics/ApfStats.java | 3 - core/java/android/net/metrics/DhcpClientEvent.java | 2 - core/java/android/net/metrics/DhcpErrorEvent.java | 2 - .../android/net/metrics/IpConnectivityLog.java | 3 - core/java/android/net/metrics/IpManagerEvent.java | 2 - .../android/net/metrics/IpReachabilityEvent.java | 2 - core/java/android/net/metrics/NetworkEvent.java | 2 - core/java/android/net/metrics/RaEvent.java | 2 - .../android/net/metrics/ValidationProbeEvent.java | 2 - core/java/android/net/util/SocketUtils.java | 2 - core/java/android/os/BatteryManager.java | 2 - core/java/android/os/BugreportManager.java | 3 +- core/java/android/os/BugreportParams.java | 2 - core/java/android/os/Environment.java | 5 - core/java/android/os/HidlMemory.java | 2 - core/java/android/os/HwBinder.java | 2 - core/java/android/os/HwBlob.java | 2 - core/java/android/os/HwParcel.java | 2 - core/java/android/os/IHwBinder.java | 2 - core/java/android/os/IHwInterface.java | 2 - core/java/android/os/IncidentManager.java | 4 - core/java/android/os/IncidentReportArgs.java | 2 - core/java/android/os/NativeHandle.java | 2 - core/java/android/os/PowerManager.java | 6 - core/java/android/os/RemoteCallback.java | 2 - core/java/android/os/SystemConfigManager.java | 2 - core/java/android/os/SystemProperties.java | 7 - core/java/android/os/UserHandle.java | 7 - core/java/android/os/UserManager.java | 3 +- core/java/android/os/Vibrator.java | 6 - core/java/android/os/WorkSource.java | 6 - .../java/android/os/image/DynamicSystemClient.java | 6 - core/java/android/os/storage/StorageManager.java | 2 - .../permission/PermissionControllerManager.java | 1 - .../java/android/permission/PermissionManager.java | 4 - .../RuntimePermissionPresentationInfo.java | 2 - core/java/android/provider/DeviceConfig.java | 25 +- core/java/android/provider/DocumentsContract.java | 3 - core/java/android/provider/Settings.java | 19 - core/java/android/provider/Telephony.java | 1 - .../appprediction/AppPredictionService.java | 2 - .../AutofillFieldClassificationService.java | 3 - core/java/android/service/autofill/Dataset.java | 3 - .../autofill/InlineSuggestionRenderService.java | 2 - .../augmented/AugmentedAutofillService.java | 2 - .../service/autofill/augmented/FillCallback.java | 2 - .../service/autofill/augmented/FillController.java | 2 - .../service/autofill/augmented/FillResponse.java | 2 - .../service/autofill/augmented/FillWindow.java | 2 - .../autofill/augmented/PresentationParams.java | 3 - .../service/contentcapture/ActivityEvent.java | 2 - .../contentcapture/ContentCaptureService.java | 3 - .../service/contentcapture/DataShareCallback.java | 2 - .../contentcapture/DataShareReadAdapter.java | 2 - .../service/contentcapture/SnapshotData.java | 2 - .../android/service/notification/Adjustment.java | 4 - .../notification/NotificationAssistantService.java | 2 - .../notification/NotificationListenerService.java | 2 - .../service/notification/NotificationStats.java | 2 - .../service/notification/SnoozeCriterion.java | 2 - .../textclassifier/TextClassifierService.java | 2 - .../watchdog/ExplicitHealthCheckService.java | 2 - .../java/android/telephony/PhoneStateListener.java | 7 - .../view/accessibility/AccessibilityManager.java | 3 - .../android/view/autofill/AutofillManager.java | 1 - .../view/contentcapture/ContentCaptureContext.java | 9 - .../view/contentcapture/ContentCaptureEvent.java | 2 - .../view/contentcapture/ContentCaptureManager.java | 1 - .../java/android/view/contentcapture/ViewNode.java | 1 - .../security/keystore/AttestationUtils.java | 2 - .../keystore/DeviceIdAttestationException.java | 2 - location/java/android/location/Location.java | 3 - .../java/android/location/LocationManager.java | 5 - .../java/android/location/LocationRequest.java | 14 - media/java/android/media/AudioFocusInfo.java | 2 - media/java/android/media/AudioManager.java | 6 - .../java/android/media/MediaTranscodeManager.java | 2 - media/java/android/media/audiopolicy/AudioMix.java | 2 - .../android/media/audiopolicy/AudioMixingRule.java | 2 - .../android/media/audiopolicy/AudioPolicy.java | 5 - .../musicrecognition/MusicRecognitionManager.java | 2 - .../musicrecognition/MusicRecognitionService.java | 2 - .../media/musicrecognition/RecognitionRequest.java | 3 - .../media/tv/tuner/TunerVersionChecker.java | 1 - telecomm/java/android/telecom/Call.java | 2 - .../java/android/telecom/CallScreeningService.java | 2 - telecomm/java/android/telecom/Conference.java | 6 - telecomm/java/android/telecom/Connection.java | 18 - .../java/android/telecom/ConnectionRequest.java | 1 - telecomm/java/android/telecom/PhoneAccount.java | 2 - .../telecom/PhoneAccountSuggestionService.java | 2 - telecomm/java/android/telecom/TelecomManager.java | 16 - .../android/telephony/AccessNetworkConstants.java | 6 - telephony/java/android/telephony/BarringInfo.java | 1 - telephony/java/android/telephony/CallQuality.java | 2 - .../android/telephony/CarrierConfigManager.java | 2 - .../telephony/DataSpecificRegistrationInfo.java | 2 - .../java/android/telephony/LteVopsSupportInfo.java | 2 - .../java/android/telephony/ModemActivityInfo.java | 1 - .../android/telephony/NetworkRegistrationInfo.java | 35 +- .../java/android/telephony/PhoneNumberUtils.java | 3 - .../android/telephony/SubscriptionManager.java | 8 - .../java/android/telephony/TelephonyManager.java | 22 +- .../android/telephony/ims/ImsCallForwardInfo.java | 2 - .../java/android/telephony/ims/ImsCallProfile.java | 1 - .../telephony/ims/ImsCallSessionListener.java | 2 - .../android/telephony/ims/ImsConferenceState.java | 2 - .../java/android/telephony/ims/ImsException.java | 4 - .../telephony/ims/ImsExternalCallState.java | 2 - .../android/telephony/ims/ImsMmTelManager.java | 36 +- .../java/android/telephony/ims/ImsService.java | 4 +- .../java/android/telephony/ims/ImsSsData.java | 2 - .../java/android/telephony/ims/ImsSsInfo.java | 2 - .../telephony/ims/ImsStreamMediaProfile.java | 2 - .../telephony/ims/ImsSuppServiceNotification.java | 2 - .../java/android/telephony/ims/ImsUtListener.java | 2 - .../telephony/ims/ImsVideoCallProvider.java | 3 - .../android/telephony/ims/ProvisioningManager.java | 2 - .../java/android/telephony/ims/RcsUceAdapter.java | 2 - .../ims/feature/CapabilityChangeRequest.java | 2 - .../android/telephony/ims/feature/ImsFeature.java | 23 +- .../telephony/ims/feature/MmTelFeature.java | 55 +- .../android/telephony/ims/feature/RcsFeature.java | 2 - .../telephony/ims/stub/ImsCallSessionImplBase.java | 2 - .../telephony/ims/stub/ImsConfigImplBase.java | 2 - .../telephony/ims/stub/ImsEcbmImplBase.java | 2 - .../ims/stub/ImsFeatureConfiguration.java | 2 - .../ims/stub/ImsMultiEndpointImplBase.java | 2 - .../ims/stub/ImsRegistrationImplBase.java | 2 - .../android/telephony/ims/stub/ImsSmsImplBase.java | 2 - .../android/telephony/ims/stub/ImsUtImplBase.java | 2 - .../android/telephony/mbms/DownloadRequest.java | 2 - .../java/android/telephony/mbms/FileInfo.java | 2 - .../android/telephony/mbms/FileServiceInfo.java | 2 - .../telephony/mbms/StreamingServiceInfo.java | 2 - .../java/android/telephony/mbms/UriPathPair.java | 2 - .../mbms/vendor/MbmsDownloadServiceBase.java | 4 - .../mbms/vendor/MbmsGroupCallServiceBase.java | 2 - .../mbms/vendor/MbmsStreamingServiceBase.java | 4 - .../android/telephony/mbms/vendor/VendorUtils.java | 2 - test-mock/api/test-current.txt | 9 - 213 files changed, 159 insertions(+), 4294 deletions(-) mode change 100755 => 100644 telecomm/java/android/telecom/Connection.java mode change 100755 => 100644 telephony/java/android/telephony/CarrierConfigManager.java (limited to 'telecomm/java') diff --git a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java index ada562ecebc6..752c36e53bf9 100644 --- a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java +++ b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java @@ -29,7 +29,6 @@ import android.content.Context; * * @hide */ -@TestApi @SystemApi @SystemService(Context.DEVICE_IDLE_CONTROLLER) public class DeviceIdleManager { diff --git a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java index 16dcd0674809..ab8722286efc 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import java.lang.annotation.Retention; @@ -39,7 +38,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi @SystemService(Context.POWER_WHITELIST_MANAGER) public class PowerWhitelistManager { private final Context mContext; diff --git a/api/test-current.txt b/api/test-current.txt index d61526a93e8a..b69ba9386ef0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -81,21 +81,14 @@ package android.app { public class ActivityManager { method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void addHomeVisibilityListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.HomeVisibilityListener); - method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int); method public void alwaysShowUnsupportedCompileSdkWarning(android.content.ComponentName); - method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String); - method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String); method public long getTotalRam(); - method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int); method @RequiresPermission(android.Manifest.permission.INJECT_EVENTS) public void holdLock(int); method public static boolean isHighEndGfx(); - method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[], @NonNull String); method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void removeHomeVisibilityListener(@NonNull android.app.HomeVisibilityListener); - method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener); method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors(); method public static void resumeAppSwitches() throws android.os.RemoteException; method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List, int); - method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull android.os.UserHandle); field public static final int PROCESS_CAPABILITY_ALL = 7; // 0x7 field public static final int PROCESS_CAPABILITY_ALL_EXPLICIT = 1; // 0x1 field public static final int PROCESS_CAPABILITY_ALL_IMPLICIT = 6; // 0x6 @@ -105,10 +98,6 @@ package android.app { field public static final int PROCESS_CAPABILITY_NONE = 0; // 0x0 } - public static interface ActivityManager.OnUidImportanceListener { - method public void onUidImportance(int, int); - } - public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable { field public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170; // 0xaa } @@ -204,15 +193,10 @@ package android.app { public class AppOpsManager { method @RequiresPermission("android.permission.MANAGE_APPOPS") public void addHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOps); method @RequiresPermission("android.permission.MANAGE_APPOPS") public void clearHistory(); - method @Nullable @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public android.app.RuntimeAppOpAccessMessage collectRuntimeAppOpAccessMessage(); - method @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission("android.permission.MANAGE_APPOPS") public void getHistoricalOpsFromDiskRaw(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @Nullable java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method public static int getNumOps(); - method public static String[] getOpStrs(); - method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List getOpsForPackage(int, @NonNull String, @Nullable java.lang.String...); method public boolean isOperationActive(int, int, String); method @RequiresPermission("android.permission.MANAGE_APPOPS") public void offsetHistory(long); - method public static int opToDefaultMode(@NonNull String); method public static String opToPermission(int); method public static int permissionToOpCode(String); method @RequiresPermission("android.permission.MANAGE_APPOPS") public void rebootHistory(long); @@ -220,8 +204,6 @@ package android.app { method @RequiresPermission("android.permission.MANAGE_APPOPS") public void resetHistoryParameters(); method @RequiresPermission("android.permission.MANAGE_APPOPS") public void setHistoryParameters(int, long, int); method @RequiresPermission("android.permission.MANAGE_APP_OPS_MODES") public void setMode(int, int, String, int); - method @RequiresPermission("android.permission.MANAGE_APP_OPS_MODES") public void setMode(@NonNull String, int, @Nullable String, int); - method @RequiresPermission("android.permission.MANAGE_APP_OPS_MODES") public void setUidMode(@NonNull String, int, int); method public static int strOpToOp(@NonNull String); field public static final int HISTORICAL_MODE_DISABLED = 0; // 0x0 field public static final int HISTORICAL_MODE_ENABLED_ACTIVE = 1; // 0x1 @@ -229,225 +211,19 @@ package android.app { field public static final String KEY_BG_STATE_SETTLE_TIME = "bg_state_settle_time"; field public static final String KEY_FG_SERVICE_STATE_SETTLE_TIME = "fg_service_state_settle_time"; field public static final String KEY_TOP_STATE_SETTLE_TIME = "top_state_settle_time"; - field public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover"; - field public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications"; - field public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn"; - field public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot"; - field public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure"; - field public static final String OPSTR_AUDIO_ACCESSIBILITY_VOLUME = "android:audio_accessibility_volume"; - field public static final String OPSTR_AUDIO_ALARM_VOLUME = "android:audio_alarm_volume"; - field public static final String OPSTR_AUDIO_BLUETOOTH_VOLUME = "android:audio_bluetooth_volume"; - field public static final String OPSTR_AUDIO_MASTER_VOLUME = "android:audio_master_volume"; - field public static final String OPSTR_AUDIO_MEDIA_VOLUME = "android:audio_media_volume"; - field public static final String OPSTR_AUDIO_NOTIFICATION_VOLUME = "android:audio_notification_volume"; - field public static final String OPSTR_AUDIO_RING_VOLUME = "android:audio_ring_volume"; - field public static final String OPSTR_AUDIO_VOICE_VOLUME = "android:audio_voice_volume"; - field public static final String OPSTR_BIND_ACCESSIBILITY_SERVICE = "android:bind_accessibility_service"; - field public static final String OPSTR_CHANGE_WIFI_STATE = "android:change_wifi_state"; - field public static final String OPSTR_GET_ACCOUNTS = "android:get_accounts"; - field public static final String OPSTR_GPS = "android:gps"; - field public static final String OPSTR_INSTANT_APP_START_FOREGROUND = "android:instant_app_start_foreground"; - field public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage"; - field public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage"; - field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels"; - field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone"; - field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells"; - field public static final String OPSTR_PLAY_AUDIO = "android:play_audio"; - field public static final String OPSTR_POST_NOTIFICATION = "android:post_notification"; - field public static final String OPSTR_PROJECT_MEDIA = "android:project_media"; - field public static final String OPSTR_READ_CLIPBOARD = "android:read_clipboard"; - field public static final String OPSTR_READ_ICC_SMS = "android:read_icc_sms"; - field public static final String OPSTR_READ_MEDIA_AUDIO = "android:read_media_audio"; - field public static final String OPSTR_READ_MEDIA_IMAGES = "android:read_media_images"; - field public static final String OPSTR_READ_MEDIA_VIDEO = "android:read_media_video"; - field public static final String OPSTR_RECEIVE_EMERGENCY_BROADCAST = "android:receive_emergency_broadcast"; - field public static final String OPSTR_REQUEST_DELETE_PACKAGES = "android:request_delete_packages"; - field public static final String OPSTR_REQUEST_INSTALL_PACKAGES = "android:request_install_packages"; - field public static final String OPSTR_RUN_ANY_IN_BACKGROUND = "android:run_any_in_background"; - field public static final String OPSTR_RUN_IN_BACKGROUND = "android:run_in_background"; - field public static final String OPSTR_START_FOREGROUND = "android:start_foreground"; - field public static final String OPSTR_TAKE_AUDIO_FOCUS = "android:take_audio_focus"; - field public static final String OPSTR_TAKE_MEDIA_BUTTONS = "android:take_media_buttons"; - field public static final String OPSTR_TOAST_WINDOW = "android:toast_window"; - field public static final String OPSTR_TURN_SCREEN_ON = "android:turn_screen_on"; - field public static final String OPSTR_VIBRATE = "android:vibrate"; - field public static final String OPSTR_WAKE_LOCK = "android:wake_lock"; - field public static final String OPSTR_WIFI_SCAN = "android:wifi_scan"; - field public static final String OPSTR_WRITE_CLIPBOARD = "android:write_clipboard"; - field public static final String OPSTR_WRITE_ICC_SMS = "android:write_icc_sms"; - field public static final String OPSTR_WRITE_MEDIA_AUDIO = "android:write_media_audio"; - field public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images"; - field public static final String OPSTR_WRITE_MEDIA_VIDEO = "android:write_media_video"; - field public static final String OPSTR_WRITE_SMS = "android:write_sms"; - field public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper"; field public static final int OP_COARSE_LOCATION = 0; // 0x0 - field public static final int OP_FLAGS_ALL = 31; // 0x1f - field public static final int OP_FLAG_SELF = 1; // 0x1 - field public static final int OP_FLAG_TRUSTED_PROXIED = 8; // 0x8 - field public static final int OP_FLAG_TRUSTED_PROXY = 2; // 0x2 - field public static final int OP_FLAG_UNTRUSTED_PROXIED = 16; // 0x10 - field public static final int OP_FLAG_UNTRUSTED_PROXY = 4; // 0x4 field public static final int OP_RECORD_AUDIO = 27; // 0x1b field public static final int OP_START_FOREGROUND = 76; // 0x4c field public static final int OP_SYSTEM_ALERT_WINDOW = 24; // 0x18 field public static final long SECURITY_EXCEPTION_ON_INVALID_ATTRIBUTION_TAG_CHANGE = 151105954L; // 0x901b1a2L - field public static final int UID_STATE_BACKGROUND = 600; // 0x258 - field public static final int UID_STATE_CACHED = 700; // 0x2bc - field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4 - field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190 - field @Deprecated public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c - field public static final int UID_STATE_PERSISTENT = 100; // 0x64 - field public static final int UID_STATE_TOP = 200; // 0xc8 - } - - public static final class AppOpsManager.AttributedHistoricalOps implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String); - method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(@IntRange(from=0) int); - method @IntRange(from=0) public int getOpCount(); - method @Nullable public String getTag(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.AttributedOpEntry implements android.os.Parcelable { - method public int describeContents(); - method public long getLastAccessBackgroundTime(int); - method public long getLastAccessForegroundTime(int); - method public long getLastAccessTime(int); - method public long getLastAccessTime(int, int, int); - method public long getLastBackgroundDuration(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastBackgroundProxyInfo(int); - method public long getLastDuration(int); - method public long getLastDuration(int, int, int); - method public long getLastForegroundDuration(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastForegroundProxyInfo(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastProxyInfo(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastProxyInfo(int, int, int); - method public long getLastRejectBackgroundTime(int); - method public long getLastRejectForegroundTime(int); - method public long getLastRejectTime(int); - method public long getLastRejectTime(int, int, int); - method public boolean isRunning(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.HistoricalOp implements android.os.Parcelable { - method public int describeContents(); - method public long getAccessCount(int, int, int); - method public long getAccessDuration(int, int, int); - method public long getBackgroundAccessCount(int); - method public long getBackgroundAccessDuration(int); - method public long getBackgroundRejectCount(int); - method public long getForegroundAccessCount(int); - method public long getForegroundAccessDuration(int); - method public long getForegroundRejectCount(int); - method @NonNull public String getOpName(); - method public long getRejectCount(int, int, int); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public static final class AppOpsManager.HistoricalOps implements android.os.Parcelable { ctor public AppOpsManager.HistoricalOps(long, long); - method public int describeContents(); - method public long getBeginTimeMillis(); - method public long getEndTimeMillis(); - method @IntRange(from=0) public int getUidCount(); - method @Nullable public android.app.AppOpsManager.HistoricalUidOps getUidOps(int); - method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(@IntRange(from=0) int); method public void increaseAccessCount(int, int, @NonNull String, @Nullable String, int, int, long); method public void increaseAccessDuration(int, int, @NonNull String, @Nullable String, int, int, long); method public void increaseRejectCount(int, int, @NonNull String, @Nullable String, int, int, long); method public void offsetBeginAndEndTime(long); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.HistoricalOpsRequest { - } - - public static final class AppOpsManager.HistoricalOpsRequest.Builder { - ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build(); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setAttributionTag(@Nullable String); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setFlags(int); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String); - method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int); - } - - public static final class AppOpsManager.HistoricalPackageOps implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.app.AppOpsManager.AttributedHistoricalOps getAttributedOps(@NonNull String); - method @NonNull public android.app.AppOpsManager.AttributedHistoricalOps getAttributedOpsAt(@IntRange(from=0) int); - method @IntRange(from=0) public int getAttributedOpsCount(); - method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String); - method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(@IntRange(from=0) int); - method @IntRange(from=0) public int getOpCount(); - method @NonNull public String getPackageName(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.HistoricalUidOps implements android.os.Parcelable { - method public int describeContents(); - method @IntRange(from=0) public int getPackageCount(); - method @Nullable public android.app.AppOpsManager.HistoricalPackageOps getPackageOps(@NonNull String); - method @NonNull public android.app.AppOpsManager.HistoricalPackageOps getPackageOpsAt(@IntRange(from=0) int); - method public int getUid(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.OpEntry implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public java.util.Map getAttributedOpEntries(); - method @Deprecated public long getDuration(); - method public long getLastAccessBackgroundTime(int); - method public long getLastAccessForegroundTime(int); - method public long getLastAccessTime(int); - method public long getLastAccessTime(int, int, int); - method public long getLastBackgroundDuration(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastBackgroundProxyInfo(int); - method public long getLastDuration(int); - method public long getLastDuration(int, int, int); - method public long getLastForegroundDuration(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastForegroundProxyInfo(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastProxyInfo(int); - method @Nullable public android.app.AppOpsManager.OpEventProxyInfo getLastProxyInfo(int, int, int); - method public long getLastRejectBackgroundTime(int); - method public long getLastRejectForegroundTime(int); - method public long getLastRejectTime(int); - method public long getLastRejectTime(int, int, int); - method public int getMode(); - method @NonNull public String getOpStr(); - method @Deprecated @Nullable public String getProxyPackageName(); - method @Deprecated @Nullable public String getProxyPackageName(int, int); - method @Deprecated public int getProxyUid(); - method @Deprecated public int getProxyUid(int, int); - method public boolean isRunning(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.OpEventProxyInfo implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public String getAttributionTag(); - method @Nullable public String getPackageName(); - method @IntRange(from=0) public int getUid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppOpsManager.PackageOps implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public java.util.List getOps(); - method @NonNull public String getPackageName(); - method public int getUid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public class DownloadManager { @@ -472,7 +248,6 @@ package android.app { method public boolean isImportanceLockedByCriticalDeviceFunction(); method public boolean isImportanceLockedByOEM(); method public void lockFields(int); - method public void setBlockable(boolean); method public void setDeleted(boolean); method public void setDemoted(boolean); method public void setFgServiceShown(boolean); @@ -480,7 +255,6 @@ package android.app { method public void setImportanceLockedByOEM(boolean); method public void setImportantConversation(boolean); method public void setOriginalImportance(int); - field public static final int USER_LOCKED_SOUND = 32; // 0x20 } public final class NotificationChannelGroup implements android.os.Parcelable { @@ -492,14 +266,8 @@ package android.app { public class NotificationManager { method public void allowAssistantAdjustment(String); method public void disallowAssistantAdjustment(String); - method @NonNull public java.util.List getAllowedAssistantAdjustments(); - method @Nullable public android.content.ComponentName getAllowedNotificationAssistant(); method public android.content.ComponentName getEffectsSuppressor(); - method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public java.util.List getEnabledNotificationListeners(); - method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName); method public boolean matchesCallFilter(android.os.Bundle); - method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean); - method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean); method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel); } @@ -509,36 +277,12 @@ package android.app { method public android.graphics.Rect getSourceRectHint(); } - public final class RuntimeAppOpAccessMessage implements android.os.Parcelable { - ctor public RuntimeAppOpAccessMessage(@IntRange(from=0L) int, @IntRange(from=0L) int, @NonNull String, @Nullable String, @NonNull String, int); - method public int describeContents(); - method @Nullable public String getAttributionTag(); - method @NonNull public String getMessage(); - method @NonNull public String getOp(); - method @NonNull public String getPackageName(); - method public int getSamplingStrategy(); - method @IntRange(from=0L) public int getUid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public class StatusBarManager { method public void collapsePanels(); method public void expandNotificationsPanel(); - method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo(); - method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean); method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setExpansionDisabledForSimNetworkLock(boolean); } - public static final class StatusBarManager.DisableInfo { - method public boolean areAllComponentsEnabled(); - method public boolean isNavigateToHomeDisabled(); - method public boolean isNotificationPeekingDisabled(); - method public boolean isRecentsDisabled(); - method public boolean isSearchDisabled(); - method public boolean isStatusBarExpansionDisabled(); - } - public class TaskInfo { method @NonNull public android.content.res.Configuration getConfiguration(); method @NonNull public android.window.WindowContainerToken getToken(); @@ -557,14 +301,12 @@ package android.app { } public class UiModeManager { - method @RequiresPermission(android.Manifest.permission.ENTER_CAR_MODE_PRIORITIZED) public void enableCarMode(@IntRange(from=0) int, int); method public boolean isNightModeLocked(); method public boolean isUiModeLocked(); } public class WallpaperManager { method @Nullable public android.graphics.Bitmap getBitmap(); - method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName); method public boolean shouldEnableWideColorGamut(); method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public boolean wallpaperSupportsWcg(int); } @@ -609,18 +351,13 @@ package android.app { package android.app.admin { public class DevicePolicyManager { - method @Nullable public CharSequence getDeviceOwnerOrganizationName(); method public long getLastBugReportRequestTime(); method public long getLastNetworkLogRetrievalTime(); method public long getLastSecurityLogRetrievalTime(); method public java.util.List getOwnerInstalledCaCerts(@NonNull android.os.UserHandle); method public boolean isCurrentInputMethodSetByOwner(); - method public boolean isDeviceManaged(); method public boolean isFactoryResetProtectionPolicySupported(); - field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED"; - field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED"; field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED"; - field public static final String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION"; } public static final class SecurityLog.SecurityEvent implements android.os.Parcelable { @@ -629,26 +366,6 @@ package android.app.admin { } -package android.app.assist { - - public static class AssistStructure.ViewNode { - ctor public AssistStructure.ViewNode(); - } - -} - -package android.app.backup { - - public class BackupManager { - method @RequiresPermission(android.Manifest.permission.BACKUP) public android.content.Intent getConfigurationIntent(String); - method @RequiresPermission(android.Manifest.permission.BACKUP) public android.content.Intent getDataManagementIntent(String); - method @Nullable @RequiresPermission(android.Manifest.permission.BACKUP) public CharSequence getDataManagementIntentLabel(@NonNull String); - method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.BACKUP) public String getDataManagementLabel(@NonNull String); - method @RequiresPermission(android.Manifest.permission.BACKUP) public String getDestinationString(String); - } - -} - package android.app.blob { public class BlobStoreManager { @@ -671,150 +388,27 @@ package android.app.blob { package android.app.prediction { - public final class AppPredictionContext implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.os.Bundle getExtras(); - method @NonNull public String getPackageName(); - method @IntRange(from=0) public int getPredictedTargetCount(); - method @NonNull public String getUiSurface(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppPredictionContext.Builder { - ctor public AppPredictionContext.Builder(@NonNull android.content.Context); - method @NonNull public android.app.prediction.AppPredictionContext build(); - method @NonNull public android.app.prediction.AppPredictionContext.Builder setExtras(@Nullable android.os.Bundle); - method @NonNull public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(@IntRange(from=0) int); - method @NonNull public android.app.prediction.AppPredictionContext.Builder setUiSurface(@NonNull String); - } - - public final class AppPredictionManager { - method @NonNull public android.app.prediction.AppPredictor createAppPredictionSession(@NonNull android.app.prediction.AppPredictionContext); - } - - public final class AppPredictionSessionId implements android.os.Parcelable { - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class AppPredictor { - method public void destroy(); method public android.app.prediction.AppPredictionSessionId getSessionId(); - method public void notifyAppTargetEvent(@NonNull android.app.prediction.AppTargetEvent); - method public void notifyLaunchLocationShown(@NonNull String, @NonNull java.util.List); - method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback); - method public void requestPredictionUpdate(); - method @Nullable public void sortTargets(@NonNull java.util.List, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer>); - method public void unregisterPredictionUpdates(@NonNull android.app.prediction.AppPredictor.Callback); - } - - public static interface AppPredictor.Callback { - method public void onTargetsAvailable(@NonNull java.util.List); - } - - public final class AppTarget implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public String getClassName(); - method @NonNull public android.app.prediction.AppTargetId getId(); - method @NonNull public String getPackageName(); - method @IntRange(from=0) public int getRank(); - method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo(); - method @NonNull public android.os.UserHandle getUser(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppTarget.Builder { - ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle); - ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo); - method @NonNull public android.app.prediction.AppTarget build(); - method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String); - method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int); - } - - public final class AppTargetEvent implements android.os.Parcelable { - method public int describeContents(); - method public int getAction(); - method @Nullable public String getLaunchLocation(); - method @Nullable public android.app.prediction.AppTarget getTarget(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int ACTION_DISMISS = 2; // 0x2 - field public static final int ACTION_LAUNCH = 1; // 0x1 - field public static final int ACTION_PIN = 3; // 0x3 - field public static final int ACTION_UNPIN = 4; // 0x4 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class AppTargetEvent.Builder { - ctor public AppTargetEvent.Builder(@Nullable android.app.prediction.AppTarget, int); - method @NonNull public android.app.prediction.AppTargetEvent build(); - method @NonNull public android.app.prediction.AppTargetEvent.Builder setLaunchLocation(@Nullable String); - } - - public final class AppTargetId implements android.os.Parcelable { - ctor public AppTargetId(@NonNull String); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } } package android.app.role { - public interface OnRoleHoldersChangedListener { - method public void onRoleHoldersChanged(@NonNull String, @NonNull android.os.UserHandle); - } - public class RoleControllerManager { method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isApplicationVisibleForRole(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void isRoleVisible(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); } public final class RoleManager { - method @RequiresPermission(android.Manifest.permission.OBSERVE_ROLE_HOLDERS) public void addOnRoleHoldersChangedListenerAsUser(@NonNull java.util.concurrent.Executor, @NonNull android.app.role.OnRoleHoldersChangedListener, @NonNull android.os.UserHandle); - method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void addRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean addRoleHolderFromController(@NonNull String, @NonNull String); - method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void clearRoleHoldersAsUser(@NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @NonNull @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public java.util.List getHeldRolesFromController(@NonNull String); - method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List getRoleHolders(@NonNull String); - method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle); method @Nullable public String getSmsRoleHolder(int); - method @RequiresPermission(android.Manifest.permission.OBSERVE_ROLE_HOLDERS) public void removeOnRoleHoldersChangedListenerAsUser(@NonNull android.app.role.OnRoleHoldersChangedListener, @NonNull android.os.UserHandle); - method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void removeRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean removeRoleHolderFromController(@NonNull String, @NonNull String); - method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public void setRoleNamesFromController(@NonNull java.util.List); - field public static final int MANAGE_HOLDERS_FLAG_DONT_KILL_APP = 1; // 0x1 } } package android.app.usage { - public final class CacheQuotaHint implements android.os.Parcelable { - ctor public CacheQuotaHint(@NonNull android.app.usage.CacheQuotaHint.Builder); - method public int describeContents(); - method public long getQuota(); - method public int getUid(); - method @Nullable public android.app.usage.UsageStats getUsageStats(); - method @Nullable public String getVolumeUuid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final long QUOTA_NOT_SET = -1L; // 0xffffffffffffffffL - } - - public static final class CacheQuotaHint.Builder { - ctor public CacheQuotaHint.Builder(); - ctor public CacheQuotaHint.Builder(@NonNull android.app.usage.CacheQuotaHint); - method @NonNull public android.app.usage.CacheQuotaHint build(); - method @NonNull public android.app.usage.CacheQuotaHint.Builder setQuota(long); - method @NonNull public android.app.usage.CacheQuotaHint.Builder setUid(int); - method @NonNull public android.app.usage.CacheQuotaHint.Builder setUsageStats(@Nullable android.app.usage.UsageStats); - method @NonNull public android.app.usage.CacheQuotaHint.Builder setVolumeUuid(@Nullable String); - } - public class NetworkStatsManager { method public void setPollForce(boolean); } @@ -845,23 +439,8 @@ package android.bluetooth { } -package android.companion { - - public final class CompanionDeviceManager { - method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public boolean isDeviceAssociatedForWifiConnection(@NonNull String, @NonNull android.net.MacAddress, @NonNull android.os.UserHandle); - } - -} - package android.content { - public class ApexEnvironment { - method @NonNull public static android.content.ApexEnvironment getApexEnvironment(@NonNull String); - method @NonNull public java.io.File getCredentialProtectedDataDirForUser(@NonNull android.os.UserHandle); - method @NonNull public java.io.File getDeviceProtectedDataDir(); - method @NonNull public java.io.File getDeviceProtectedDataDirForUser(@NonNull android.os.UserHandle); - } - public final class AutofillOptions implements android.os.Parcelable { ctor public AutofillOptions(int, boolean); method public int describeContents(); @@ -897,36 +476,21 @@ package android.content { method @NonNull public static android.os.UserHandle getUserHandleFromUri(@NonNull android.net.Uri); } - public class ContentProviderClient implements java.lang.AutoCloseable { - method @RequiresPermission(android.Manifest.permission.REMOVE_TASKS) public void setDetectNotResponding(long); - } - public abstract class ContentResolver { - method @NonNull public static android.net.Uri decodeFromFile(@NonNull java.io.File); - method @NonNull public static java.io.File encodeToFile(@NonNull android.net.Uri); method public static String[] getSyncAdapterPackagesForAuthorityAsUser(String, int); } public abstract class Context { - method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle, int); - method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public java.io.File getCrateDir(@NonNull String); method public abstract int getDisplayId(); method public android.os.UserHandle getUser(); method public int getUserId(); method public void setAutofillOptions(@Nullable android.content.AutofillOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); - method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle); - field public static final String APP_INTEGRITY_SERVICE = "app_integrity"; - field public static final String BUGREPORT_SERVICE = "bugreport"; field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle"; field public static final String DREAM_SERVICE = "dream"; - field public static final String ETHERNET_SERVICE = "ethernet"; - field public static final String PERMISSION_SERVICE = "permission"; field public static final String POWER_WHITELIST_MANAGER = "power_whitelist"; - field public static final String ROLLBACK_SERVICE = "rollback"; - field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String TEST_NETWORK_SERVICE = "test_network"; } @@ -934,75 +498,13 @@ package android.content { method public int getDisplayId(); } - public class Intent implements java.lang.Cloneable android.os.Parcelable { - field @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public static final String ACTION_MANAGE_DEFAULT_APP = "android.intent.action.MANAGE_DEFAULT_APP"; - field public static final String ACTION_ROLLBACK_COMMITTED = "android.intent.action.ROLLBACK_COMMITTED"; - field public static final String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID"; - field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME"; - } - } package android.content.integrity { public class AppIntegrityManager { method @NonNull public android.content.integrity.RuleSet getCurrentRuleSet(); - method @NonNull public String getCurrentRuleSetProvider(); - method @NonNull public String getCurrentRuleSetVersion(); method @NonNull public java.util.List getWhitelistedRuleProviders(); - method public void updateRuleSet(@NonNull android.content.integrity.RuleSet, @NonNull android.content.IntentSender); - field public static final String EXTRA_STATUS = "android.content.integrity.extra.STATUS"; - field public static final int STATUS_FAILURE = 1; // 0x1 - field public static final int STATUS_SUCCESS = 0; // 0x0 - } - - public abstract class IntegrityFormula { - method @NonNull public static android.content.integrity.IntegrityFormula all(@NonNull android.content.integrity.IntegrityFormula...); - method @NonNull public static android.content.integrity.IntegrityFormula any(@NonNull android.content.integrity.IntegrityFormula...); - method @NonNull public static android.content.integrity.IntegrityFormula not(@NonNull android.content.integrity.IntegrityFormula); - } - - public static final class IntegrityFormula.Application { - method @NonNull public static android.content.integrity.IntegrityFormula certificatesContain(@NonNull String); - method @NonNull public static android.content.integrity.IntegrityFormula isPreInstalled(); - method @NonNull public static android.content.integrity.IntegrityFormula packageNameEquals(@NonNull String); - method @NonNull public static android.content.integrity.IntegrityFormula versionCodeEquals(@NonNull long); - method @NonNull public static android.content.integrity.IntegrityFormula versionCodeGreaterThan(@NonNull long); - method @NonNull public static android.content.integrity.IntegrityFormula versionCodeGreaterThanOrEqualTo(@NonNull long); - } - - public static final class IntegrityFormula.Installer { - method @NonNull public static android.content.integrity.IntegrityFormula certificatesContain(@NonNull String); - method @NonNull public static android.content.integrity.IntegrityFormula notAllowedByManifest(); - method @NonNull public static android.content.integrity.IntegrityFormula packageNameEquals(@NonNull String); - } - - public static final class IntegrityFormula.SourceStamp { - method @NonNull public static android.content.integrity.IntegrityFormula notTrusted(); - method @NonNull public static android.content.integrity.IntegrityFormula stampCertificateHashEquals(@NonNull String); - } - - public final class Rule implements android.os.Parcelable { - ctor public Rule(@NonNull android.content.integrity.IntegrityFormula, int); - method public int describeContents(); - method public int getEffect(); - method @NonNull public android.content.integrity.IntegrityFormula getFormula(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int DENY = 0; // 0x0 - field public static final int FORCE_ALLOW = 1; // 0x1 - } - - public class RuleSet { - method @NonNull public java.util.List getRules(); - method @NonNull public String getVersion(); - } - - public static class RuleSet.Builder { - ctor public RuleSet.Builder(); - method @NonNull public android.content.integrity.RuleSet.Builder addRules(@NonNull java.util.List); - method @NonNull public android.content.integrity.RuleSet build(); - method @NonNull public android.content.integrity.RuleSet.Builder setVersion(@NonNull String); } } @@ -1019,95 +521,38 @@ package android.content.pm { method public boolean isSystemApp(); field public static final int PRIVATE_FLAG_PRIVILEGED = 8; // 0x8 field public int privateFlags; - field public int targetSandboxVersion; } public class LauncherApps { ctor public LauncherApps(android.content.Context); } - public static class PackageInstaller.SessionInfo implements android.os.Parcelable { - method public int getAutoRevokePermissionsMode(); - method public int getRollbackDataPolicy(); - method @NonNull public java.util.Set getWhitelistedRestrictedPermissions(); - } - public static class PackageInstaller.SessionParams implements android.os.Parcelable { - method public void setEnableRollback(boolean); - method public void setEnableRollback(boolean, int); - method @RequiresPermission(android.Manifest.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS) public void setGrantedRuntimePermissions(String[]); - method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setInstallAsApex(); - method public void setInstallAsInstantApp(boolean); method public void setInstallerPackageName(@Nullable String); - method public void setRequestDowngrade(boolean); - method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setStaged(); } public abstract class PackageManager { - method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void addOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener); - method public abstract boolean arePermissionsIndividuallyControlled(); method @Nullable public String getContentCaptureServicePackageName(); - method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract String getDefaultBrowserPackageNameAsUser(int); method @Nullable public String getDefaultTextClassifierPackageName(); - method @Nullable public String getIncidentReportApproverPackageName(); method public abstract int getInstallReason(@NonNull String, @NonNull android.os.UserHandle); method @NonNull public abstract java.util.List getInstalledApplicationsAsUser(int, int); - method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract java.util.List getInstalledPackagesAsUser(int, int); method @Nullable public abstract String[] getNamesForUids(int[]); method @NonNull public abstract String getPermissionControllerPackageName(); - method @android.content.pm.PackageManager.PermissionFlags @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, android.Manifest.permission.GET_RUNTIME_PERMISSIONS}) public abstract int getPermissionFlags(@NonNull String, @NonNull String, @NonNull android.os.UserHandle); method @NonNull public abstract String getServicesSystemSharedLibraryPackageName(); method @NonNull public abstract String getSharedSystemSharedLibraryPackageName(); method @Nullable public String getSystemTextClassifierPackageName(); method @Nullable public String getWellbeingPackageName(); - method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle); method @RequiresPermission(android.Manifest.permission.INJECT_EVENTS) public void holdLock(int); - method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void removeOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener); - method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle); - method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle, @NonNull String); - method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract void updatePermissionFlags(@NonNull String, @NonNull String, @android.content.pm.PackageManager.PermissionFlags int, @android.content.pm.PackageManager.PermissionFlags int, @NonNull android.os.UserHandle); field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage"; field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption"; - field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000 - field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20 - field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000 - field public static final int FLAG_PERMISSION_ONE_TIME = 65536; // 0x10000 - field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4 - field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800 - field public static final int FLAG_PERMISSION_RESTRICTION_ROLE_EXEMPT = 262144; // 0x40000 - field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000 - field public static final int FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT = 8192; // 0x2000 - field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40 - field public static final int FLAG_PERMISSION_REVOKED_COMPAT = 8; // 0x8 - field @Deprecated public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8 field public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 128; // 0x80 - field public static final int FLAG_PERMISSION_SYSTEM_FIXED = 16; // 0x10 - field public static final int FLAG_PERMISSION_USER_FIXED = 2; // 0x2 - field public static final int FLAG_PERMISSION_USER_SET = 1; // 0x1 - field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000 field public static final int MATCH_KNOWN_PACKAGES = 4202496; // 0x402000 - field public static final int MODULE_APEX_NAME = 1; // 0x1 field public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services"; field public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared"; } - public static interface PackageManager.OnPermissionsChangedListener { - method public void onPermissionsChanged(int); - } - public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable { - field public static final int FLAG_REMOVED = 2; // 0x2 - field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000 - field public static final int PROTECTION_FLAG_COMPANION = 8388608; // 0x800000 - field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000 - field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000 - field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000 - field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000 - field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000 - field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000 field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000 - field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000 - field @Nullable public final String backgroundPermission; } public final class ProviderInfoList implements android.os.Parcelable { @@ -1146,40 +591,11 @@ package android.content.res { package android.content.rollback { - public final class PackageRollbackInfo implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public String getPackageName(); - method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackFrom(); - method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackTo(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public final class RollbackInfo implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public java.util.List getCausePackages(); - method public int getCommittedSessionId(); - method @NonNull public java.util.List getPackages(); - method public int getRollbackId(); - method public boolean isStaged(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class RollbackManager { method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void blockRollbackManager(long); - method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public void commitRollback(int, @NonNull java.util.List, @NonNull android.content.IntentSender); method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String); - method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public java.util.List getAvailableRollbacks(); - method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public java.util.List getRecentlyCommittedRollbacks(); method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void reloadPersistedData(); - field public static final String EXTRA_STATUS = "android.content.rollback.extra.STATUS"; - field public static final String EXTRA_STATUS_MESSAGE = "android.content.rollback.extra.STATUS_MESSAGE"; field public static final String PROPERTY_ROLLBACK_LIFETIME_MILLIS = "rollback_lifetime_in_millis"; - field public static final int STATUS_FAILURE = 1; // 0x1 - field public static final int STATUS_FAILURE_INSTALL = 3; // 0x3 - field public static final int STATUS_FAILURE_ROLLBACK_UNAVAILABLE = 2; // 0x2 - field public static final int STATUS_SUCCESS = 0; // 0x0 } } @@ -1290,13 +706,6 @@ package android.hardware.biometrics { package android.hardware.camera2 { - public abstract class CameraDevice implements java.lang.AutoCloseable { - method @Deprecated public abstract void createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, @NonNull java.util.List, int, @NonNull android.hardware.camera2.CameraCaptureSession.StateCallback, @Nullable android.os.Handler) throws android.hardware.camera2.CameraAccessException; - field public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED = 1; // 0x1 - field public static final int SESSION_OPERATION_MODE_NORMAL = 0; // 0x0 - field public static final int SESSION_OPERATION_MODE_VENDOR_START = 32768; // 0x8000 - } - public final class CameraManager { method public String[] getCameraIdListNoLazy() throws android.hardware.camera2.CameraAccessException; } @@ -1305,15 +714,6 @@ package android.hardware.camera2 { package android.hardware.display { - public final class AmbientBrightnessDayStats implements android.os.Parcelable { - method public int describeContents(); - method public float[] getBucketBoundaries(); - method public java.time.LocalDate getLocalDate(); - method public float[] getStats(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public class AmbientDisplayConfiguration { ctor public AmbientDisplayConfiguration(android.content.Context); method public boolean alwaysOnAvailable(); @@ -1321,70 +721,8 @@ package android.hardware.display { method public boolean alwaysOnEnabled(int); } - public final class BrightnessChangeEvent implements android.os.Parcelable { - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public final float batteryLevel; - field public final float brightness; - field public final long colorSampleDuration; - field public final int colorTemperature; - field @Nullable public final long[] colorValueBuckets; - field public final boolean isDefaultBrightnessConfig; - field public final boolean isUserSetBrightness; - field public final float lastBrightness; - field public final long[] luxTimestamps; - field public final float[] luxValues; - field public final boolean nightMode; - field public final String packageName; - field public final float powerBrightnessFactor; - field public final long timeStamp; - } - - public final class BrightnessConfiguration implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByCategory(int); - method @Nullable public android.hardware.display.BrightnessCorrection getCorrectionByPackageName(@NonNull String); - method public android.util.Pair getCurve(); - method public float getShortTermModelLowerLuxMultiplier(); - method public long getShortTermModelTimeoutMillis(); - method public float getShortTermModelUpperLuxMultiplier(); - method public boolean shouldCollectColorSamples(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final long SHORT_TERM_TIMEOUT_UNSET = -1L; // 0xffffffffffffffffL - } - - public static class BrightnessConfiguration.Builder { - ctor public BrightnessConfiguration.Builder(float[], float[]); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder addCorrectionByCategory(int, @NonNull android.hardware.display.BrightnessCorrection); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder addCorrectionByPackageName(@NonNull String, @NonNull android.hardware.display.BrightnessCorrection); - method @NonNull public android.hardware.display.BrightnessConfiguration build(); - method public int getMaxCorrectionsByCategory(); - method public int getMaxCorrectionsByPackageName(); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setDescription(@Nullable String); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelLowerLuxMultiplier(@FloatRange(from=0.0f) float); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelTimeoutMillis(long); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShortTermModelUpperLuxMultiplier(@FloatRange(from=0.0f) float); - method @NonNull public android.hardware.display.BrightnessConfiguration.Builder setShouldCollectColorSamples(boolean); - } - - public final class BrightnessCorrection implements android.os.Parcelable { - method @FloatRange(from=0.0) public float apply(@FloatRange(from=0.0) float); - method @NonNull public static android.hardware.display.BrightnessCorrection createScaleAndTranslateLog(float, float); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class DisplayManager { - method @RequiresPermission(android.Manifest.permission.ACCESS_AMBIENT_LIGHT_STATS) public java.util.List getAmbientBrightnessStats(); - method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public android.hardware.display.BrightnessConfiguration getBrightnessConfiguration(); - method @RequiresPermission(android.Manifest.permission.BRIGHTNESS_SLIDER_USAGE) public java.util.List getBrightnessEvents(); - method @Nullable @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public android.hardware.display.BrightnessConfiguration getDefaultBrightnessConfiguration(); - method public android.graphics.Point getStableDisplaySize(); method public boolean isMinimalPostProcessingRequested(int); - method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration); method @RequiresPermission(android.Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS) public void setShouldAlwaysRespectAppRequestedMode(boolean); method @RequiresPermission(android.Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS) public boolean shouldAlwaysRespectAppRequestedMode(); field public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 512; // 0x200 @@ -1404,97 +742,6 @@ package android.hardware.fingerprint { package android.hardware.hdmi { - public final class HdmiControlManager { - method @Nullable public android.hardware.hdmi.HdmiSwitchClient getSwitchClient(); - method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setStandbyMode(boolean); - field public static final String ACTION_OSD_MESSAGE = "android.hardware.hdmi.action.OSD_MESSAGE"; - field public static final int AVR_VOLUME_MUTED = 101; // 0x65 - field public static final int CLEAR_TIMER_STATUS_CEC_DISABLE = 162; // 0xa2 - field public static final int CLEAR_TIMER_STATUS_CHECK_RECORDER_CONNECTION = 160; // 0xa0 - field public static final int CLEAR_TIMER_STATUS_FAIL_TO_CLEAR_SELECTED_SOURCE = 161; // 0xa1 - field public static final int CLEAR_TIMER_STATUS_TIMER_CLEARED = 128; // 0x80 - field public static final int CLEAR_TIMER_STATUS_TIMER_NOT_CLEARED_NO_INFO_AVAILABLE = 2; // 0x2 - field public static final int CLEAR_TIMER_STATUS_TIMER_NOT_CLEARED_NO_MATCHING = 1; // 0x1 - field public static final int CLEAR_TIMER_STATUS_TIMER_NOT_CLEARED_RECORDING = 0; // 0x0 - field public static final int CONTROL_STATE_CHANGED_REASON_SETTING = 1; // 0x1 - field public static final int CONTROL_STATE_CHANGED_REASON_STANDBY = 3; // 0x3 - field public static final int CONTROL_STATE_CHANGED_REASON_START = 0; // 0x0 - field public static final int CONTROL_STATE_CHANGED_REASON_WAKEUP = 2; // 0x2 - field public static final int DEVICE_EVENT_ADD_DEVICE = 1; // 0x1 - field public static final int DEVICE_EVENT_REMOVE_DEVICE = 2; // 0x2 - field public static final int DEVICE_EVENT_UPDATE_DEVICE = 3; // 0x3 - field public static final String EXTRA_MESSAGE_EXTRA_PARAM1 = "android.hardware.hdmi.extra.MESSAGE_EXTRA_PARAM1"; - field public static final String EXTRA_MESSAGE_ID = "android.hardware.hdmi.extra.MESSAGE_ID"; - field public static final int ONE_TOUCH_RECORD_ALREADY_RECORDING = 18; // 0x12 - field public static final int ONE_TOUCH_RECORD_CEC_DISABLED = 51; // 0x33 - field public static final int ONE_TOUCH_RECORD_CHECK_RECORDER_CONNECTION = 49; // 0x31 - field public static final int ONE_TOUCH_RECORD_DISALLOW_TO_COPY = 13; // 0xd - field public static final int ONE_TOUCH_RECORD_DISALLOW_TO_FUTHER_COPIES = 14; // 0xe - field public static final int ONE_TOUCH_RECORD_FAIL_TO_RECORD_DISPLAYED_SCREEN = 50; // 0x32 - field public static final int ONE_TOUCH_RECORD_INVALID_EXTERNAL_PHYSICAL_ADDRESS = 10; // 0xa - field public static final int ONE_TOUCH_RECORD_INVALID_EXTERNAL_PLUG_NUMBER = 9; // 0x9 - field public static final int ONE_TOUCH_RECORD_MEDIA_PROBLEM = 21; // 0x15 - field public static final int ONE_TOUCH_RECORD_MEDIA_PROTECTED = 19; // 0x13 - field public static final int ONE_TOUCH_RECORD_NOT_ENOUGH_SPACE = 22; // 0x16 - field public static final int ONE_TOUCH_RECORD_NO_MEDIA = 16; // 0x10 - field public static final int ONE_TOUCH_RECORD_NO_OR_INSUFFICIENT_CA_ENTITLEMENTS = 12; // 0xc - field public static final int ONE_TOUCH_RECORD_NO_SOURCE_SIGNAL = 20; // 0x14 - field public static final int ONE_TOUCH_RECORD_OTHER_REASON = 31; // 0x1f - field public static final int ONE_TOUCH_RECORD_PARENT_LOCK_ON = 23; // 0x17 - field public static final int ONE_TOUCH_RECORD_PLAYING = 17; // 0x11 - field public static final int ONE_TOUCH_RECORD_PREVIOUS_RECORDING_IN_PROGRESS = 48; // 0x30 - field public static final int ONE_TOUCH_RECORD_RECORDING_ALREADY_TERMINATED = 27; // 0x1b - field public static final int ONE_TOUCH_RECORD_RECORDING_ANALOGUE_SERVICE = 3; // 0x3 - field public static final int ONE_TOUCH_RECORD_RECORDING_CURRENTLY_SELECTED_SOURCE = 1; // 0x1 - field public static final int ONE_TOUCH_RECORD_RECORDING_DIGITAL_SERVICE = 2; // 0x2 - field public static final int ONE_TOUCH_RECORD_RECORDING_EXTERNAL_INPUT = 4; // 0x4 - field public static final int ONE_TOUCH_RECORD_RECORDING_TERMINATED_NORMALLY = 26; // 0x1a - field public static final int ONE_TOUCH_RECORD_UNABLE_ANALOGUE_SERVICE = 6; // 0x6 - field public static final int ONE_TOUCH_RECORD_UNABLE_DIGITAL_SERVICE = 5; // 0x5 - field public static final int ONE_TOUCH_RECORD_UNABLE_SELECTED_SERVICE = 7; // 0x7 - field public static final int ONE_TOUCH_RECORD_UNSUPPORTED_CA = 11; // 0xb - field public static final int OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT = 1; // 0x1 - field public static final int OSD_MESSAGE_AVR_VOLUME_CHANGED = 2; // 0x2 - field public static final int POWER_STATUS_ON = 0; // 0x0 - field public static final int POWER_STATUS_STANDBY = 1; // 0x1 - field public static final int POWER_STATUS_TRANSIENT_TO_ON = 2; // 0x2 - field public static final int POWER_STATUS_TRANSIENT_TO_STANDBY = 3; // 0x3 - field public static final int POWER_STATUS_UNKNOWN = -1; // 0xffffffff - field @Deprecated public static final int RESULT_ALREADY_IN_PROGRESS = 4; // 0x4 - field public static final int RESULT_COMMUNICATION_FAILED = 7; // 0x7 - field public static final int RESULT_EXCEPTION = 5; // 0x5 - field public static final int RESULT_INCORRECT_MODE = 6; // 0x6 - field public static final int RESULT_SOURCE_NOT_AVAILABLE = 2; // 0x2 - field public static final int RESULT_SUCCESS = 0; // 0x0 - field public static final int RESULT_TARGET_NOT_AVAILABLE = 3; // 0x3 - field public static final int RESULT_TIMEOUT = 1; // 0x1 - field public static final int TIMER_RECORDING_RESULT_EXTRA_CEC_DISABLED = 3; // 0x3 - field public static final int TIMER_RECORDING_RESULT_EXTRA_CHECK_RECORDER_CONNECTION = 1; // 0x1 - field public static final int TIMER_RECORDING_RESULT_EXTRA_FAIL_TO_RECORD_SELECTED_SOURCE = 2; // 0x2 - field public static final int TIMER_RECORDING_RESULT_EXTRA_NO_ERROR = 0; // 0x0 - field public static final int TIMER_RECORDING_TYPE_ANALOGUE = 2; // 0x2 - field public static final int TIMER_RECORDING_TYPE_DIGITAL = 1; // 0x1 - field public static final int TIMER_RECORDING_TYPE_EXTERNAL = 3; // 0x3 - field public static final int TIMER_STATUS_MEDIA_INFO_NOT_PRESENT = 2; // 0x2 - field public static final int TIMER_STATUS_MEDIA_INFO_PRESENT_NOT_PROTECTED = 0; // 0x0 - field public static final int TIMER_STATUS_MEDIA_INFO_PRESENT_PROTECTED = 1; // 0x1 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_CA_NOT_SUPPORTED = 6; // 0x6 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_CLOCK_FAILURE = 10; // 0xa - field public static final int TIMER_STATUS_NOT_PROGRAMMED_DATE_OUT_OF_RANGE = 2; // 0x2 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_DUPLICATED = 14; // 0xe - field public static final int TIMER_STATUS_NOT_PROGRAMMED_INVALID_EXTERNAL_PHYSICAL_NUMBER = 5; // 0x5 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_INVALID_EXTERNAL_PLUG_NUMBER = 4; // 0x4 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_INVALID_SEQUENCE = 3; // 0x3 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_NO_CA_ENTITLEMENTS = 7; // 0x7 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_NO_FREE_TIME = 1; // 0x1 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_PARENTAL_LOCK_ON = 9; // 0x9 - field public static final int TIMER_STATUS_NOT_PROGRAMMED_UNSUPPORTED_RESOLUTION = 8; // 0x8 - field public static final int TIMER_STATUS_PROGRAMMED_INFO_ENOUGH_SPACE = 8; // 0x8 - field public static final int TIMER_STATUS_PROGRAMMED_INFO_MIGHT_NOT_ENOUGH_SPACE = 11; // 0xb - field public static final int TIMER_STATUS_PROGRAMMED_INFO_NOT_ENOUGH_SPACE = 9; // 0x9 - field public static final int TIMER_STATUS_PROGRAMMED_INFO_NO_MEDIA_INFO = 10; // 0xa - } - public final class HdmiControlServiceWrapper { ctor public HdmiControlServiceWrapper(); method @NonNull public android.hardware.hdmi.HdmiControlManager createHdmiControlManager(); @@ -1503,25 +750,6 @@ package android.hardware.hdmi { field public static final int DEVICE_PURE_CEC_SWITCH = 6; // 0x6 } - public final class HdmiPortInfo implements android.os.Parcelable { - ctor public HdmiPortInfo(int, int, int, boolean, boolean, boolean); - method public int describeContents(); - method public int getAddress(); - method public int getId(); - method public int getType(); - method public boolean isArcSupported(); - method public boolean isCecSupported(); - method public boolean isMhlSupported(); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int PORT_INPUT = 0; // 0x0 - field public static final int PORT_OUTPUT = 1; // 0x1 - } - - public class HdmiSwitchClient extends android.hardware.hdmi.HdmiClient { - method public int getDeviceType(); - method @NonNull public java.util.List getPortInfo(); - } - } package android.hardware.input { @@ -1538,43 +766,8 @@ package android.hardware.input { package android.hardware.lights { - public final class Light implements android.os.Parcelable { - method public int describeContents(); - method public int getId(); - method public int getOrdinal(); - method public int getType(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public final class LightState implements android.os.Parcelable { - ctor public LightState(@ColorInt int); - method public int describeContents(); - method @ColorInt public int getColor(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class LightsManager { method @NonNull @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_LIGHTS) public android.hardware.lights.LightState getLightState(@NonNull android.hardware.lights.Light); - method @NonNull @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_LIGHTS) public java.util.List getLights(); - method @NonNull @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_LIGHTS) public android.hardware.lights.LightsManager.LightsSession openSession(); - field public static final int LIGHT_TYPE_MICROPHONE = 8; // 0x8 - } - - public final class LightsManager.LightsSession implements java.lang.AutoCloseable { - method @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_LIGHTS) public void close(); - method @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_LIGHTS) public void requestLights(@NonNull android.hardware.lights.LightsRequest); - } - - public final class LightsRequest { - } - - public static final class LightsRequest.Builder { - ctor public LightsRequest.Builder(); - method @NonNull public android.hardware.lights.LightsRequest build(); - method @NonNull public android.hardware.lights.LightsRequest.Builder clearLight(@NonNull android.hardware.lights.Light); - method @NonNull public android.hardware.lights.LightsRequest.Builder setLight(@NonNull android.hardware.lights.Light, @NonNull android.hardware.lights.LightState); } } @@ -1605,84 +798,16 @@ package android.hardware.soundtrigger { field @NonNull public static final android.os.Parcelable.Creator CREATOR; } - public class SoundTrigger { - field public static final int RECOGNITION_MODE_GENERIC = 8; // 0x8 - field public static final int RECOGNITION_MODE_USER_AUTHENTICATION = 4; // 0x4 - field public static final int RECOGNITION_MODE_USER_IDENTIFICATION = 2; // 0x2 - field public static final int RECOGNITION_MODE_VOICE_TRIGGER = 1; // 0x1 - field public static final int STATUS_OK = 0; // 0x0 - } - - public static final class SoundTrigger.Keyphrase implements android.os.Parcelable { - ctor public SoundTrigger.Keyphrase(int, int, @NonNull java.util.Locale, @NonNull String, @Nullable int[]); - method public int getId(); - method @NonNull public java.util.Locale getLocale(); - method public int getRecognitionModes(); - method @NonNull public String getText(); - method @NonNull public int[] getUsers(); - method @NonNull public static android.hardware.soundtrigger.SoundTrigger.Keyphrase readFromParcel(@NonNull android.os.Parcel); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class SoundTrigger.KeyphraseSoundModel extends android.hardware.soundtrigger.SoundTrigger.SoundModel implements android.os.Parcelable { - ctor public SoundTrigger.KeyphraseSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], @Nullable android.hardware.soundtrigger.SoundTrigger.Keyphrase[], int); - ctor public SoundTrigger.KeyphraseSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], @Nullable android.hardware.soundtrigger.SoundTrigger.Keyphrase[]); - method @NonNull public android.hardware.soundtrigger.SoundTrigger.Keyphrase[] getKeyphrases(); - method @NonNull public static android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel readFromParcel(@NonNull android.os.Parcel); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public static final class SoundTrigger.ModelParamRange implements android.os.Parcelable { ctor public SoundTrigger.ModelParamRange(int, int); - method public int getEnd(); - method public int getStart(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public static final class SoundTrigger.ModuleProperties implements android.os.Parcelable { ctor public SoundTrigger.ModuleProperties(int, @NonNull String, @NonNull String, @NonNull String, int, @NonNull String, int, int, int, int, boolean, int, boolean, int, boolean, int); - method public int describeContents(); - method public int getAudioCapabilities(); - method @NonNull public String getDescription(); - method public int getId(); - method @NonNull public String getImplementor(); - method public int getMaxBufferMillis(); - method public int getMaxKeyphrases(); - method public int getMaxSoundModels(); - method public int getMaxUsers(); - method public int getPowerConsumptionMw(); - method public int getRecognitionModes(); - method @NonNull public String getSupportedModelArch(); - method @NonNull public java.util.UUID getUuid(); - method public int getVersion(); - method public boolean isCaptureTransitionSupported(); - method public boolean isConcurrentCaptureSupported(); - method public boolean isTriggerReturnedInEvent(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int AUDIO_CAPABILITY_ECHO_CANCELLATION = 1; // 0x1 - field public static final int AUDIO_CAPABILITY_NOISE_SUPPRESSION = 2; // 0x2 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public static class SoundTrigger.RecognitionEvent { ctor public SoundTrigger.RecognitionEvent(int, int, boolean, int, int, int, boolean, @NonNull android.media.AudioFormat, @Nullable byte[]); - method @Nullable public android.media.AudioFormat getCaptureFormat(); - method public int getCaptureSession(); - method public byte[] getData(); - method public boolean isCaptureAvailable(); - } - - public static class SoundTrigger.SoundModel { - method @NonNull public byte[] getData(); - method public int getType(); - method @NonNull public java.util.UUID getUuid(); - method @NonNull public java.util.UUID getVendorUuid(); - method public int getVersion(); - field public static final int TYPE_GENERIC_SOUND = 1; // 0x1 - field public static final int TYPE_KEYPHRASE = 0; // 0x0 } } @@ -1781,59 +906,17 @@ package android.location { method public void setType(int); } - public class Location implements android.os.Parcelable { - method public void makeComplete(); - field @Deprecated public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation"; - } - public class LocationManager { method @NonNull public String[] getBackgroundThrottlingWhitelist(); - method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull android.location.LocationRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @NonNull public String[] getIgnoreSettingsWhitelist(); method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public java.util.List getProviderPackages(@NonNull String); - method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper); - method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener); - method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent); - method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle); field public static final String FUSED_PROVIDER = "fused"; } - public final class LocationRequest implements android.os.Parcelable { - method @NonNull public android.os.WorkSource getWorkSource(); - method public boolean isHiddenFromAppOps(); - method public boolean isLocationSettingsIgnored(); - method public boolean isLowPower(); - field @Deprecated public static final int ACCURACY_BLOCK = 102; // 0x66 - field @Deprecated public static final int ACCURACY_CITY = 104; // 0x68 - field @Deprecated public static final int ACCURACY_FINE = 100; // 0x64 - field @Deprecated public static final int POWER_HIGH = 203; // 0xcb - field @Deprecated public static final int POWER_LOW = 201; // 0xc9 - } - - public static final class LocationRequest.Builder { - method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_APP_OPS_STATS) public android.location.LocationRequest.Builder setHiddenFromAppOps(boolean); - method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.location.LocationRequest.Builder setLocationSettingsIgnored(boolean); - method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public android.location.LocationRequest.Builder setLowPower(boolean); - method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.location.LocationRequest.Builder setWorkSource(@Nullable android.os.WorkSource); - } - } package android.media { - public final class AudioFocusInfo implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public android.media.AudioAttributes getAttributes(); - method @NonNull public String getClientId(); - method public int getClientUid(); - method public int getFlags(); - method public int getGainRequest(); - method public int getLossReceived(); - method @NonNull public String getPackageName(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class AudioFocusRequest { method @Nullable public android.media.AudioManager.OnAudioFocusChangeListener getOnAudioFocusChangeListener(); } @@ -1846,13 +929,7 @@ package android.media { } public class AudioManager { - method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy); method public boolean hasRegisteredDynamicPolicy(); - method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy); - method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy); - method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy); - method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy); - field public static final int SUCCESS = 0; // 0x0 } public static final class AudioRecord.MetricsConstants { @@ -1908,68 +985,6 @@ package android.media { method @NonNull public String getOriginalId(); } - public final class MediaTranscodeManager { - method @NonNull public android.media.MediaTranscodeManager.TranscodingJob enqueueRequest(@NonNull android.media.MediaTranscodeManager.TranscodingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.media.MediaTranscodeManager.OnTranscodingFinishedListener) throws java.io.FileNotFoundException, android.media.MediaTranscodingException.ServiceNotAvailableException; - field public static final int PRIORITY_REALTIME = 1; // 0x1 - field public static final int TRANSCODING_TYPE_VIDEO = 1; // 0x1 - } - - @java.lang.FunctionalInterface public static interface MediaTranscodeManager.OnTranscodingFinishedListener { - method public void onTranscodingFinished(@NonNull android.media.MediaTranscodeManager.TranscodingJob); - } - - public static final class MediaTranscodeManager.TranscodingJob { - method public void cancel(); - method public int getJobId(); - method @IntRange(from=0, to=100) public int getProgress(); - method public int getResult(); - method public int getStatus(); - method public void setOnProgressUpdateListener(@NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener); - method public void setOnProgressUpdateListener(int, @NonNull java.util.concurrent.Executor, @Nullable android.media.MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener); - field public static final int RESULT_CANCELED = 4; // 0x4 - field public static final int RESULT_ERROR = 3; // 0x3 - field public static final int RESULT_NONE = 1; // 0x1 - field public static final int RESULT_SUCCESS = 2; // 0x2 - field public static final int STATUS_FINISHED = 3; // 0x3 - field public static final int STATUS_PAUSED = 4; // 0x4 - field public static final int STATUS_PENDING = 1; // 0x1 - field public static final int STATUS_RUNNING = 2; // 0x2 - } - - @java.lang.FunctionalInterface public static interface MediaTranscodeManager.TranscodingJob.OnProgressUpdateListener { - method public void onProgressUpdate(@NonNull android.media.MediaTranscodeManager.TranscodingJob, @IntRange(from=0, to=100) int); - } - - public static final class MediaTranscodeManager.TranscodingRequest { - method public int getClientPid(); - method public int getClientUid(); - method @NonNull public android.net.Uri getDestinationUri(); - method public int getPriority(); - method @NonNull public android.net.Uri getSourceUri(); - method public int getType(); - method @Nullable public android.media.MediaFormat getVideoTrackFormat(); - } - - public static final class MediaTranscodeManager.TranscodingRequest.Builder { - ctor public MediaTranscodeManager.TranscodingRequest.Builder(); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest build(); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setClientPid(int); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setClientUid(int); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setDestinationUri(@NonNull android.net.Uri); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setPriority(int); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setSourceUri(@NonNull android.net.Uri); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setType(int); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.Builder setVideoTrackFormat(@NonNull android.media.MediaFormat); - } - - public static class MediaTranscodeManager.TranscodingRequest.MediaFormatResolver { - ctor public MediaTranscodeManager.TranscodingRequest.MediaFormatResolver(); - method @Nullable public android.media.MediaFormat resolveVideoFormat(); - method @NonNull public android.media.MediaTranscodeManager.TranscodingRequest.MediaFormatResolver setSourceVideoFormatHint(@NonNull android.media.MediaFormat); - method public boolean shouldTranscode(); - field public static final String CAPS_SUPPORTS_HEVC = "support-hevc"; - } - public final class PlaybackParams implements android.os.Parcelable { method public int getAudioStretchMode(); method public android.media.PlaybackParams setAudioStretchMode(int); @@ -2018,141 +1033,8 @@ package android.media.audiofx { package android.media.audiopolicy { - public class AudioMix { - method public int getMixState(); - field public static final int MIX_STATE_DISABLED = -1; // 0xffffffff - field public static final int MIX_STATE_IDLE = 0; // 0x0 - field public static final int MIX_STATE_MIXING = 1; // 0x1 - field public static final int ROUTE_FLAG_LOOP_BACK = 2; // 0x2 - field public static final int ROUTE_FLAG_RENDER = 1; // 0x1 - } - - public static class AudioMix.Builder { - ctor public AudioMix.Builder(android.media.audiopolicy.AudioMixingRule) throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMix build() throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMix.Builder setDevice(@NonNull android.media.AudioDeviceInfo) throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMix.Builder setFormat(android.media.AudioFormat) throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMix.Builder setRouteFlags(int) throws java.lang.IllegalArgumentException; - } - - public class AudioMixingRule { - field public static final int RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET = 2; // 0x2 - field public static final int RULE_MATCH_ATTRIBUTE_USAGE = 1; // 0x1 - field public static final int RULE_MATCH_UID = 4; // 0x4 - field public static final int RULE_MATCH_USERID = 8; // 0x8 - } - - public static class AudioMixingRule.Builder { - ctor public AudioMixingRule.Builder(); - method public android.media.audiopolicy.AudioMixingRule.Builder addMixRule(int, Object) throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMixingRule.Builder addRule(android.media.AudioAttributes, int) throws java.lang.IllegalArgumentException; - method @NonNull public android.media.audiopolicy.AudioMixingRule.Builder allowPrivilegedPlaybackCapture(boolean); - method public android.media.audiopolicy.AudioMixingRule build(); - method public android.media.audiopolicy.AudioMixingRule.Builder excludeMixRule(int, Object) throws java.lang.IllegalArgumentException; - method public android.media.audiopolicy.AudioMixingRule.Builder excludeRule(android.media.AudioAttributes, int) throws java.lang.IllegalArgumentException; - } - - public class AudioPolicy { - method public int attachMixes(@NonNull java.util.List); - method public android.media.AudioRecord createAudioRecordSink(android.media.audiopolicy.AudioMix) throws java.lang.IllegalArgumentException; - method public android.media.AudioTrack createAudioTrackSource(android.media.audiopolicy.AudioMix) throws java.lang.IllegalArgumentException; - method public int detachMixes(@NonNull java.util.List); - method public int getFocusDuckingBehavior(); - method public int getStatus(); - method public boolean removeUidDeviceAffinity(int); - method public boolean removeUserIdDeviceAffinity(int); - method public int setFocusDuckingBehavior(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; - method public void setRegistration(String); - method public boolean setUidDeviceAffinity(int, @NonNull java.util.List); - method public boolean setUserIdDeviceAffinity(int, @NonNull java.util.List); - method public String toLogFriendlyString(); - field public static final int FOCUS_POLICY_DUCKING_DEFAULT = 0; // 0x0 - field public static final int FOCUS_POLICY_DUCKING_IN_APP = 0; // 0x0 - field public static final int FOCUS_POLICY_DUCKING_IN_POLICY = 1; // 0x1 - field public static final int POLICY_STATUS_REGISTERED = 2; // 0x2 - field public static final int POLICY_STATUS_UNREGISTERED = 1; // 0x1 - } - - public abstract static class AudioPolicy.AudioPolicyFocusListener { - ctor public AudioPolicy.AudioPolicyFocusListener(); - method public void onAudioFocusAbandon(android.media.AudioFocusInfo); - method public void onAudioFocusGrant(android.media.AudioFocusInfo, int); - method public void onAudioFocusLoss(android.media.AudioFocusInfo, boolean); - method public void onAudioFocusRequest(android.media.AudioFocusInfo, int); - } - - public abstract static class AudioPolicy.AudioPolicyStatusListener { - ctor public AudioPolicy.AudioPolicyStatusListener(); - method public void onMixStateUpdate(android.media.audiopolicy.AudioMix); - method public void onStatusChange(); - } - - public abstract static class AudioPolicy.AudioPolicyVolumeCallback { - ctor public AudioPolicy.AudioPolicyVolumeCallback(); - method public void onVolumeAdjustment(int); - } - public static class AudioPolicy.Builder { - ctor public AudioPolicy.Builder(android.content.Context); - method @NonNull public android.media.audiopolicy.AudioPolicy.Builder addMix(@NonNull android.media.audiopolicy.AudioMix) throws java.lang.IllegalArgumentException; - method @NonNull public android.media.audiopolicy.AudioPolicy build(); - method public void setAudioPolicyFocusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener); - method public void setAudioPolicyStatusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener); - method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setAudioPolicyVolumeCallback(@NonNull android.media.audiopolicy.AudioPolicy.AudioPolicyVolumeCallback); - method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setIsAudioFocusPolicy(boolean); method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setIsTestFocusPolicy(boolean); - method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setLooper(@NonNull android.os.Looper) throws java.lang.IllegalArgumentException; - } - -} - -package android.media.musicrecognition { - - public class MusicRecognitionManager { - field public static final int RECOGNITION_FAILED_AUDIO_UNAVAILABLE = 7; // 0x7 - field public static final int RECOGNITION_FAILED_NOT_FOUND = 1; // 0x1 - field public static final int RECOGNITION_FAILED_NO_CONNECTIVITY = 2; // 0x2 - field public static final int RECOGNITION_FAILED_SERVICE_KILLED = 5; // 0x5 - field public static final int RECOGNITION_FAILED_SERVICE_UNAVAILABLE = 3; // 0x3 - field public static final int RECOGNITION_FAILED_TIMEOUT = 6; // 0x6 - field public static final int RECOGNITION_FAILED_UNKNOWN = -1; // 0xffffffff - } - - public static interface MusicRecognitionManager.RecognitionCallback { - method public void onAudioStreamClosed(); - method public void onRecognitionFailed(@NonNull android.media.musicrecognition.RecognitionRequest, int); - method public void onRecognitionSucceeded(@NonNull android.media.musicrecognition.RecognitionRequest, @NonNull android.media.MediaMetadata, @Nullable android.os.Bundle); - } - - public abstract class MusicRecognitionService extends android.app.Service { - ctor public MusicRecognitionService(); - method public abstract void onRecognize(@NonNull android.os.ParcelFileDescriptor, @NonNull android.media.AudioFormat, @NonNull android.media.musicrecognition.MusicRecognitionService.Callback); - } - - public static interface MusicRecognitionService.Callback { - method public void onRecognitionFailed(int); - method public void onRecognitionSucceeded(@NonNull android.media.MediaMetadata, @Nullable android.os.Bundle); - } - - public final class RecognitionRequest implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public android.media.AudioAttributes getAudioAttributes(); - method @NonNull public android.media.AudioFormat getAudioFormat(); - method public int getCaptureSession(); - method public int getIgnoreBeginningFrames(); - method public int getMaxAudioLengthSeconds(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class RecognitionRequest.Builder { - ctor public RecognitionRequest.Builder(); - method @NonNull public android.media.musicrecognition.RecognitionRequest build(); - method @NonNull public android.media.musicrecognition.RecognitionRequest.Builder setAudioAttributes(@NonNull android.media.AudioAttributes); - method @NonNull public android.media.musicrecognition.RecognitionRequest.Builder setAudioFormat(@NonNull android.media.AudioFormat); - method @NonNull public android.media.musicrecognition.RecognitionRequest.Builder setCaptureSession(int); - method @NonNull public android.media.musicrecognition.RecognitionRequest.Builder setIgnoreBeginningFrames(int); - method @NonNull public android.media.musicrecognition.RecognitionRequest.Builder setMaxAudioLengthSeconds(int); } } @@ -2171,242 +1053,33 @@ package android.media.tv.tuner { public final class TunerVersionChecker { method public static int getMajorVersion(int); method public static int getMinorVersion(int); - method public static int getTunerVersion(); method public static boolean isHigherOrEqualVersionTo(int); method public static boolean supportTunerVersion(int); - field public static final int TUNER_VERSION_1_0 = 65536; // 0x10000 - field public static final int TUNER_VERSION_1_1 = 65537; // 0x10001 - field public static final int TUNER_VERSION_UNKNOWN = 0; // 0x0 - } - -} - -package android.metrics { - - public class LogMaker { - ctor public LogMaker(int); - ctor public LogMaker(Object[]); - method public android.metrics.LogMaker addTaggedData(int, Object); - method public android.metrics.LogMaker clearCategory(); - method public android.metrics.LogMaker clearPackageName(); - method public android.metrics.LogMaker clearSubtype(); - method public android.metrics.LogMaker clearTaggedData(int); - method public android.metrics.LogMaker clearType(); - method public void deserialize(Object[]); - method public int getCategory(); - method public long getCounterBucket(); - method public String getCounterName(); - method public int getCounterValue(); - method public String getPackageName(); - method public int getProcessId(); - method public int getSubtype(); - method public Object getTaggedData(int); - method public long getTimestamp(); - method public int getType(); - method public int getUid(); - method public boolean isLongCounterBucket(); - method public boolean isSubsetOf(android.metrics.LogMaker); - method public boolean isValidValue(Object); - method public Object[] serialize(); - method public android.metrics.LogMaker setCategory(int); - method public android.metrics.LogMaker setPackageName(String); - method public android.metrics.LogMaker setSubtype(int); - method public android.metrics.LogMaker setType(int); - } - - public class MetricsReader { - ctor public MetricsReader(); - method public void checkpoint(); - method public boolean hasNext(); - method public android.metrics.LogMaker next(); - method public void read(long); - method public void reset(); } } package android.net { - public class CaptivePortal implements android.os.Parcelable { - method public void logEvent(int, @NonNull String); - method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork(); - method public void useNetwork(); - field public static final int APP_REQUEST_REEVALUATION_REQUIRED = 100; // 0x64 - field public static final int APP_RETURN_DISMISSED = 0; // 0x0 - field public static final int APP_RETURN_UNWANTED = 1; // 0x1 - field public static final int APP_RETURN_WANTED_AS_IS = 2; // 0x2 - } - - public final class CaptivePortalData implements android.os.Parcelable { - method public int describeContents(); - method public long getByteLimit(); - method public long getExpiryTimeMillis(); - method public long getRefreshTimeMillis(); - method @Nullable public android.net.Uri getUserPortalUrl(); - method @Nullable public android.net.Uri getVenueInfoUrl(); - method public boolean isCaptive(); - method public boolean isSessionExtendable(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static class CaptivePortalData.Builder { - ctor public CaptivePortalData.Builder(); - ctor public CaptivePortalData.Builder(@Nullable android.net.CaptivePortalData); - method @NonNull public android.net.CaptivePortalData build(); - method @NonNull public android.net.CaptivePortalData.Builder setBytesRemaining(long); - method @NonNull public android.net.CaptivePortalData.Builder setCaptive(boolean); - method @NonNull public android.net.CaptivePortalData.Builder setExpiryTime(long); - method @NonNull public android.net.CaptivePortalData.Builder setRefreshTime(long); - method @NonNull public android.net.CaptivePortalData.Builder setSessionExtendable(boolean); - method @NonNull public android.net.CaptivePortalData.Builder setUserPortalUrl(@Nullable android.net.Uri); - method @NonNull public android.net.CaptivePortalData.Builder setVenueInfoUrl(@Nullable android.net.Uri); - } - public class ConnectivityManager { method @RequiresPermission(anyOf={"android.permission.MANAGE_TEST_NETWORKS", android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle); - method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle); - field public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC"; - field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT"; } public class EthernetManager { - method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback); method public void setIncludeTestInterfaces(boolean); } - public static interface EthernetManager.TetheredInterfaceCallback { - method public void onAvailable(@NonNull String); - method public void onUnavailable(); - } - - public static class EthernetManager.TetheredInterfaceRequest { - method public void release(); - } - - public final class IpPrefix implements android.os.Parcelable { - ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int); - ctor public IpPrefix(@NonNull String); - } - public final class IpSecManager { field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0 } - public class LinkAddress implements android.os.Parcelable { - ctor public LinkAddress(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int, int, int); - ctor public LinkAddress(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int, int, int, long, long); - ctor public LinkAddress(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int); - ctor public LinkAddress(@NonNull String); - ctor public LinkAddress(@NonNull String, int, int); - method public long getDeprecationTime(); - method public long getExpirationTime(); - method public boolean isGlobalPreferred(); - method public boolean isIpv4(); - method public boolean isIpv6(); - method public boolean isSameAddressAs(@Nullable android.net.LinkAddress); - } - - public final class LinkProperties implements android.os.Parcelable { - ctor public LinkProperties(@Nullable android.net.LinkProperties); - ctor public LinkProperties(@Nullable android.net.LinkProperties, boolean); - method public boolean addDnsServer(@NonNull java.net.InetAddress); - method public boolean addLinkAddress(@NonNull android.net.LinkAddress); - method @Nullable public android.net.Uri getCaptivePortalApiUrl(); - method @Nullable public android.net.CaptivePortalData getCaptivePortalData(); - method @NonNull public java.util.List getPcscfServers(); - method @Nullable public String getTcpBufferSizes(); - method @NonNull public java.util.List getValidatedPrivateDnsServers(); - method public boolean hasGlobalIpv6Address(); - method public boolean hasIpv4Address(); - method public boolean hasIpv6DefaultRoute(); - method public boolean isIpv4Provisioned(); - method public boolean isIpv6Provisioned(); - method public boolean isProvisioned(); - method public boolean isReachable(@NonNull java.net.InetAddress); - method public boolean removeDnsServer(@NonNull java.net.InetAddress); - method public boolean removeLinkAddress(@NonNull android.net.LinkAddress); - method public boolean removeRoute(@NonNull android.net.RouteInfo); - method public void setCaptivePortalApiUrl(@Nullable android.net.Uri); - method public void setCaptivePortalData(@Nullable android.net.CaptivePortalData); - method public void setPcscfServers(@NonNull java.util.Collection); - method public void setPrivateDnsServerName(@Nullable String); - method public void setTcpBufferSizes(@Nullable String); - method public void setUsePrivateDns(boolean); - method public void setValidatedPrivateDnsServers(@NonNull java.util.Collection); - } - - public class Network implements android.os.Parcelable { - ctor public Network(@NonNull android.net.Network); - method public int getNetId(); - method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); - } - - public final class NetworkCapabilities implements android.os.Parcelable { - method @NonNull public int[] getAdministratorUids(); - method public int[] getCapabilities(); - method @Nullable public String getSsid(); - method @NonNull public int[] getTransportTypes(); - method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); - field public static final int TRANSPORT_TEST = 7; // 0x7 - } - - public static final class NetworkCapabilities.Builder { - ctor public NetworkCapabilities.Builder(); - ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities); - method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int); - method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int); - method @NonNull public android.net.NetworkCapabilities build(); - method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int); - method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]); - method @NonNull public android.net.NetworkCapabilities.Builder setLinkDownstreamBandwidthKbps(int); - method @NonNull public android.net.NetworkCapabilities.Builder setLinkUpstreamBandwidthKbps(int); - method @NonNull public android.net.NetworkCapabilities.Builder setNetworkSpecifier(@Nullable android.net.NetworkSpecifier); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setOwnerUid(int); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorPackageName(@Nullable String); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int); - method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String); - method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo); - } - - public class NetworkStack { - method @Nullable public static android.os.IBinder getService(); - method public static void setServiceForTest(@Nullable android.os.IBinder); - field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK"; - } - - public final class RouteInfo implements android.os.Parcelable { - ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int); - method public int getType(); - field public static final int RTN_THROW = 9; // 0x9 - field public static final int RTN_UNICAST = 1; // 0x1 - field public static final int RTN_UNREACHABLE = 7; // 0x7 - } - - public final class StaticIpConfiguration implements android.os.Parcelable { - ctor public StaticIpConfiguration(); - ctor public StaticIpConfiguration(@Nullable android.net.StaticIpConfiguration); - method public void addDnsServer(@NonNull java.net.InetAddress); - method public void clear(); - method public int describeContents(); - method @NonNull public java.util.List getDnsServers(); - method @Nullable public String getDomains(); - method @Nullable public java.net.InetAddress getGateway(); - method @Nullable public android.net.LinkAddress getIpAddress(); - method @NonNull public java.util.List getRoutes(@Nullable String); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class StaticIpConfiguration.Builder { - ctor public StaticIpConfiguration.Builder(); - method @NonNull public android.net.StaticIpConfiguration build(); - method @NonNull public android.net.StaticIpConfiguration.Builder setDnsServers(@NonNull Iterable); - method @NonNull public android.net.StaticIpConfiguration.Builder setDomains(@Nullable String); - method @NonNull public android.net.StaticIpConfiguration.Builder setGateway(@Nullable java.net.InetAddress); - method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress); + public final class NetworkCapabilities implements android.os.Parcelable { + method public int[] getCapabilities(); + field public static final int TRANSPORT_TEST = 7; // 0x7 + } + + public class NetworkStack { + method public static void setServiceForTest(@Nullable android.os.IBinder); } public final class TestNetworkInterface implements android.os.Parcelable { @@ -2434,228 +1107,8 @@ package android.net { } -package android.net.apf { - - public final class ApfCapabilities implements android.os.Parcelable { - ctor public ApfCapabilities(int, int, int); - method public int describeContents(); - method public static boolean getApfDrop8023Frames(); - method @NonNull public static int[] getApfEtherTypeBlackList(); - method public boolean hasDataAccess(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public final int apfPacketFormat; - field public final int apfVersionSupported; - field public final int maximumApfProgramSize; - } - -} - -package android.net.metrics { - - public final class ApfProgramEvent implements android.net.metrics.IpConnectivityLog.Event { - } - - public static final class ApfProgramEvent.Builder { - ctor public ApfProgramEvent.Builder(); - method @NonNull public android.net.metrics.ApfProgramEvent build(); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setActualLifetime(long); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setCurrentRas(int); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setFilteredRas(int); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setFlags(boolean, boolean); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setLifetime(long); - method @NonNull public android.net.metrics.ApfProgramEvent.Builder setProgramLength(int); - } - - public final class ApfStats implements android.net.metrics.IpConnectivityLog.Event { - } - - public static final class ApfStats.Builder { - ctor public ApfStats.Builder(); - method @NonNull public android.net.metrics.ApfStats build(); - method @NonNull public android.net.metrics.ApfStats.Builder setDroppedRas(int); - method @NonNull public android.net.metrics.ApfStats.Builder setDurationMs(long); - method @NonNull public android.net.metrics.ApfStats.Builder setMatchingRas(int); - method @NonNull public android.net.metrics.ApfStats.Builder setMaxProgramSize(int); - method @NonNull public android.net.metrics.ApfStats.Builder setParseErrors(int); - method @NonNull public android.net.metrics.ApfStats.Builder setProgramUpdates(int); - method @NonNull public android.net.metrics.ApfStats.Builder setProgramUpdatesAll(int); - method @NonNull public android.net.metrics.ApfStats.Builder setProgramUpdatesAllowingMulticast(int); - method @NonNull public android.net.metrics.ApfStats.Builder setReceivedRas(int); - method @NonNull public android.net.metrics.ApfStats.Builder setZeroLifetimeRas(int); - } - - public final class DhcpClientEvent implements android.net.metrics.IpConnectivityLog.Event { - } - - public static final class DhcpClientEvent.Builder { - ctor public DhcpClientEvent.Builder(); - method @NonNull public android.net.metrics.DhcpClientEvent build(); - method @NonNull public android.net.metrics.DhcpClientEvent.Builder setDurationMs(int); - method @NonNull public android.net.metrics.DhcpClientEvent.Builder setMsg(String); - } - - public final class DhcpErrorEvent implements android.net.metrics.IpConnectivityLog.Event { - ctor public DhcpErrorEvent(int); - method public static int errorCodeWithOption(int, int); - field public static final int BOOTP_TOO_SHORT = 67174400; // 0x4010000 - field public static final int BUFFER_UNDERFLOW = 83951616; // 0x5010000 - field public static final int DHCP_BAD_MAGIC_COOKIE = 67239936; // 0x4020000 - field public static final int DHCP_ERROR = 4; // 0x4 - field public static final int DHCP_INVALID_OPTION_LENGTH = 67305472; // 0x4030000 - field public static final int DHCP_NO_COOKIE = 67502080; // 0x4060000 - field public static final int DHCP_NO_MSG_TYPE = 67371008; // 0x4040000 - field public static final int DHCP_UNKNOWN_MSG_TYPE = 67436544; // 0x4050000 - field public static final int L2_ERROR = 1; // 0x1 - field public static final int L2_TOO_SHORT = 16842752; // 0x1010000 - field public static final int L2_WRONG_ETH_TYPE = 16908288; // 0x1020000 - field public static final int L3_ERROR = 2; // 0x2 - field public static final int L3_INVALID_IP = 33751040; // 0x2030000 - field public static final int L3_NOT_IPV4 = 33685504; // 0x2020000 - field public static final int L3_TOO_SHORT = 33619968; // 0x2010000 - field public static final int L4_ERROR = 3; // 0x3 - field public static final int L4_NOT_UDP = 50397184; // 0x3010000 - field public static final int L4_WRONG_PORT = 50462720; // 0x3020000 - field public static final int MISC_ERROR = 5; // 0x5 - field public static final int PARSING_ERROR = 84082688; // 0x5030000 - field public static final int RECEIVE_ERROR = 84017152; // 0x5020000 - } - - public class IpConnectivityLog { - ctor public IpConnectivityLog(); - method public boolean log(long, @NonNull android.net.metrics.IpConnectivityLog.Event); - method public boolean log(@NonNull String, @NonNull android.net.metrics.IpConnectivityLog.Event); - method public boolean log(@NonNull android.net.Network, @NonNull int[], @NonNull android.net.metrics.IpConnectivityLog.Event); - method public boolean log(int, @NonNull int[], @NonNull android.net.metrics.IpConnectivityLog.Event); - method public boolean log(@NonNull android.net.metrics.IpConnectivityLog.Event); - } - - public static interface IpConnectivityLog.Event extends android.os.Parcelable { - } - - public final class IpManagerEvent implements android.net.metrics.IpConnectivityLog.Event { - ctor public IpManagerEvent(int, long); - field public static final int COMPLETE_LIFECYCLE = 3; // 0x3 - field public static final int ERROR_INTERFACE_NOT_FOUND = 8; // 0x8 - field public static final int ERROR_INVALID_PROVISIONING = 7; // 0x7 - field public static final int ERROR_STARTING_IPREACHABILITYMONITOR = 6; // 0x6 - field public static final int ERROR_STARTING_IPV4 = 4; // 0x4 - field public static final int ERROR_STARTING_IPV6 = 5; // 0x5 - field public static final int PROVISIONING_FAIL = 2; // 0x2 - field public static final int PROVISIONING_OK = 1; // 0x1 - } - - public final class IpReachabilityEvent implements android.net.metrics.IpConnectivityLog.Event { - ctor public IpReachabilityEvent(int); - field public static final int NUD_FAILED = 512; // 0x200 - field public static final int NUD_FAILED_ORGANIC = 1024; // 0x400 - field public static final int PROBE = 256; // 0x100 - field public static final int PROVISIONING_LOST = 768; // 0x300 - field public static final int PROVISIONING_LOST_ORGANIC = 1280; // 0x500 - } - - public final class NetworkEvent implements android.net.metrics.IpConnectivityLog.Event { - ctor public NetworkEvent(int, long); - ctor public NetworkEvent(int); - field public static final int NETWORK_CAPTIVE_PORTAL_FOUND = 4; // 0x4 - field public static final int NETWORK_CONNECTED = 1; // 0x1 - field public static final int NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND = 12; // 0xc - field public static final int NETWORK_DISCONNECTED = 7; // 0x7 - field public static final int NETWORK_FIRST_VALIDATION_PORTAL_FOUND = 10; // 0xa - field public static final int NETWORK_FIRST_VALIDATION_SUCCESS = 8; // 0x8 - field public static final int NETWORK_LINGER = 5; // 0x5 - field public static final int NETWORK_PARTIAL_CONNECTIVITY = 13; // 0xd - field public static final int NETWORK_REVALIDATION_PORTAL_FOUND = 11; // 0xb - field public static final int NETWORK_REVALIDATION_SUCCESS = 9; // 0x9 - field public static final int NETWORK_UNLINGER = 6; // 0x6 - field public static final int NETWORK_VALIDATED = 2; // 0x2 - field public static final int NETWORK_VALIDATION_FAILED = 3; // 0x3 - } - - public final class RaEvent implements android.net.metrics.IpConnectivityLog.Event { - } - - public static final class RaEvent.Builder { - ctor public RaEvent.Builder(); - method @NonNull public android.net.metrics.RaEvent build(); - method @NonNull public android.net.metrics.RaEvent.Builder updateDnsslLifetime(long); - method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixPreferredLifetime(long); - method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixValidLifetime(long); - method @NonNull public android.net.metrics.RaEvent.Builder updateRdnssLifetime(long); - method @NonNull public android.net.metrics.RaEvent.Builder updateRouteInfoLifetime(long); - method @NonNull public android.net.metrics.RaEvent.Builder updateRouterLifetime(long); - } - - public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event { - method @NonNull public static String getProbeName(int); - field public static final int DNS_FAILURE = 0; // 0x0 - field public static final int DNS_SUCCESS = 1; // 0x1 - field public static final int PROBE_DNS = 0; // 0x0 - field public static final int PROBE_FALLBACK = 4; // 0x4 - field public static final int PROBE_HTTP = 1; // 0x1 - field public static final int PROBE_HTTPS = 2; // 0x2 - field public static final int PROBE_PAC = 3; // 0x3 - field public static final int PROBE_PRIVDNS = 5; // 0x5 - } - - public static final class ValidationProbeEvent.Builder { - ctor public ValidationProbeEvent.Builder(); - method @NonNull public android.net.metrics.ValidationProbeEvent build(); - method @NonNull public android.net.metrics.ValidationProbeEvent.Builder setDurationMs(long); - method @NonNull public android.net.metrics.ValidationProbeEvent.Builder setProbeType(int, boolean); - method @NonNull public android.net.metrics.ValidationProbeEvent.Builder setReturnCode(int); - } - -} - -package android.net.util { - - public final class SocketUtils { - method public static void bindSocketToInterface(@NonNull java.io.FileDescriptor, @NonNull String) throws android.system.ErrnoException; - method public static void closeSocket(@Nullable java.io.FileDescriptor) throws java.io.IOException; - method @NonNull public static java.net.SocketAddress makeNetlinkSocketAddress(int, int); - method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int); - method @Deprecated @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, @NonNull byte[]); - method @NonNull public static java.net.SocketAddress makePacketSocketAddress(int, int, @NonNull byte[]); - } - -} - package android.os { - public class BatteryManager { - method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public boolean setChargingStateUpdateDelayMillis(int); - } - - public final class BugreportManager { - method @RequiresPermission(android.Manifest.permission.DUMP) public void cancelBugreport(); - method @RequiresPermission(android.Manifest.permission.DUMP) public void requestBugreport(@NonNull android.os.BugreportParams, @Nullable CharSequence, @Nullable CharSequence); - method @RequiresPermission(android.Manifest.permission.DUMP) public void startBugreport(@NonNull android.os.ParcelFileDescriptor, @Nullable android.os.ParcelFileDescriptor, @NonNull android.os.BugreportParams, @NonNull java.util.concurrent.Executor, @NonNull android.os.BugreportManager.BugreportCallback); - } - - public abstract static class BugreportManager.BugreportCallback { - ctor public BugreportManager.BugreportCallback(); - method public void onError(int); - method public void onFinished(); - method public void onProgress(@FloatRange(from=0.0f, to=100.0f) float); - field public static final int BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS = 5; // 0x5 - field public static final int BUGREPORT_ERROR_INVALID_INPUT = 1; // 0x1 - field public static final int BUGREPORT_ERROR_RUNTIME = 2; // 0x2 - field public static final int BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT = 4; // 0x4 - field public static final int BUGREPORT_ERROR_USER_DENIED_CONSENT = 3; // 0x3 - } - - public final class BugreportParams { - ctor public BugreportParams(int); - method public int getMode(); - field public static final int BUGREPORT_MODE_FULL = 0; // 0x0 - field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1 - field public static final int BUGREPORT_MODE_REMOTE = 2; // 0x2 - field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4 - field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3 - field public static final int BUGREPORT_MODE_WIFI = 5; // 0x5 - } - public class Build { method public static boolean is64BitAbi(String); field public static final boolean IS_EMULATOR; @@ -2668,18 +1121,12 @@ package android.os { } public class DeviceIdleManager { - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void endIdle(@NonNull String); method @NonNull public String[] getSystemPowerWhitelist(); method @NonNull public String[] getSystemPowerWhitelistExceptIdle(); } public class Environment { method public static java.io.File buildPath(java.io.File, java.lang.String...); - method @NonNull public static java.io.File getOdmDirectory(); - method @NonNull public static java.io.File getOemDirectory(); - method @NonNull public static java.io.File getProductDirectory(); - method @NonNull public static java.io.File getSystemExtDirectory(); - method @NonNull public static java.io.File getVendorDirectory(); } public final class FileUtils { @@ -2688,228 +1135,11 @@ package android.os { method @NonNull public static byte[] digest(@NonNull java.io.InputStream, @NonNull String) throws java.io.IOException, java.security.NoSuchAlgorithmException; } - public class HidlMemory implements java.io.Closeable { - ctor public HidlMemory(@NonNull String, @IntRange(from=0) long, @Nullable android.os.NativeHandle); - method public void close() throws java.io.IOException; - method @NonNull public android.os.HidlMemory dup() throws java.io.IOException; - method protected void finalize(); - method @Nullable public android.os.NativeHandle getHandle(); - method @NonNull public String getName(); - method public long getSize(); - method @Nullable public android.os.NativeHandle releaseHandle(); - } - - public abstract class HwBinder implements android.os.IHwBinder { - ctor public HwBinder(); - method public static final void configureRpcThreadpool(long, boolean); - method public static void enableInstrumentation(); - method public static final android.os.IHwBinder getService(String, String) throws java.util.NoSuchElementException, android.os.RemoteException; - method public static final android.os.IHwBinder getService(String, String, boolean) throws java.util.NoSuchElementException, android.os.RemoteException; - method public static final void joinRpcThreadpool(); - method public abstract void onTransact(int, android.os.HwParcel, android.os.HwParcel, int) throws android.os.RemoteException; - method public final void registerService(String) throws android.os.RemoteException; - method public final void transact(int, android.os.HwParcel, android.os.HwParcel, int) throws android.os.RemoteException; - } - - public class HwBlob { - ctor public HwBlob(int); - method public final void copyToBoolArray(long, boolean[], int); - method public final void copyToDoubleArray(long, double[], int); - method public final void copyToFloatArray(long, float[], int); - method public final void copyToInt16Array(long, short[], int); - method public final void copyToInt32Array(long, int[], int); - method public final void copyToInt64Array(long, long[], int); - method public final void copyToInt8Array(long, byte[], int); - method public final boolean getBool(long); - method public final double getDouble(long); - method public final long getFieldHandle(long); - method public final float getFloat(long); - method public final short getInt16(long); - method public final int getInt32(long); - method public final long getInt64(long); - method public final byte getInt8(long); - method public final String getString(long); - method public final long handle(); - method public final void putBlob(long, android.os.HwBlob); - method public final void putBool(long, boolean); - method public final void putBoolArray(long, boolean[]); - method public final void putDouble(long, double); - method public final void putDoubleArray(long, double[]); - method public final void putFloat(long, float); - method public final void putFloatArray(long, float[]); - method public final void putHidlMemory(long, @NonNull android.os.HidlMemory); - method public final void putInt16(long, short); - method public final void putInt16Array(long, short[]); - method public final void putInt32(long, int); - method public final void putInt32Array(long, int[]); - method public final void putInt64(long, long); - method public final void putInt64Array(long, long[]); - method public final void putInt8(long, byte); - method public final void putInt8Array(long, byte[]); - method public final void putNativeHandle(long, @Nullable android.os.NativeHandle); - method public final void putString(long, String); - method public static Boolean[] wrapArray(@NonNull boolean[]); - method public static Long[] wrapArray(@NonNull long[]); - method public static Byte[] wrapArray(@NonNull byte[]); - method public static Short[] wrapArray(@NonNull short[]); - method public static Integer[] wrapArray(@NonNull int[]); - method public static Float[] wrapArray(@NonNull float[]); - method public static Double[] wrapArray(@NonNull double[]); - } - - public class HwParcel { - ctor public HwParcel(); - method public final void enforceInterface(String); - method public final boolean readBool(); - method public final java.util.ArrayList readBoolVector(); - method public final android.os.HwBlob readBuffer(long); - method public final double readDouble(); - method public final java.util.ArrayList readDoubleVector(); - method public final android.os.HwBlob readEmbeddedBuffer(long, long, long, boolean); - method @NonNull @Nullable public final android.os.HidlMemory readEmbeddedHidlMemory(long, long, long); - method @Nullable public final android.os.NativeHandle readEmbeddedNativeHandle(long, long); - method public final float readFloat(); - method public final java.util.ArrayList readFloatVector(); - method @NonNull public final android.os.HidlMemory readHidlMemory(); - method public final short readInt16(); - method public final java.util.ArrayList readInt16Vector(); - method public final int readInt32(); - method public final java.util.ArrayList readInt32Vector(); - method public final long readInt64(); - method public final java.util.ArrayList readInt64Vector(); - method public final byte readInt8(); - method public final java.util.ArrayList readInt8Vector(); - method @Nullable public final android.os.NativeHandle readNativeHandle(); - method @NonNull public final java.util.ArrayList readNativeHandleVector(); - method public final String readString(); - method public final java.util.ArrayList readStringVector(); - method public final android.os.IHwBinder readStrongBinder(); - method public final void release(); - method public final void releaseTemporaryStorage(); - method public final void send(); - method public final void verifySuccess(); - method public final void writeBool(boolean); - method public final void writeBoolVector(java.util.ArrayList); - method public final void writeBuffer(android.os.HwBlob); - method public final void writeDouble(double); - method public final void writeDoubleVector(java.util.ArrayList); - method public final void writeFloat(float); - method public final void writeFloatVector(java.util.ArrayList); - method public final void writeHidlMemory(@NonNull android.os.HidlMemory); - method public final void writeInt16(short); - method public final void writeInt16Vector(java.util.ArrayList); - method public final void writeInt32(int); - method public final void writeInt32Vector(java.util.ArrayList); - method public final void writeInt64(long); - method public final void writeInt64Vector(java.util.ArrayList); - method public final void writeInt8(byte); - method public final void writeInt8Vector(java.util.ArrayList); - method public final void writeInterfaceToken(String); - method public final void writeNativeHandle(@Nullable android.os.NativeHandle); - method public final void writeNativeHandleVector(@NonNull java.util.ArrayList); - method public final void writeStatus(int); - method public final void writeString(String); - method public final void writeStringVector(java.util.ArrayList); - method public final void writeStrongBinder(android.os.IHwBinder); - field public static final int STATUS_SUCCESS = 0; // 0x0 - } - - public interface IHwBinder { - method public boolean linkToDeath(android.os.IHwBinder.DeathRecipient, long); - method public android.os.IHwInterface queryLocalInterface(String); - method public void transact(int, android.os.HwParcel, android.os.HwParcel, int) throws android.os.RemoteException; - method public boolean unlinkToDeath(android.os.IHwBinder.DeathRecipient); - } - - public static interface IHwBinder.DeathRecipient { - method public void serviceDied(long); - } - - public interface IHwInterface { - method public android.os.IHwBinder asBinder(); - } - - public class IncidentManager { - method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void approveReport(android.net.Uri); - method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void cancelAuthorization(android.os.IncidentManager.AuthListener); - method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void deleteIncidentReports(android.net.Uri); - method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void denyReport(android.net.Uri); - method @Nullable @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public android.os.IncidentManager.IncidentReport getIncidentReport(android.net.Uri); - method @NonNull @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public java.util.List getIncidentReportList(String); - method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List getPendingReports(); - method public void registerSection(int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.IncidentManager.DumpCallback); - method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs); - method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener); - method public void unregisterSection(int); - field public static final int FLAG_CONFIRMATION_DIALOG = 1; // 0x1 - field public static final int PRIVACY_POLICY_AUTO = 200; // 0xc8 - field public static final int PRIVACY_POLICY_EXPLICIT = 100; // 0x64 - field public static final int PRIVACY_POLICY_LOCAL = 0; // 0x0 - } - - public static class IncidentManager.AuthListener { - ctor public IncidentManager.AuthListener(); - method public void onReportApproved(); - method public void onReportDenied(); - } - - public static class IncidentManager.DumpCallback { - ctor public IncidentManager.DumpCallback(); - method public void onDumpSection(int, @NonNull java.io.OutputStream); - } - - public static class IncidentManager.IncidentReport implements java.io.Closeable android.os.Parcelable { - ctor public IncidentManager.IncidentReport(android.os.Parcel); - method public void close(); - method public int describeContents(); - method public java.io.InputStream getInputStream() throws java.io.IOException; - method public long getPrivacyPolicy(); - method public long getTimestamp(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static class IncidentManager.PendingReport { - ctor public IncidentManager.PendingReport(@NonNull android.net.Uri); - method public int getFlags(); - method @NonNull public String getRequestingPackage(); - method public long getTimestamp(); - method @NonNull public android.net.Uri getUri(); - } - - public final class IncidentReportArgs implements android.os.Parcelable { - ctor public IncidentReportArgs(); - ctor public IncidentReportArgs(android.os.Parcel); - method public void addHeader(byte[]); - method public void addSection(int); - method public boolean containsSection(int); - method public int describeContents(); - method public boolean isAll(); - method public void readFromParcel(android.os.Parcel); - method public int sectionCount(); - method public void setAll(boolean); - method public void setPrivacyPolicy(int); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - public final class MessageQueue { method public int postSyncBarrier(); method public void removeSyncBarrier(int); } - public final class NativeHandle implements java.io.Closeable { - ctor public NativeHandle(); - ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean); - ctor public NativeHandle(@NonNull java.io.FileDescriptor[], @NonNull int[], boolean); - method public void close() throws java.io.IOException; - method @NonNull public android.os.NativeHandle dup() throws java.io.IOException; - method @NonNull public java.io.FileDescriptor getFileDescriptor(); - method @NonNull public java.io.FileDescriptor[] getFileDescriptors(); - method @NonNull public int[] getInts(); - method public boolean hasSingleFileDescriptor(); - } - public final class Parcel { method public boolean allowSquashing(); method public int readExceptionCode(); @@ -2921,24 +1151,7 @@ package android.os { } public final class PowerManager { - method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveModeTrigger(); - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void setBatteryDischargePrediction(@NonNull java.time.Duration, boolean); - method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public boolean setDynamicPowerSaveHint(boolean, int); - method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setPowerSaveModeEnabled(boolean); field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED"; - field public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1; // 0x1 - field public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0; // 0x0 - } - - public class PowerWhitelistManager { - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull String); - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void addToWhitelist(@NonNull java.util.List); - method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void removeFromWhitelist(@NonNull String); - method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long); - method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, @NonNull String); - field public static final int EVENT_MMS = 2; // 0x2 - field public static final int EVENT_SMS = 1; // 0x1 - field public static final int EVENT_UNSPECIFIED = 0; // 0x0 } public class Process { @@ -2950,19 +1163,6 @@ package android.os { field public static final int NUM_UIDS_PER_APP_ZYGOTE = 100; // 0x64 } - public final class RemoteCallback implements android.os.Parcelable { - ctor public RemoteCallback(android.os.RemoteCallback.OnResultListener); - ctor public RemoteCallback(@NonNull android.os.RemoteCallback.OnResultListener, @Nullable android.os.Handler); - method public int describeContents(); - method public void sendResult(@Nullable android.os.Bundle); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static interface RemoteCallback.OnResultListener { - method public void onResult(@Nullable android.os.Bundle); - } - public final class StrictMode { method public static void conditionallyCheckInstanceCounts(); method public static void setViolationLogger(android.os.StrictMode.ViolationLogger); @@ -3000,31 +1200,11 @@ package android.os { method @NonNull public android.os.StrictMode.VmPolicy.Builder permitIncorrectContextUse(); } - public class SystemConfigManager { - method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Set getDisabledUntilUsedPreinstalledCarrierApps(); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Map> getDisabledUntilUsedPreinstalledCarrierAssociatedApps(); - } - - public class SystemProperties { - method @NonNull public static String get(@NonNull String); - method @NonNull public static String get(@NonNull String, @Nullable String); - method public static boolean getBoolean(@NonNull String, boolean); - method public static int getInt(@NonNull String, int); - method public static long getLong(@NonNull String, long); - } - public final class UserHandle implements android.os.Parcelable { - method public static int getAppId(int); - method public int getIdentifier(); method public static int getUid(int, int); method public static int getUserId(int); method public static boolean isApp(int); - method public static int myUserId(); - method public static android.os.UserHandle of(int); - field @NonNull public static final android.os.UserHandle ALL; - field @NonNull public static final android.os.UserHandle CURRENT; field public static final int MIN_SECONDARY_USER_ID = 10; // 0xa - field @NonNull public static final android.os.UserHandle SYSTEM; field public static final int USER_ALL = -1; // 0xffffffff field public static final int USER_NULL = -10000; // 0xffffd8f0 field public static final int USER_SYSTEM = 0; // 0x0 @@ -3033,7 +1213,6 @@ package android.os { public class UserManager { method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean hasBaseUserRestriction(@NonNull String, @NonNull android.os.UserHandle); method public static boolean isSplitSystemUser(); - field public static final String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED"; } public final class VibrationAttributes implements android.os.Parcelable { @@ -3090,17 +1269,6 @@ package android.os { field @NonNull public static final android.os.Parcelable.Creator CREATOR; } - public abstract class Vibrator { - method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener(@NonNull android.os.Vibrator.OnVibratorStateChangedListener); - method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.Vibrator.OnVibratorStateChangedListener); - method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public boolean isVibrating(); - method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void removeVibratorStateListener(@NonNull android.os.Vibrator.OnVibratorStateChangedListener); - } - - public static interface Vibrator.OnVibratorStateChangedListener { - method public void onVibratorStateChanged(boolean); - } - public class VintfObject { method public static String[] getHalNamesAndVersions(); method public static String getSepolicyVersion(); @@ -3120,16 +1288,10 @@ package android.os { } public class WorkSource implements android.os.Parcelable { - ctor public WorkSource(int); method public boolean add(int); method public boolean add(int, String); method @Deprecated public android.os.WorkSource addReturningNewbs(android.os.WorkSource); - method @Nullable public String getPackageName(int); - method public int getUid(int); - method public boolean isEmpty(); method @Deprecated public android.os.WorkSource[] setReturningDiffs(android.os.WorkSource); - method public int size(); - method @NonNull public android.os.WorkSource withoutNames(); } } @@ -3189,36 +1351,6 @@ package android.os.health { } -package android.os.image { - - public class DynamicSystemClient { - ctor public DynamicSystemClient(@NonNull android.content.Context); - method @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) public void bind(); - method public void setOnStatusChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.image.DynamicSystemClient.OnStatusChangedListener); - method public void setOnStatusChangedListener(@NonNull android.os.image.DynamicSystemClient.OnStatusChangedListener); - method @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) public void start(@NonNull android.net.Uri, long); - method @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) public void start(@NonNull android.net.Uri, long, long); - method @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) public void unbind(); - field public static final int CAUSE_ERROR_EXCEPTION = 6; // 0x6 - field public static final int CAUSE_ERROR_INVALID_URL = 4; // 0x4 - field public static final int CAUSE_ERROR_IO = 3; // 0x3 - field public static final int CAUSE_ERROR_IPC = 5; // 0x5 - field public static final int CAUSE_INSTALL_CANCELLED = 2; // 0x2 - field public static final int CAUSE_INSTALL_COMPLETED = 1; // 0x1 - field public static final int CAUSE_NOT_SPECIFIED = 0; // 0x0 - field public static final int STATUS_IN_PROGRESS = 2; // 0x2 - field public static final int STATUS_IN_USE = 4; // 0x4 - field public static final int STATUS_NOT_STARTED = 1; // 0x1 - field public static final int STATUS_READY = 3; // 0x3 - field public static final int STATUS_UNKNOWN = 0; // 0x0 - } - - public static interface DynamicSystemClient.OnStatusChangedListener { - method public void onStatusChanged(int, int, long, @Nullable Throwable); - } - -} - package android.os.storage { public final class CrateInfo implements android.os.Parcelable { @@ -3232,10 +1364,6 @@ package android.os.storage { field @NonNull public static final android.os.Parcelable.Creator CREATOR; } - public class StorageManager { - method public static boolean hasIsolatedStorage(); - } - public final class StorageVolume implements android.os.Parcelable { method public String getPath(); } @@ -3252,17 +1380,9 @@ package android.os.strictmode { package android.permission { public final class PermissionControllerManager { - method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.RESTORE_RUNTIME_PERMISSIONS}) public void applyStagedRuntimePermissionBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void countPermissionApps(@NonNull java.util.List, int, @NonNull android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, @Nullable android.os.Handler); method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void getAppPermissions(@NonNull String, @NonNull android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, @Nullable android.os.Handler); - method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void getRuntimePermissionBackup(@NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermission(@NonNull String, @NonNull String); - method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermissions(@NonNull java.util.Map>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback); - method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.RESTORE_RUNTIME_PERMISSIONS}) public void stageAndApplyRuntimePermissionsBackup(@NonNull byte[], @NonNull android.os.UserHandle); - field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1 - field public static final int COUNT_WHEN_SYSTEM = 2; // 0x2 - field public static final int REASON_INSTALLER_POLICY_VIOLATION = 2; // 0x2 - field public static final int REASON_MALWARE = 1; // 0x1 } public static interface PermissionControllerManager.OnCountPermissionAppsResultCallback { @@ -3273,33 +1393,6 @@ package android.permission { method public void onGetAppPermissions(@NonNull java.util.List); } - public abstract static class PermissionControllerManager.OnRevokeRuntimePermissionsCallback { - ctor public PermissionControllerManager.OnRevokeRuntimePermissionsCallback(); - method public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map>); - } - - public final class PermissionManager { - method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public int getRuntimePermissionsVersion(); - method @NonNull public java.util.List getSplitPermissions(); - method @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public void setRuntimePermissionsVersion(@IntRange(from=0) int); - } - - public static final class PermissionManager.SplitPermissionInfo { - method @NonNull public java.util.List getNewPermissions(); - method @NonNull public String getSplitPermission(); - method public int getTargetSdk(); - } - - public final class RuntimePermissionPresentationInfo implements android.os.Parcelable { - ctor public RuntimePermissionPresentationInfo(@NonNull CharSequence, boolean, boolean); - method public int describeContents(); - method @NonNull public CharSequence getLabel(); - method public boolean isGranted(); - method public boolean isStandard(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - } package android.print { @@ -3347,75 +1440,18 @@ package android.provider { } public final class DeviceConfig { - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static void addOnPropertiesChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static boolean getBoolean(@NonNull String, @NonNull String, boolean); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(@NonNull String, @NonNull String, float); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(@NonNull String, @NonNull String, int); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(@NonNull String, @NonNull String, long); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static android.provider.DeviceConfig.Properties getProperties(@NonNull String, @NonNull java.lang.String...); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(@NonNull String, @NonNull String); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(@NonNull String, @NonNull String, @Nullable String); - method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); - method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static void resetToDefaults(int, @Nullable String); - method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperties(@NonNull android.provider.DeviceConfig.Properties) throws android.provider.DeviceConfig.BadConfigException; - method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean); field public static final String NAMESPACE_ALARM_MANAGER = "alarm_manager"; field public static final String NAMESPACE_ANDROID = "android"; - field public static final String NAMESPACE_AUTOFILL = "autofill"; - field public static final String NAMESPACE_BIOMETRICS = "biometrics"; - field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; field public static final String NAMESPACE_DEVICE_IDLE = "device_idle"; field public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler"; - field public static final String NAMESPACE_PERMISSIONS = "permissions"; - field public static final String NAMESPACE_PRIVACY = "privacy"; - field public static final String NAMESPACE_ROLLBACK = "rollback"; - field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; - } - - public static class DeviceConfig.BadConfigException extends java.lang.Exception { - ctor public DeviceConfig.BadConfigException(); - } - - public static interface DeviceConfig.OnPropertiesChangedListener { - method public void onPropertiesChanged(@NonNull android.provider.DeviceConfig.Properties); - } - - public static class DeviceConfig.Properties { - method public boolean getBoolean(@NonNull String, boolean); - method public float getFloat(@NonNull String, float); - method public int getInt(@NonNull String, int); - method @NonNull public java.util.Set getKeyset(); - method public long getLong(@NonNull String, long); - method @NonNull public String getNamespace(); - method @Nullable public String getString(@NonNull String, @Nullable String); - } - - public static final class DeviceConfig.Properties.Builder { - ctor public DeviceConfig.Properties.Builder(@NonNull String); - method @NonNull public android.provider.DeviceConfig.Properties build(); - method @NonNull public android.provider.DeviceConfig.Properties.Builder setBoolean(@NonNull String, boolean); - method @NonNull public android.provider.DeviceConfig.Properties.Builder setFloat(@NonNull String, float); - method @NonNull public android.provider.DeviceConfig.Properties.Builder setInt(@NonNull String, int); - method @NonNull public android.provider.DeviceConfig.Properties.Builder setLong(@NonNull String, long); - method @NonNull public android.provider.DeviceConfig.Properties.Builder setString(@NonNull String, @Nullable String); - } - - public final class DocumentsContract { - method public static boolean isManageMode(@NonNull android.net.Uri); - method @NonNull public static android.net.Uri setManageMode(@NonNull android.net.Uri); } public final class Settings { - field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS"; - field public static final String ACTION_MANAGE_APP_OVERLAY_PERMISSION = "android.settings.MANAGE_APP_OVERLAY_PERMISSION"; - field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE"; - field public static final String ACTION_TETHER_PROVISIONING_UI = "android.settings.TETHER_PROVISIONING_UI"; field public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; // 0x1 } public static final class Settings.Global extends android.provider.Settings.NameValueTable { field public static final String APP_OPS_CONSTANTS = "app_ops_constants"; - field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages"; field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode"; field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants"; field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold"; @@ -3430,12 +1466,10 @@ package android.provider { field public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; field public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog"; - field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled"; field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package"; } public static final class Settings.Secure extends android.provider.Settings.NameValueTable { - method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String); field public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED = "accessibility_display_magnification_enabled"; field public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY = "accessibility_magnification_capability"; field public static final String ACCESSIBILITY_MAGNIFICATION_MODE = "accessibility_magnification_mode"; @@ -3444,23 +1478,12 @@ package android.provider { field public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 2; // 0x2 field public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service"; field public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; - field public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification"; field public static final String AUTOFILL_SERVICE = "autofill_service"; - field public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT = "autofill_user_data_max_category_count"; - field public static final String AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE = "autofill_user_data_max_field_classification_size"; - field public static final String AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE = "autofill_user_data_max_user_data_size"; - field public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH = "autofill_user_data_max_value_length"; - field public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length"; field public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled"; field public static final String DISABLED_PRINT_SERVICES = "disabled_print_services"; - field public static final String DOZE_ALWAYS_ON = "doze_always_on"; field @Deprecated public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; field public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners"; field public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations"; - field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis"; - field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis"; - field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications"; - field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications"; field public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component"; field public static final String NOTIFICATION_BADGING = "notification_badging"; field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content"; @@ -3469,45 +1492,9 @@ package android.provider { field public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION = "show_first_crash_dialog_dev_option"; field public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard"; field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds"; - field public static final String USER_SETUP_COMPLETE = "user_setup_complete"; field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service"; } - public static final class Telephony.CellBroadcasts implements android.provider.BaseColumns { - field public static final String CID = "cid"; - field public static final String CMAS_CATEGORY = "cmas_category"; - field public static final String CMAS_CERTAINTY = "cmas_certainty"; - field public static final String CMAS_MESSAGE_CLASS = "cmas_message_class"; - field public static final String CMAS_RESPONSE_TYPE = "cmas_response_type"; - field public static final String CMAS_SEVERITY = "cmas_severity"; - field public static final String CMAS_URGENCY = "cmas_urgency"; - field @NonNull public static final android.net.Uri CONTENT_URI; - field public static final String DATA_CODING_SCHEME = "dcs"; - field public static final String DEFAULT_SORT_ORDER = "date DESC"; - field public static final String DELIVERY_TIME = "date"; - field public static final String ETWS_IS_PRIMARY = "etws_is_primary"; - field public static final String ETWS_WARNING_TYPE = "etws_warning_type"; - field public static final String GEOGRAPHICAL_SCOPE = "geo_scope"; - field public static final String GEOMETRIES = "geometries"; - field public static final String LAC = "lac"; - field public static final String LANGUAGE_CODE = "language"; - field public static final String LOCATION_CHECK_TIME = "location_check_time"; - field public static final String MAXIMUM_WAIT_TIME = "maximum_wait_time"; - field public static final String MESSAGE_BODY = "body"; - field public static final String MESSAGE_BROADCASTED = "message_broadcasted"; - field public static final String MESSAGE_DISPLAYED = "message_displayed"; - field public static final String MESSAGE_FORMAT = "format"; - field @NonNull @RequiresPermission(android.Manifest.permission.READ_CELL_BROADCASTS) public static final android.net.Uri MESSAGE_HISTORY_URI; - field public static final String MESSAGE_PRIORITY = "priority"; - field public static final String MESSAGE_READ = "read"; - field public static final String PLMN = "plmn"; - field public static final String RECEIVED_TIME = "received_time"; - field public static final String SERIAL_NUMBER = "serial_number"; - field public static final String SERVICE_CATEGORY = "service_category"; - field public static final String SLOT_INDEX = "slot_index"; - field public static final String SUBSCRIPTION_ID = "sub_id"; - } - public static final class Telephony.Sms.Intents { field public static final String SMS_CARRIER_PROVISION_ACTION = "android.provider.Telephony.SMS_CARRIER_PROVISION"; } @@ -3529,19 +1516,6 @@ package android.security { package android.security.keystore { - public abstract class AttestationUtils { - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static java.security.cert.X509Certificate[] attestDeviceIds(android.content.Context, @NonNull int[], @NonNull byte[]) throws android.security.keystore.DeviceIdAttestationException; - field public static final int ID_TYPE_IMEI = 2; // 0x2 - field public static final int ID_TYPE_MEID = 3; // 0x3 - field public static final int ID_TYPE_SERIAL = 1; // 0x1 - field public static final int USE_INDIVIDUAL_ATTESTATION = 4; // 0x4 - } - - public class DeviceIdAttestationException extends java.lang.Exception { - ctor public DeviceIdAttestationException(@Nullable String); - ctor public DeviceIdAttestationException(@Nullable String, @Nullable Throwable); - } - public static final class KeyGenParameterSpec.Builder { method @NonNull public android.security.keystore.KeyGenParameterSpec.Builder setUniqueIdIncluded(boolean); } @@ -3556,37 +1530,8 @@ package android.security.keystore { } -package android.service.appprediction { - - public abstract class AppPredictionService extends android.app.Service { - ctor public AppPredictionService(); - method @MainThread public abstract void onAppTargetEvent(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull android.app.prediction.AppTargetEvent); - method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent); - method public void onCreatePredictionSession(@NonNull android.app.prediction.AppPredictionContext, @NonNull android.app.prediction.AppPredictionSessionId); - method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId); - method @MainThread public abstract void onLaunchLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List); - method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId); - method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer>); - method @MainThread public void onStartPredictionUpdates(); - method @MainThread public void onStopPredictionUpdates(); - method public final void updatePredictions(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List); - } - -} - package android.service.autofill { - public abstract class AutofillFieldClassificationService extends android.app.Service { - ctor public AutofillFieldClassificationService(); - method public android.os.IBinder onBind(android.content.Intent); - field public static final String REQUIRED_ALGORITHM_CREDIT_CARD = "CREDIT_CARD"; - field public static final String REQUIRED_ALGORITHM_EDIT_DISTANCE = "EDIT_DISTANCE"; - field public static final String REQUIRED_ALGORITHM_EXACT_MATCH = "EXACT_MATCH"; - field public static final String SERVICE_INTERFACE = "android.service.autofill.AutofillFieldClassificationService"; - field public static final String SERVICE_META_DATA_KEY_AVAILABLE_ALGORITHMS = "android.autofill.field_classification.available_algorithms"; - field public static final String SERVICE_META_DATA_KEY_DEFAULT_ALGORITHM = "android.autofill.field_classification.default_algorithm"; - } - public final class CharSequenceTransformation extends android.service.autofill.InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation { method public void apply(@NonNull android.service.autofill.ValueFinder, @NonNull android.widget.RemoteViews, int) throws java.lang.Exception; } @@ -3609,11 +1554,6 @@ package android.service.autofill { method @Nullable public android.util.SparseArray getActions(); } - public static final class Dataset.Builder { - ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation); - method @NonNull public android.service.autofill.Dataset.Builder setFieldInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation); - } - public final class DateTransformation extends android.service.autofill.InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation { method public void apply(@NonNull android.service.autofill.ValueFinder, @NonNull android.widget.RemoteViews, int) throws java.lang.Exception; } @@ -3630,15 +1570,6 @@ package android.service.autofill { method public void apply(@NonNull android.service.autofill.ValueFinder, @NonNull android.widget.RemoteViews, int) throws java.lang.Exception; } - public abstract class InlineSuggestionRenderService extends android.app.Service { - ctor public InlineSuggestionRenderService(); - method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); - method @NonNull public android.os.Bundle onGetInlineSuggestionsRendererInfo(); - method @Nullable public android.view.View onRenderSuggestion(@NonNull android.service.autofill.InlinePresentation, int, int); - method public final void startIntentSender(@NonNull android.content.IntentSender); - field public static final String SERVICE_INTERFACE = "android.service.autofill.InlineSuggestionRenderService"; - } - public abstract class InternalOnClickAction implements android.service.autofill.OnClickAction android.os.Parcelable { ctor public InternalOnClickAction(); method public abstract void onClick(@NonNull android.view.ViewGroup); @@ -3688,26 +1619,6 @@ package android.service.autofill { package android.service.autofill.augmented { - public abstract class AugmentedAutofillService extends android.app.Service { - ctor public AugmentedAutofillService(); - method protected final void dump(java.io.FileDescriptor, java.io.PrintWriter, String[]); - method protected void dump(@NonNull java.io.PrintWriter, @NonNull String[]); - method @Nullable public final android.service.autofill.FillEventHistory getFillEventHistory(); - method public void onConnected(); - method public void onDisconnected(); - method public void onFillRequest(@NonNull android.service.autofill.augmented.FillRequest, @NonNull android.os.CancellationSignal, @NonNull android.service.autofill.augmented.FillController, @NonNull android.service.autofill.augmented.FillCallback); - method public final boolean requestAutofill(@NonNull android.content.ComponentName, @NonNull android.view.autofill.AutofillId); - field public static final String SERVICE_INTERFACE = "android.service.autofill.augmented.AugmentedAutofillService"; - } - - public final class FillCallback { - method public void onSuccess(@Nullable android.service.autofill.augmented.FillResponse); - } - - public final class FillController { - method public void autofill(@NonNull java.util.List>); - } - public final class FillRequest { method @NonNull public android.content.ComponentName getActivityComponent(); method @NonNull public android.view.autofill.AutofillId getFocusedId(); @@ -3717,181 +1628,14 @@ package android.service.autofill.augmented { method public int getTaskId(); } - public final class FillResponse { - } - - public static final class FillResponse.Builder { - ctor public FillResponse.Builder(); - method @NonNull public android.service.autofill.augmented.FillResponse build(); - method @NonNull public android.service.autofill.augmented.FillResponse.Builder setClientState(@NonNull android.os.Bundle); - method @NonNull public android.service.autofill.augmented.FillResponse.Builder setFillWindow(@NonNull android.service.autofill.augmented.FillWindow); - method @NonNull public android.service.autofill.augmented.FillResponse.Builder setInlineSuggestions(@NonNull java.util.List); - } - - public final class FillWindow implements java.lang.AutoCloseable { - ctor public FillWindow(); - method public void destroy(); - method public boolean update(@NonNull android.service.autofill.augmented.PresentationParams.Area, @NonNull android.view.View, long); - } - - public abstract class PresentationParams { - method @Nullable public android.service.autofill.augmented.PresentationParams.Area getSuggestionArea(); - } - - public abstract static class PresentationParams.Area { - method @NonNull public android.graphics.Rect getBounds(); - } - -} - -package android.service.contentcapture { - - public final class ActivityEvent implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public android.content.ComponentName getComponentName(); - method public int getEventType(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int TYPE_ACTIVITY_DESTROYED = 24; // 0x18 - field public static final int TYPE_ACTIVITY_PAUSED = 2; // 0x2 - field public static final int TYPE_ACTIVITY_RESUMED = 1; // 0x1 - field public static final int TYPE_ACTIVITY_STOPPED = 23; // 0x17 - } - - public abstract class ContentCaptureService extends android.app.Service { - ctor public ContentCaptureService(); - method public final void disableSelf(); - method public void onActivityEvent(@NonNull android.service.contentcapture.ActivityEvent); - method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData); - method public void onConnected(); - method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent); - method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId); - method public void onDataRemovalRequest(@NonNull android.view.contentcapture.DataRemovalRequest); - method public void onDataShareRequest(@NonNull android.view.contentcapture.DataShareRequest, @NonNull android.service.contentcapture.DataShareCallback); - method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId); - method public void onDisconnected(); - method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set); - method public final void setContentCaptureWhitelist(@Nullable java.util.Set, @Nullable java.util.Set); - field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService"; - field public static final String SERVICE_META_DATA = "android.content_capture"; - } - - public interface DataShareCallback { - method public void onAccept(@NonNull java.util.concurrent.Executor, @NonNull android.service.contentcapture.DataShareReadAdapter); - method public void onReject(); - } - - public interface DataShareReadAdapter { - method public void onError(int); - method public void onStart(@NonNull android.os.ParcelFileDescriptor); - } - - public final class SnapshotData implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.app.assist.AssistContent getAssistContent(); - method @NonNull public android.os.Bundle getAssistData(); - method @NonNull public android.app.assist.AssistStructure getAssistStructure(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - } package android.service.notification { - public final class Adjustment implements android.os.Parcelable { - ctor public Adjustment(String, String, android.os.Bundle, CharSequence, int); - ctor public Adjustment(@NonNull String, @NonNull String, @NonNull android.os.Bundle, @NonNull CharSequence, @NonNull android.os.UserHandle); - method public int describeContents(); - method @NonNull public CharSequence getExplanation(); - method @NonNull public String getKey(); - method @NonNull public String getPackage(); - method @NonNull public android.os.Bundle getSignals(); - method public int getUser(); - method @NonNull public android.os.UserHandle getUserHandle(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final String KEY_CONTEXTUAL_ACTIONS = "key_contextual_actions"; - field public static final String KEY_IMPORTANCE = "key_importance"; - field public static final String KEY_RANKING_SCORE = "key_ranking_score"; - field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria"; - field public static final String KEY_TEXT_REPLIES = "key_text_replies"; - field public static final String KEY_USER_SENTIMENT = "key_user_sentiment"; - } - @Deprecated public abstract class ConditionProviderService extends android.app.Service { method @Deprecated public boolean isBound(); } - public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService { - ctor public NotificationAssistantService(); - method public final void adjustNotification(@NonNull android.service.notification.Adjustment); - method public final void adjustNotifications(@NonNull java.util.List); - method public void onActionInvoked(@NonNull String, @NonNull android.app.Notification.Action, int); - method public void onAllowedAdjustmentsChanged(); - method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent); - method public void onNotificationDirectReplied(@NonNull String); - method @Nullable public abstract android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification); - method @Nullable public android.service.notification.Adjustment onNotificationEnqueued(@NonNull android.service.notification.StatusBarNotification, @NonNull android.app.NotificationChannel); - method public void onNotificationExpansionChanged(@NonNull String, boolean, boolean); - method public abstract void onNotificationSnoozedUntilContext(@NonNull android.service.notification.StatusBarNotification, @NonNull String); - method public void onNotificationVisibilityChanged(@NonNull String, boolean); - method public void onNotificationsSeen(@NonNull java.util.List); - method public void onPanelHidden(); - method public void onPanelRevealed(int); - method public void onSuggestedReplySent(@NonNull String, @NonNull CharSequence, int); - method public final void unsnoozeNotification(@NonNull String); - field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService"; - field public static final int SOURCE_FROM_APP = 0; // 0x0 - field public static final int SOURCE_FROM_ASSISTANT = 1; // 0x1 - } - - public abstract class NotificationListenerService extends android.app.Service { - method public void onNotificationRemoved(@NonNull android.service.notification.StatusBarNotification, @NonNull android.service.notification.NotificationListenerService.RankingMap, @NonNull android.service.notification.NotificationStats, int); - } - - public final class NotificationStats implements android.os.Parcelable { - ctor public NotificationStats(); - method public int describeContents(); - method public int getDismissalSentiment(); - method public int getDismissalSurface(); - method public boolean hasDirectReplied(); - method public boolean hasExpanded(); - method public boolean hasInteracted(); - method public boolean hasSeen(); - method public boolean hasSnoozed(); - method public boolean hasViewedSettings(); - method public void setDirectReplied(); - method public void setDismissalSentiment(int); - method public void setDismissalSurface(int); - method public void setExpanded(); - method public void setSeen(); - method public void setSnoozed(); - method public void setViewedSettings(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int DISMISSAL_AOD = 2; // 0x2 - field public static final int DISMISSAL_NOT_DISMISSED = -1; // 0xffffffff - field public static final int DISMISSAL_OTHER = 0; // 0x0 - field public static final int DISMISSAL_PEEK = 1; // 0x1 - field public static final int DISMISSAL_SHADE = 3; // 0x3 - field public static final int DISMISS_SENTIMENT_NEGATIVE = 0; // 0x0 - field public static final int DISMISS_SENTIMENT_NEUTRAL = 1; // 0x1 - field public static final int DISMISS_SENTIMENT_POSITIVE = 2; // 0x2 - field public static final int DISMISS_SENTIMENT_UNKNOWN = -1000; // 0xfffffc18 - } - - public final class SnoozeCriterion implements android.os.Parcelable { - ctor public SnoozeCriterion(String, CharSequence, CharSequence); - ctor protected SnoozeCriterion(android.os.Parcel); - method public int describeContents(); - method public CharSequence getConfirmation(); - method public CharSequence getExplanation(); - method public String getId(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - } package android.service.quickaccesswallet { @@ -3932,67 +1676,16 @@ package android.service.quicksettings { } -package android.service.textclassifier { - - public abstract class TextClassifierService extends android.app.Service { - ctor public TextClassifierService(); - method @NonNull public static android.view.textclassifier.TextClassifier getDefaultTextClassifierImplementation(@NonNull android.content.Context); - method @Deprecated public final android.view.textclassifier.TextClassifier getLocalTextClassifier(); - method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); - method @MainThread public abstract void onClassifyText(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextClassification.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback); - method public void onConnected(); - method @MainThread public void onCreateTextClassificationSession(@NonNull android.view.textclassifier.TextClassificationContext, @NonNull android.view.textclassifier.TextClassificationSessionId); - method @MainThread public void onDestroyTextClassificationSession(@NonNull android.view.textclassifier.TextClassificationSessionId); - method @MainThread public void onDetectLanguage(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextLanguage.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback); - method public void onDisconnected(); - method @MainThread public abstract void onGenerateLinks(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextLinks.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback); - method @Deprecated @MainThread public void onSelectionEvent(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.SelectionEvent); - method @MainThread public void onSuggestConversationActions(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.ConversationActions.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback); - method @MainThread public abstract void onSuggestSelection(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextSelection.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback); - method @MainThread public void onTextClassifierEvent(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextClassifierEvent); - field public static final String SERVICE_INTERFACE = "android.service.textclassifier.TextClassifierService"; - } - - public static interface TextClassifierService.Callback { - method public void onFailure(@NonNull CharSequence); - method public void onSuccess(T); - } - -} - package android.service.watchdog { public abstract class ExplicitHealthCheckService extends android.app.Service { - ctor public ExplicitHealthCheckService(); - method public final void notifyHealthCheckPassed(@NonNull String); - method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent); - method public abstract void onCancelHealthCheck(@NonNull String); - method @NonNull public abstract java.util.List onGetRequestedPackages(); - method @NonNull public abstract java.util.List onGetSupportedPackages(); - method public abstract void onRequestHealthCheck(@NonNull String); method public void setCallback(@Nullable android.os.RemoteCallback); - field public static final String BIND_PERMISSION = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE"; - field public static final String SERVICE_INTERFACE = "android.service.watchdog.ExplicitHealthCheckService"; - } - - public static final class ExplicitHealthCheckService.PackageConfig implements android.os.Parcelable { - ctor public ExplicitHealthCheckService.PackageConfig(@NonNull String, long); - method public int describeContents(); - method public long getHealthCheckTimeoutMillis(); - method @NonNull public String getPackageName(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } } package android.telecom { - public final class Call { - method public void enterBackgroundAudioProcessing(); - method public void exitBackgroundAudioProcessing(boolean); - } - public static class Call.Details { method public String getTelecomCallId(); } @@ -4001,42 +1694,6 @@ package android.telecom { ctor public CallAudioState(boolean, int, int, @Nullable android.bluetooth.BluetoothDevice, @NonNull java.util.Collection); } - public static class CallScreeningService.CallResponse.Builder { - method @NonNull @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_OUTPUT) public android.telecom.CallScreeningService.CallResponse.Builder setShouldScreenCallViaAudioProcessing(boolean); - } - - public abstract class Conference extends android.telecom.Conferenceable { - method public android.telecom.Connection getPrimaryConnection(); - method @NonNull public final String getTelecomCallId(); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public final void setAddress(@NonNull android.net.Uri, int); - method public final void setCallerDisplayName(@NonNull String, int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setConferenceState(boolean); - } - - public abstract class Connection extends android.telecom.Conferenceable { - method @IntRange(from=0) public final long getConnectTimeMillis(); - method public final long getConnectionStartElapsedRealtimeMillis(); - method @Nullable public android.telecom.PhoneAccountHandle getPhoneAccountHandle(); - method @Nullable public final String getTelecomCallId(); - method public final void resetConnectionTime(); - method public void setCallDirection(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public final void setConnectTimeMillis(@IntRange(from=0) long); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public final void setConnectionStartElapsedRealtimeMillis(long); - method public void setPhoneAccountHandle(@NonNull android.telecom.PhoneAccountHandle); - method public void setTelecomCallId(@NonNull String); - field public static final int CAPABILITY_CONFERENCE_HAS_NO_CHILDREN = 2097152; // 0x200000 - field public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 262144; // 0x40000 - field public static final String EXTRA_DISABLE_ADD_CALL = "android.telecom.extra.DISABLE_ADD_CALL"; - field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 1; // 0x1 - field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2 - field public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 64; // 0x40 - field public static final int PROPERTY_REMOTELY_HOSTED = 2048; // 0x800 - } - - public final class ConnectionRequest implements android.os.Parcelable { - method @Nullable public String getTelecomCallId(); - } - public static final class ConnectionRequest.Builder { ctor public ConnectionRequest.Builder(); method @NonNull public android.telecom.ConnectionRequest build(); @@ -4052,53 +1709,11 @@ package android.telecom { method @NonNull public android.telecom.ConnectionRequest.Builder setVideoState(int); } - public static class PhoneAccount.Builder { - method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telecom.PhoneAccount.Builder setGroupId(@NonNull String); - } - - public class PhoneAccountSuggestionService extends android.app.Service { - ctor public PhoneAccountSuggestionService(); - method public void onAccountSuggestionRequest(@NonNull String); - method public android.os.IBinder onBind(android.content.Intent); - method public final void suggestPhoneAccounts(@NonNull String, @NonNull java.util.List); - field public static final String SERVICE_INTERFACE = "android.telecom.PhoneAccountSuggestionService"; - } - - public class TelecomManager { - method @NonNull public android.content.Intent createLaunchEmergencyDialerIntent(@Nullable String); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List getCallCapablePhoneAccounts(boolean); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCurrentTtyMode(); - method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDefaultDialerPackage(@NonNull android.os.UserHandle); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall(); - method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging(); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle); - field public static final String ACTION_CURRENT_TTY_MODE_CHANGED = "android.telecom.action.CURRENT_TTY_MODE_CHANGED"; - field public static final String ACTION_TTY_PREFERRED_MODE_CHANGED = "android.telecom.action.TTY_PREFERRED_MODE_CHANGED"; - field public static final String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE"; - field public static final String EXTRA_TTY_PREFERRED_MODE = "android.telecom.extra.TTY_PREFERRED_MODE"; - field public static final int TTY_MODE_FULL = 1; // 0x1 - field public static final int TTY_MODE_HCO = 2; // 0x2 - field public static final int TTY_MODE_OFF = 0; // 0x0 - field public static final int TTY_MODE_VCO = 3; // 0x3 - } - } package android.telephony { - public final class AccessNetworkConstants { - field public static final int TRANSPORT_TYPE_INVALID = -1; // 0xffffffff - } - - public static final class AccessNetworkConstants.NgranBands { - method public static int getFrequencyRangeGroup(int); - field public static final int FREQUENCY_RANGE_GROUP_1 = 1; // 0x1 - field public static final int FREQUENCY_RANGE_GROUP_2 = 2; // 0x2 - field public static final int FREQUENCY_RANGE_GROUP_UNKNOWN = 0; // 0x0 - } - public final class BarringInfo implements android.os.Parcelable { - ctor public BarringInfo(); ctor public BarringInfo(@Nullable android.telephony.CellIdentity, @NonNull android.util.SparseArray); } @@ -4106,57 +1721,6 @@ package android.telephony { ctor public BarringInfo.BarringServiceInfo(int, boolean, int, int); } - public final class CallQuality implements android.os.Parcelable { - ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int); - ctor public CallQuality(int, int, int, int, int, int, int, int, int, int, int, boolean, boolean, boolean); - method public int describeContents(); - method public int getAverageRelativeJitter(); - method public int getAverageRoundTripTime(); - method public int getCallDuration(); - method public int getCodecType(); - method public int getDownlinkCallQualityLevel(); - method public int getMaxRelativeJitter(); - method public int getNumRtpPacketsNotReceived(); - method public int getNumRtpPacketsReceived(); - method public int getNumRtpPacketsTransmitted(); - method public int getNumRtpPacketsTransmittedLost(); - method public int getUplinkCallQualityLevel(); - method public boolean isIncomingSilenceDetectedAtCallSetup(); - method public boolean isOutgoingSilenceDetectedAtCallSetup(); - method public boolean isRtpInactivityDetected(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int CALL_QUALITY_BAD = 4; // 0x4 - field public static final int CALL_QUALITY_EXCELLENT = 0; // 0x0 - field public static final int CALL_QUALITY_FAIR = 2; // 0x2 - field public static final int CALL_QUALITY_GOOD = 1; // 0x1 - field public static final int CALL_QUALITY_NOT_AVAILABLE = 5; // 0x5 - field public static final int CALL_QUALITY_POOR = 3; // 0x3 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public class CarrierConfigManager { - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle); - } - - public final class DataSpecificRegistrationInfo implements android.os.Parcelable { - method public int describeContents(); - method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public final class LteVopsSupportInfo implements android.os.Parcelable { - ctor public LteVopsSupportInfo(int, int); - method public int describeContents(); - method public int getEmcBearerSupport(); - method public int getVopsSupport(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int LTE_STATUS_NOT_AVAILABLE = 1; // 0x1 - field public static final int LTE_STATUS_NOT_SUPPORTED = 3; // 0x3 - field public static final int LTE_STATUS_SUPPORTED = 2; // 0x2 - } - public class MbmsDownloadSession implements java.lang.AutoCloseable { field public static final String MBMS_DOWNLOAD_SERVICE_OVERRIDE_METADATA = "mbms-download-service-override"; } @@ -4171,71 +1735,14 @@ package android.telephony { public final class ModemActivityInfo implements android.os.Parcelable { ctor public ModemActivityInfo(long, int, int, @NonNull int[], int); - method public int describeContents(); - method @NonNull public android.telephony.ModemActivityInfo getDelta(@NonNull android.telephony.ModemActivityInfo); - method public long getIdleTimeMillis(); - method public static int getNumTxPowerLevels(); - method public long getReceiveTimeMillis(); - method public long getSleepTimeMillis(); - method public long getTimestampMillis(); - method public long getTransmitDurationMillisAtPowerLevel(int); - method @NonNull public android.util.Range getTransmitPowerRange(int); method public boolean isValid(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int TX_POWER_LEVEL_0 = 0; // 0x0 - field public static final int TX_POWER_LEVEL_1 = 1; // 0x1 - field public static final int TX_POWER_LEVEL_2 = 2; // 0x2 - field public static final int TX_POWER_LEVEL_3 = 3; // 0x3 - field public static final int TX_POWER_LEVEL_4 = 4; // 0x4 - } - - public final class NetworkRegistrationInfo implements android.os.Parcelable { - method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo(); - method public int getRegistrationState(); - method public int getRejectCause(); - method public int getRoamingType(); - method public boolean isEmergencyEnabled(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3 - field public static final int REGISTRATION_STATE_HOME = 1; // 0x1 - field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0 - field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2 - field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5 - field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4 - } - - public static final class NetworkRegistrationInfo.Builder { - ctor public NetworkRegistrationInfo.Builder(); - method @NonNull public android.telephony.NetworkRegistrationInfo build(); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAccessNetworkTechnology(int); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAvailableServices(@NonNull java.util.List); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setCellIdentity(@Nullable android.telephony.CellIdentity); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setDomain(int); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setEmergencyOnly(boolean); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRegisteredPlmn(@Nullable String); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRegistrationState(int); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRejectCause(int); - method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setTransportType(int); } public class PhoneNumberUtils { method public static int getMinMatchForTest(); - method @NonNull public static String getUsernameFromUriNumber(@NonNull String); - method public static boolean isUriNumber(@Nullable String); - method public static boolean isVoiceMailNumber(@NonNull android.content.Context, int, @Nullable String); method public static void setMinMatchForTest(int); } - public class PhoneStateListener { - method @Deprecated public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber); - method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber, int); - method @Deprecated public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber); - method public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber, int); - field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000 - field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000 - } - public final class PreciseDataConnectionState implements android.os.Parcelable { ctor @Deprecated public PreciseDataConnectionState(int, int, int, @NonNull String, @Nullable android.net.LinkProperties, int); } @@ -4261,44 +1768,16 @@ package android.telephony { field public static final int SMS_CATEGORY_STANDARD_SHORT_CODE = 2; // 0x2 } - public class SubscriptionManager { - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int); - field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI; - field @NonNull public static final android.net.Uri VT_ENABLED_CONTENT_URI; - field @NonNull public static final android.net.Uri WFC_ENABLED_CONTENT_URI; - field @NonNull public static final android.net.Uri WFC_MODE_CONTENT_URI; - field @NonNull public static final android.net.Uri WFC_ROAMING_ENABLED_CONTENT_URI; - field @NonNull public static final android.net.Uri WFC_ROAMING_MODE_CONTENT_URI; - } - public class TelephonyManager { method public int addDevicePolicyOverrideApn(@NonNull android.content.Context, @NonNull android.telephony.data.ApnSetting); - method public int checkCarrierPrivilegesForPackage(String); - method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getAndUpdateDefaultRespondViaMessageApplication(); method public int getCarrierIdListVersion(); - method public java.util.List getCarrierPackageNamesForIntent(android.content.Intent); - method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getDefaultRespondViaMessageApplication(); method @NonNull public java.util.List getDevicePolicyOverrideApns(@NonNull android.content.Context); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag(); method public android.util.Pair getRadioHalVersion(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(int); method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile(); - method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void resetOtaEmergencyNumberDbFilePath(); method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String); method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull java.util.List); - method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateOtaEmergencyNumberDbFilePath(@NonNull android.os.ParcelFileDescriptor); - field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe - field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1 - field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0 - field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff - field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff - field public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; // 0x1 - field public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; // 0x2 field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff } @@ -4314,835 +1793,18 @@ package android.telephony.emergency { package android.telephony.ims { - public final class ImsCallForwardInfo implements android.os.Parcelable { - ctor public ImsCallForwardInfo(int, int, int, int, @NonNull String, int); - method public int describeContents(); - method public int getCondition(); - method public String getNumber(); - method public int getServiceClass(); - method public int getStatus(); - method public int getTimeSeconds(); - method public int getToA(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int CDIV_CF_REASON_ALL = 4; // 0x4 - field public static final int CDIV_CF_REASON_ALL_CONDITIONAL = 5; // 0x5 - field public static final int CDIV_CF_REASON_BUSY = 1; // 0x1 - field public static final int CDIV_CF_REASON_NOT_LOGGED_IN = 6; // 0x6 - field public static final int CDIV_CF_REASON_NOT_REACHABLE = 3; // 0x3 - field public static final int CDIV_CF_REASON_NO_REPLY = 2; // 0x2 - field public static final int CDIV_CF_REASON_UNCONDITIONAL = 0; // 0x0 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int STATUS_ACTIVE = 1; // 0x1 - field public static final int STATUS_NOT_ACTIVE = 0; // 0x0 - field public static final int TYPE_OF_ADDRESS_INTERNATIONAL = 145; // 0x91 - field public static final int TYPE_OF_ADDRESS_UNKNOWN = 129; // 0x81 - } - public final class ImsCallProfile implements android.os.Parcelable { - ctor public ImsCallProfile(); - ctor public ImsCallProfile(int, int); - ctor public ImsCallProfile(int, int, android.os.Bundle, android.telephony.ims.ImsStreamMediaProfile); - method public int describeContents(); - method public String getCallExtra(String); - method public String getCallExtra(String, String); - method public boolean getCallExtraBoolean(String); - method public boolean getCallExtraBoolean(String, boolean); - method public int getCallExtraInt(String); - method public int getCallExtraInt(String, int); - method public android.os.Bundle getCallExtras(); - method public int getCallType(); - method public static int getCallTypeFromVideoState(int); - method public int getCallerNumberVerificationStatus(); - method public int getEmergencyCallRouting(); - method public int getEmergencyServiceCategories(); - method @NonNull public java.util.List getEmergencyUrns(); - method public android.telephony.ims.ImsStreamMediaProfile getMediaProfile(); - method @NonNull public android.os.Bundle getProprietaryCallExtras(); - method public int getRestrictCause(); - method public int getServiceType(); - method public static int getVideoStateFromCallType(int); - method public static int getVideoStateFromImsCallProfile(android.telephony.ims.ImsCallProfile); - method public boolean hasKnownUserIntentEmergency(); - method public boolean isEmergencyCallTesting(); - method public boolean isVideoCall(); - method public boolean isVideoPaused(); - method public static int presentationToOir(int); - method public void setCallExtra(String, String); - method public void setCallExtraBoolean(String, boolean); - method public void setCallExtraInt(String, int); - method public void setCallRestrictCause(int); - method public void setCallerNumberVerificationStatus(int); - method public void setEmergencyCallRouting(int); - method public void setEmergencyCallTesting(boolean); - method public void setEmergencyServiceCategories(int); - method public void setEmergencyUrns(@NonNull java.util.List); - method public void setHasKnownUserIntentEmergency(boolean); - method public void updateCallExtras(android.telephony.ims.ImsCallProfile); - method public void updateCallType(android.telephony.ims.ImsCallProfile); - method public void updateMediaProfile(android.telephony.ims.ImsCallProfile); - method public void writeToParcel(android.os.Parcel, int); - field public static final int CALL_RESTRICT_CAUSE_DISABLED = 2; // 0x2 - field public static final int CALL_RESTRICT_CAUSE_HD = 3; // 0x3 - field public static final int CALL_RESTRICT_CAUSE_NONE = 0; // 0x0 - field public static final int CALL_RESTRICT_CAUSE_RAT = 1; // 0x1 - field public static final int CALL_TYPE_VIDEO_N_VOICE = 3; // 0x3 - field public static final int CALL_TYPE_VOICE = 2; // 0x2 - field public static final int CALL_TYPE_VOICE_N_VIDEO = 1; // 0x1 - field public static final int CALL_TYPE_VS = 8; // 0x8 - field public static final int CALL_TYPE_VS_RX = 10; // 0xa - field public static final int CALL_TYPE_VS_TX = 9; // 0x9 - field public static final int CALL_TYPE_VT = 4; // 0x4 - field public static final int CALL_TYPE_VT_NODIR = 7; // 0x7 - field public static final int CALL_TYPE_VT_RX = 6; // 0x6 - field public static final int CALL_TYPE_VT_TX = 5; // 0x5 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int DIALSTRING_NORMAL = 0; // 0x0 - field public static final int DIALSTRING_SS_CONF = 1; // 0x1 - field public static final int DIALSTRING_USSD = 2; // 0x2 - field public static final String EXTRA_ADDITIONAL_CALL_INFO = "AdditionalCallInfo"; - field public static final String EXTRA_ADDITIONAL_SIP_INVITE_FIELDS = "android.telephony.ims.extra.ADDITIONAL_SIP_INVITE_FIELDS"; - field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telephony.ims.extra.CALL_DISCONNECT_CAUSE"; - field public static final String EXTRA_CALL_NETWORK_TYPE = "android.telephony.ims.extra.CALL_NETWORK_TYPE"; - field @Deprecated public static final String EXTRA_CALL_RAT_TYPE = "CallRadioTech"; - field public static final String EXTRA_CHILD_NUMBER = "ChildNum"; - field public static final String EXTRA_CNA = "cna"; - field public static final String EXTRA_CNAP = "cnap"; - field public static final String EXTRA_CODEC = "Codec"; - field public static final String EXTRA_DIALSTRING = "dialstring"; - field public static final String EXTRA_DISPLAY_TEXT = "DisplayText"; - field public static final String EXTRA_EMERGENCY_CALL = "e_call"; - field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER"; - field public static final String EXTRA_IS_CALL_PULL = "CallPull"; field public static final String EXTRA_OEM_EXTRAS = "android.telephony.ims.extra.OEM_EXTRAS"; - field public static final String EXTRA_OI = "oi"; - field public static final String EXTRA_OIR = "oir"; - field public static final String EXTRA_REMOTE_URI = "remote_uri"; - field public static final String EXTRA_USSD = "ussd"; - field public static final int OIR_DEFAULT = 0; // 0x0 - field public static final int OIR_PRESENTATION_NOT_RESTRICTED = 2; // 0x2 - field public static final int OIR_PRESENTATION_PAYPHONE = 4; // 0x4 - field public static final int OIR_PRESENTATION_RESTRICTED = 1; // 0x1 - field public static final int OIR_PRESENTATION_UNKNOWN = 3; // 0x3 - field public static final int SERVICE_TYPE_EMERGENCY = 2; // 0x2 - field public static final int SERVICE_TYPE_NONE = 0; // 0x0 - field public static final int SERVICE_TYPE_NORMAL = 1; // 0x1 - field public static final int VERIFICATION_STATUS_FAILED = 2; // 0x2 - field public static final int VERIFICATION_STATUS_NOT_VERIFIED = 0; // 0x0 - field public static final int VERIFICATION_STATUS_PASSED = 1; // 0x1 - } - - public class ImsCallSessionListener { - method public void callQualityChanged(@NonNull android.telephony.CallQuality); - method public void callSessionConferenceExtendFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionConferenceExtendReceived(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile); - method public void callSessionConferenceExtended(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile); - method public void callSessionConferenceStateUpdated(android.telephony.ims.ImsConferenceState); - method @Deprecated public void callSessionHandover(int, int, android.telephony.ims.ImsReasonInfo); - method @Deprecated public void callSessionHandoverFailed(int, int, android.telephony.ims.ImsReasonInfo); - method public void callSessionHeld(android.telephony.ims.ImsCallProfile); - method public void callSessionHoldFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionHoldReceived(android.telephony.ims.ImsCallProfile); - method public void callSessionInitiated(android.telephony.ims.ImsCallProfile); - method public void callSessionInitiatedFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionInviteParticipantsRequestDelivered(); - method public void callSessionInviteParticipantsRequestFailed(android.telephony.ims.ImsReasonInfo); - method @Deprecated public void callSessionMayHandover(int, int); - method public void callSessionMergeComplete(android.telephony.ims.stub.ImsCallSessionImplBase); - method public void callSessionMergeFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionMergeStarted(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile); - method public void callSessionMultipartyStateChanged(boolean); - method public void callSessionProgressing(android.telephony.ims.ImsStreamMediaProfile); - method public void callSessionRemoveParticipantsRequestDelivered(); - method public void callSessionRemoveParticipantsRequestFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionResumeFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionResumeReceived(android.telephony.ims.ImsCallProfile); - method public void callSessionResumed(android.telephony.ims.ImsCallProfile); - method public void callSessionRttAudioIndicatorChanged(@NonNull android.telephony.ims.ImsStreamMediaProfile); - method public void callSessionRttMessageReceived(String); - method public void callSessionRttModifyRequestReceived(android.telephony.ims.ImsCallProfile); - method public void callSessionRttModifyResponseReceived(int); - method public void callSessionSuppServiceReceived(android.telephony.ims.ImsSuppServiceNotification); - method public void callSessionTerminated(android.telephony.ims.ImsReasonInfo); - method public void callSessionTtyModeReceived(int); - method public void callSessionUpdateFailed(android.telephony.ims.ImsReasonInfo); - method public void callSessionUpdateReceived(android.telephony.ims.ImsCallProfile); - method public void callSessionUpdated(android.telephony.ims.ImsCallProfile); - method public void callSessionUssdMessageReceived(int, String); - method public void onHandover(int, int, @Nullable android.telephony.ims.ImsReasonInfo); - method public void onHandoverFailed(int, int, @NonNull android.telephony.ims.ImsReasonInfo); - method public void onMayHandover(int, int); - } - - public final class ImsConferenceState implements android.os.Parcelable { - method public int describeContents(); - method public static int getConnectionStateForStatus(String); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final String DISPLAY_TEXT = "display-text"; - field public static final String ENDPOINT = "endpoint"; - field public static final String SIP_STATUS_CODE = "sipstatuscode"; - field public static final String STATUS = "status"; - field public static final String STATUS_ALERTING = "alerting"; - field public static final String STATUS_CONNECTED = "connected"; - field public static final String STATUS_CONNECT_FAIL = "connect-fail"; - field public static final String STATUS_DIALING_IN = "dialing-in"; - field public static final String STATUS_DIALING_OUT = "dialing-out"; - field public static final String STATUS_DISCONNECTED = "disconnected"; - field public static final String STATUS_DISCONNECTING = "disconnecting"; - field public static final String STATUS_MUTED_VIA_FOCUS = "muted-via-focus"; - field public static final String STATUS_ON_HOLD = "on-hold"; - field public static final String STATUS_PENDING = "pending"; - field public static final String STATUS_SEND_ONLY = "sendonly"; - field public static final String STATUS_SEND_RECV = "sendrecv"; - field public static final String USER = "user"; - field public final java.util.HashMap mParticipants; - } - - public final class ImsException extends java.lang.Exception { - ctor public ImsException(@Nullable String); - ctor public ImsException(@Nullable String, int); - ctor public ImsException(@Nullable String, int, @Nullable Throwable); - } - - public final class ImsExternalCallState implements android.os.Parcelable { - ctor public ImsExternalCallState(@NonNull String, @NonNull android.net.Uri, @Nullable android.net.Uri, boolean, int, int, boolean); - method public int describeContents(); - method @NonNull public android.net.Uri getAddress(); - method public int getCallId(); - method public int getCallState(); - method public int getCallType(); - method @Nullable public android.net.Uri getLocalAddress(); - method public boolean isCallHeld(); - method public boolean isCallPullable(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int CALL_STATE_CONFIRMED = 1; // 0x1 - field public static final int CALL_STATE_TERMINATED = 2; // 0x2 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public class ImsMmTelManager implements android.telephony.ims.RegistrationManager { - method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiRoamingModeSetting(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(int, int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCapable(int, int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer) throws android.telephony.ims.ImsException; - method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAdvancedCallingSettingEnabled(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiModeSetting(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiNonPersistent(boolean, int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingModeSetting(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingSettingEnabled(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiSettingEnabled(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setVtSettingEnabled(boolean); - method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.ImsMmTelManager.RegistrationCallback); - } - - @Deprecated public static class ImsMmTelManager.RegistrationCallback extends android.telephony.ims.RegistrationManager.RegistrationCallback { - ctor @Deprecated public ImsMmTelManager.RegistrationCallback(); - } - - public class ImsService extends android.app.Service { - ctor public ImsService(); - method public android.telephony.ims.feature.MmTelFeature createMmTelFeature(int); - method public android.telephony.ims.feature.RcsFeature createRcsFeature(int); - method public void disableIms(int); - method public void enableIms(int); - method public android.telephony.ims.stub.ImsConfigImplBase getConfig(int); - method public android.telephony.ims.stub.ImsRegistrationImplBase getRegistration(int); - method public final void onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration) throws android.os.RemoteException; - method public android.telephony.ims.stub.ImsFeatureConfiguration querySupportedImsFeatures(); - method public void readyForFeatureCreation(); - } - - public final class ImsSsData implements android.os.Parcelable { - ctor public ImsSsData(int, int, int, int, int); - method public int describeContents(); - method @Nullable public java.util.List getCallForwardInfo(); - method public int getRequestType(); - method public int getResult(); - method public int getServiceClass(); - method public int getServiceType(); - method @NonNull public java.util.List getSuppServiceInfo(); - method public int getTeleserviceType(); - method public boolean isTypeBarring(); - method public boolean isTypeCf(); - method public boolean isTypeClip(); - method public boolean isTypeClir(); - method public boolean isTypeColp(); - method public boolean isTypeColr(); - method public boolean isTypeCw(); - method public boolean isTypeIcb(); - method public boolean isTypeInterrogation(); - method public boolean isTypeUnConditional(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int RESULT_SUCCESS = 0; // 0x0 - field public static final int SERVICE_CLASS_DATA = 2; // 0x2 - field public static final int SERVICE_CLASS_DATA_CIRCUIT_ASYNC = 32; // 0x20 - field public static final int SERVICE_CLASS_DATA_CIRCUIT_SYNC = 16; // 0x10 - field public static final int SERVICE_CLASS_DATA_PACKET_ACCESS = 64; // 0x40 - field public static final int SERVICE_CLASS_DATA_PAD = 128; // 0x80 - field public static final int SERVICE_CLASS_FAX = 4; // 0x4 - field public static final int SERVICE_CLASS_NONE = 0; // 0x0 - field public static final int SERVICE_CLASS_SMS = 8; // 0x8 - field public static final int SERVICE_CLASS_VOICE = 1; // 0x1 - field public static final int SS_ACTIVATION = 0; // 0x0 - field public static final int SS_ALL_BARRING = 18; // 0x12 - field public static final int SS_ALL_DATA_TELESERVICES = 3; // 0x3 - field public static final int SS_ALL_TELESERVICES_EXCEPT_SMS = 5; // 0x5 - field public static final int SS_ALL_TELESEVICES = 1; // 0x1 - field public static final int SS_ALL_TELE_AND_BEARER_SERVICES = 0; // 0x0 - field public static final int SS_BAIC = 16; // 0x10 - field public static final int SS_BAIC_ROAMING = 17; // 0x11 - field public static final int SS_BAOC = 13; // 0xd - field public static final int SS_BAOIC = 14; // 0xe - field public static final int SS_BAOIC_EXC_HOME = 15; // 0xf - field public static final int SS_CFU = 0; // 0x0 - field public static final int SS_CFUT = 6; // 0x6 - field public static final int SS_CF_ALL = 4; // 0x4 - field public static final int SS_CF_ALL_CONDITIONAL = 5; // 0x5 - field public static final int SS_CF_BUSY = 1; // 0x1 - field public static final int SS_CF_NOT_REACHABLE = 3; // 0x3 - field public static final int SS_CF_NO_REPLY = 2; // 0x2 - field public static final int SS_CLIP = 7; // 0x7 - field public static final int SS_CLIR = 8; // 0x8 - field public static final int SS_CNAP = 11; // 0xb - field public static final int SS_COLP = 9; // 0x9 - field public static final int SS_COLR = 10; // 0xa - field public static final int SS_DEACTIVATION = 1; // 0x1 - field public static final int SS_ERASURE = 4; // 0x4 - field public static final int SS_INCOMING_BARRING = 20; // 0x14 - field public static final int SS_INCOMING_BARRING_ANONYMOUS = 22; // 0x16 - field public static final int SS_INCOMING_BARRING_DN = 21; // 0x15 - field public static final int SS_INTERROGATION = 2; // 0x2 - field public static final int SS_OUTGOING_BARRING = 19; // 0x13 - field public static final int SS_REGISTRATION = 3; // 0x3 - field public static final int SS_SMS_SERVICES = 4; // 0x4 - field public static final int SS_TELEPHONY = 2; // 0x2 - field public static final int SS_WAIT = 12; // 0xc - } - - public static final class ImsSsData.Builder { - ctor public ImsSsData.Builder(int, int, int, int, int); - method @NonNull public android.telephony.ims.ImsSsData build(); - method @NonNull public android.telephony.ims.ImsSsData.Builder setCallForwardingInfo(@NonNull java.util.List); - method @NonNull public android.telephony.ims.ImsSsData.Builder setSuppServiceInfo(@NonNull java.util.List); - } - - public final class ImsSsInfo implements android.os.Parcelable { - ctor @Deprecated public ImsSsInfo(int, @Nullable String); - method public int describeContents(); - method public int getClirInterrogationStatus(); - method public int getClirOutgoingState(); - method @Deprecated public String getIcbNum(); - method @Nullable public String getIncomingCommunicationBarringNumber(); - method public int getProvisionStatus(); - method public int getStatus(); - method public void writeToParcel(android.os.Parcel, int); - field public static final int CLIR_OUTGOING_DEFAULT = 0; // 0x0 - field public static final int CLIR_OUTGOING_INVOCATION = 1; // 0x1 - field public static final int CLIR_OUTGOING_SUPPRESSION = 2; // 0x2 - field public static final int CLIR_STATUS_NOT_PROVISIONED = 0; // 0x0 - field public static final int CLIR_STATUS_PROVISIONED_PERMANENT = 1; // 0x1 - field public static final int CLIR_STATUS_TEMPORARILY_ALLOWED = 4; // 0x4 - field public static final int CLIR_STATUS_TEMPORARILY_RESTRICTED = 3; // 0x3 - field public static final int CLIR_STATUS_UNKNOWN = 2; // 0x2 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int DISABLED = 0; // 0x0 - field public static final int ENABLED = 1; // 0x1 - field public static final int NOT_REGISTERED = -1; // 0xffffffff - field public static final int SERVICE_NOT_PROVISIONED = 0; // 0x0 - field public static final int SERVICE_PROVISIONED = 1; // 0x1 - field public static final int SERVICE_PROVISIONING_UNKNOWN = -1; // 0xffffffff - } - - public static final class ImsSsInfo.Builder { - ctor public ImsSsInfo.Builder(int); - method @NonNull public android.telephony.ims.ImsSsInfo build(); - method @NonNull public android.telephony.ims.ImsSsInfo.Builder setClirInterrogationStatus(int); - method @NonNull public android.telephony.ims.ImsSsInfo.Builder setClirOutgoingState(int); - method @NonNull public android.telephony.ims.ImsSsInfo.Builder setIncomingCommunicationBarringNumber(@NonNull String); - method @NonNull public android.telephony.ims.ImsSsInfo.Builder setProvisionStatus(int); - } - - public final class ImsStreamMediaProfile implements android.os.Parcelable { - ctor public ImsStreamMediaProfile(int, int, int, int, int); - method public void copyFrom(android.telephony.ims.ImsStreamMediaProfile); - method public int describeContents(); - method public int getAudioDirection(); - method public int getAudioQuality(); - method public int getRttMode(); - method public int getVideoDirection(); - method public int getVideoQuality(); - method public boolean isReceivingRttAudio(); - method public boolean isRttCall(); - method public void setReceivingRttAudio(boolean); - method public void setRttMode(int); - method public void writeToParcel(android.os.Parcel, int); - field public static final int AUDIO_QUALITY_AMR = 1; // 0x1 - field public static final int AUDIO_QUALITY_AMR_WB = 2; // 0x2 - field public static final int AUDIO_QUALITY_EVRC = 4; // 0x4 - field public static final int AUDIO_QUALITY_EVRC_B = 5; // 0x5 - field public static final int AUDIO_QUALITY_EVRC_NW = 7; // 0x7 - field public static final int AUDIO_QUALITY_EVRC_WB = 6; // 0x6 - field public static final int AUDIO_QUALITY_EVS_FB = 20; // 0x14 - field public static final int AUDIO_QUALITY_EVS_NB = 17; // 0x11 - field public static final int AUDIO_QUALITY_EVS_SWB = 19; // 0x13 - field public static final int AUDIO_QUALITY_EVS_WB = 18; // 0x12 - field public static final int AUDIO_QUALITY_G711A = 13; // 0xd - field public static final int AUDIO_QUALITY_G711AB = 15; // 0xf - field public static final int AUDIO_QUALITY_G711U = 11; // 0xb - field public static final int AUDIO_QUALITY_G722 = 14; // 0xe - field public static final int AUDIO_QUALITY_G723 = 12; // 0xc - field public static final int AUDIO_QUALITY_G729 = 16; // 0x10 - field public static final int AUDIO_QUALITY_GSM_EFR = 8; // 0x8 - field public static final int AUDIO_QUALITY_GSM_FR = 9; // 0x9 - field public static final int AUDIO_QUALITY_GSM_HR = 10; // 0xa - field public static final int AUDIO_QUALITY_NONE = 0; // 0x0 - field public static final int AUDIO_QUALITY_QCELP13K = 3; // 0x3 - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int DIRECTION_INACTIVE = 0; // 0x0 - field public static final int DIRECTION_INVALID = -1; // 0xffffffff - field public static final int DIRECTION_RECEIVE = 1; // 0x1 - field public static final int DIRECTION_SEND = 2; // 0x2 - field public static final int DIRECTION_SEND_RECEIVE = 3; // 0x3 - field public static final int RTT_MODE_DISABLED = 0; // 0x0 - field public static final int RTT_MODE_FULL = 1; // 0x1 - field public static final int VIDEO_QUALITY_NONE = 0; // 0x0 - field public static final int VIDEO_QUALITY_QCIF = 1; // 0x1 - field public static final int VIDEO_QUALITY_QVGA_LANDSCAPE = 2; // 0x2 - field public static final int VIDEO_QUALITY_QVGA_PORTRAIT = 4; // 0x4 - field public static final int VIDEO_QUALITY_VGA_LANDSCAPE = 8; // 0x8 - field public static final int VIDEO_QUALITY_VGA_PORTRAIT = 16; // 0x10 - } - - public final class ImsSuppServiceNotification implements android.os.Parcelable { - ctor public ImsSuppServiceNotification(int, int, int, int, String, String[]); - method public int describeContents(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public final int code; - field public final String[] history; - field public final int index; - field public final int notificationType; - field public final String number; - field public final int type; - } - - public class ImsUtListener { - method public void onLineIdentificationSupplementaryServiceResponse(int, @NonNull android.telephony.ims.ImsSsInfo); - method public void onSupplementaryServiceIndication(android.telephony.ims.ImsSsData); - method public void onUtConfigurationCallBarringQueried(int, android.telephony.ims.ImsSsInfo[]); - method public void onUtConfigurationCallForwardQueried(int, android.telephony.ims.ImsCallForwardInfo[]); - method public void onUtConfigurationCallWaitingQueried(int, android.telephony.ims.ImsSsInfo[]); - method @Deprecated public void onUtConfigurationQueried(int, android.os.Bundle); - method public void onUtConfigurationQueryFailed(int, android.telephony.ims.ImsReasonInfo); - method public void onUtConfigurationUpdateFailed(int, android.telephony.ims.ImsReasonInfo); - method public void onUtConfigurationUpdated(int); - field @Deprecated public static final String BUNDLE_KEY_CLIR = "queryClir"; - field @Deprecated public static final String BUNDLE_KEY_SSINFO = "imsSsInfo"; - } - - public abstract class ImsVideoCallProvider { - ctor public ImsVideoCallProvider(); - method public void changeCallDataUsage(long); - method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities); - method public void changePeerDimensions(int, int); - method public void changeVideoQuality(int); - method public void handleCallSessionEvent(int); - method public abstract void onRequestCallDataUsage(); - method public abstract void onRequestCameraCapabilities(); - method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile); - method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile); - method public abstract void onSetCamera(String); - method public void onSetCamera(String, int); - method public abstract void onSetDeviceOrientation(int); - method public abstract void onSetDisplaySurface(android.view.Surface); - method public abstract void onSetPauseImage(android.net.Uri); - method public abstract void onSetPreviewSurface(android.view.Surface); - method public abstract void onSetZoom(float); - method public void receiveSessionModifyRequest(android.telecom.VideoProfile); - method public void receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile); - } - - public class ProvisioningManager { - method @NonNull public static android.telephony.ims.ProvisioningManager createForSubscriptionId(int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public int getProvisioningIntValue(int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int); - method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyRcsAutoConfigurationReceived(@NonNull byte[], boolean); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException; - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback); - field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43 - field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b - field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a - field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0 - field public static final int PROVISIONING_VALUE_ENABLED = 1; // 0x1 - field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC"; - field public static final String STRING_QUERY_RESULT_ERROR_NOT_READY = "STRING_QUERY_RESULT_ERROR_NOT_READY"; - } - - public static class ProvisioningManager.Callback { - ctor public ProvisioningManager.Callback(); - method public void onProvisioningIntChanged(int, int); - method public void onProvisioningStringChanged(int, @NonNull String); - } - - public class RcsUceAdapter { - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException; } } package android.telephony.ims.feature { - public final class CapabilityChangeRequest implements android.os.Parcelable { - method public void addCapabilitiesToDisableForTech(int, int); - method public void addCapabilitiesToEnableForTech(int, int); - method public int describeContents(); - method public java.util.List getCapabilitiesToDisable(); - method public java.util.List getCapabilitiesToEnable(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static class CapabilityChangeRequest.CapabilityPair { - ctor public CapabilityChangeRequest.CapabilityPair(int, int); - method public int getCapability(); - method public int getRadioTech(); - } - - public abstract class ImsFeature { - ctor public ImsFeature(); - method public abstract void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); - method public int getFeatureState(); - method public final int getSlotIndex(); - method public abstract void onFeatureReady(); - method public abstract void onFeatureRemoved(); - method public final void setFeatureState(int); - field public static final int CAPABILITY_ERROR_GENERIC = -1; // 0xffffffff - field public static final int CAPABILITY_SUCCESS = 0; // 0x0 - field public static final int FEATURE_EMERGENCY_MMTEL = 0; // 0x0 - field public static final int FEATURE_MMTEL = 1; // 0x1 - field public static final int FEATURE_RCS = 2; // 0x2 - field public static final int STATE_INITIALIZING = 1; // 0x1 - field public static final int STATE_READY = 2; // 0x2 - field public static final int STATE_UNAVAILABLE = 0; // 0x0 - } - @Deprecated public static class ImsFeature.Capabilities { field @Deprecated protected int mCapabilities; } - protected static class ImsFeature.CapabilityCallbackProxy { - method public void onChangeCapabilityConfigurationError(int, int, int); - } - - public class MmTelFeature extends android.telephony.ims.feature.ImsFeature { - ctor public MmTelFeature(); - method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); - method @Nullable public android.telephony.ims.ImsCallProfile createCallProfile(int, int); - method @Nullable public android.telephony.ims.stub.ImsCallSessionImplBase createCallSession(@NonNull android.telephony.ims.ImsCallProfile); - method @NonNull public android.telephony.ims.stub.ImsEcbmImplBase getEcbm(); - method @NonNull public android.telephony.ims.stub.ImsMultiEndpointImplBase getMultiEndpoint(); - method @NonNull public android.telephony.ims.stub.ImsSmsImplBase getSmsImplementation(); - method @NonNull public android.telephony.ims.stub.ImsUtImplBase getUt(); - method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.MmTelFeature.MmTelCapabilities); - method public final void notifyIncomingCall(@NonNull android.telephony.ims.stub.ImsCallSessionImplBase, @NonNull android.os.Bundle); - method public final void notifyRejectedCall(@NonNull android.telephony.ims.ImsCallProfile, @NonNull android.telephony.ims.ImsReasonInfo); - method public final void notifyVoiceMessageCountUpdate(int); - method public void onFeatureReady(); - method public void onFeatureRemoved(); - method public boolean queryCapabilityConfiguration(int, int); - method @NonNull public final android.telephony.ims.feature.MmTelFeature.MmTelCapabilities queryCapabilityStatus(); - method public void setUiTtyMode(int, @Nullable android.os.Message); - method public int shouldProcessCall(@NonNull String[]); - field public static final String EXTRA_IS_UNKNOWN_CALL = "android.telephony.ims.feature.extra.IS_UNKNOWN_CALL"; - field public static final String EXTRA_IS_USSD = "android.telephony.ims.feature.extra.IS_USSD"; - field public static final int PROCESS_CALL_CSFB = 1; // 0x1 - field public static final int PROCESS_CALL_IMS = 0; // 0x0 - } - - public static class MmTelFeature.MmTelCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities { - ctor public MmTelFeature.MmTelCapabilities(); - ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities); - ctor public MmTelFeature.MmTelCapabilities(int); - method public final void addCapabilities(int); - method public final void removeCapabilities(int); - } - - public class RcsFeature extends android.telephony.ims.feature.ImsFeature { - ctor public RcsFeature(); - method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy); - method public void onFeatureReady(); - method public void onFeatureRemoved(); - } - -} - -package android.telephony.ims.stub { - - public class ImsCallSessionImplBase implements java.lang.AutoCloseable { - ctor public ImsCallSessionImplBase(); - method public void accept(int, android.telephony.ims.ImsStreamMediaProfile); - method public void close(); - method public void deflect(String); - method public void extendToConference(String[]); - method public String getCallId(); - method public android.telephony.ims.ImsCallProfile getCallProfile(); - method public android.telephony.ims.ImsVideoCallProvider getImsVideoCallProvider(); - method public android.telephony.ims.ImsCallProfile getLocalCallProfile(); - method public String getProperty(String); - method public android.telephony.ims.ImsCallProfile getRemoteCallProfile(); - method public int getState(); - method public void hold(android.telephony.ims.ImsStreamMediaProfile); - method public void inviteParticipants(String[]); - method public boolean isInCall(); - method public boolean isMultiparty(); - method public void merge(); - method public void reject(int); - method public void removeParticipants(String[]); - method public void resume(android.telephony.ims.ImsStreamMediaProfile); - method public void sendDtmf(char, android.os.Message); - method public void sendRttMessage(String); - method public void sendRttModifyRequest(android.telephony.ims.ImsCallProfile); - method public void sendRttModifyResponse(boolean); - method public void sendUssd(String); - method public void setListener(android.telephony.ims.ImsCallSessionListener); - method public void setMute(boolean); - method public void start(String, android.telephony.ims.ImsCallProfile); - method public void startConference(String[], android.telephony.ims.ImsCallProfile); - method public void startDtmf(char); - method public void stopDtmf(); - method public void terminate(int); - method public void update(int, android.telephony.ims.ImsStreamMediaProfile); - field public static final int USSD_MODE_NOTIFY = 0; // 0x0 - field public static final int USSD_MODE_REQUEST = 1; // 0x1 - } - - public static class ImsCallSessionImplBase.State { - method public static String toString(int); - field public static final int ESTABLISHED = 4; // 0x4 - field public static final int ESTABLISHING = 3; // 0x3 - field public static final int IDLE = 0; // 0x0 - field public static final int INITIATED = 1; // 0x1 - field public static final int INVALID = -1; // 0xffffffff - field public static final int NEGOTIATING = 2; // 0x2 - field public static final int REESTABLISHING = 6; // 0x6 - field public static final int RENEGOTIATING = 5; // 0x5 - field public static final int TERMINATED = 8; // 0x8 - field public static final int TERMINATING = 7; // 0x7 - } - - public class ImsConfigImplBase { - ctor public ImsConfigImplBase(); - method public int getConfigInt(int); - method public String getConfigString(int); - method public final void notifyProvisionedValueChanged(int, int); - method public final void notifyProvisionedValueChanged(int, String); - method public void notifyRcsAutoConfigurationReceived(@NonNull byte[], boolean); - method public int setConfig(int, int); - method public int setConfig(int, String); - field public static final int CONFIG_RESULT_FAILED = 1; // 0x1 - field public static final int CONFIG_RESULT_SUCCESS = 0; // 0x0 - field public static final int CONFIG_RESULT_UNKNOWN = -1; // 0xffffffff - } - - public class ImsEcbmImplBase { - ctor public ImsEcbmImplBase(); - method public final void enteredEcbm(); - method public void exitEmergencyCallbackMode(); - method public final void exitedEcbm(); - } - - public final class ImsFeatureConfiguration implements android.os.Parcelable { - method public int describeContents(); - method public java.util.Set getServiceFeatures(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - - public static class ImsFeatureConfiguration.Builder { - ctor public ImsFeatureConfiguration.Builder(); - method public android.telephony.ims.stub.ImsFeatureConfiguration.Builder addFeature(int, int); - method public android.telephony.ims.stub.ImsFeatureConfiguration build(); - } - - public static final class ImsFeatureConfiguration.FeatureSlotPair { - ctor public ImsFeatureConfiguration.FeatureSlotPair(int, int); - field public final int featureType; - field public final int slotId; - } - - public class ImsMultiEndpointImplBase { - ctor public ImsMultiEndpointImplBase(); - method public final void onImsExternalCallStateUpdate(java.util.List); - method public void requestImsExternalCallStateInfo(); - } - - public class ImsRegistrationImplBase { - ctor public ImsRegistrationImplBase(); - method public final void onDeregistered(android.telephony.ims.ImsReasonInfo); - method public final void onRegistered(int); - method public final void onRegistering(int); - method public final void onSubscriberAssociatedUriChanged(android.net.Uri[]); - method public final void onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo); - field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1 - field public static final int REGISTRATION_TECH_LTE = 0; // 0x0 - field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff - } - - public class ImsSmsImplBase { - ctor public ImsSmsImplBase(); - method public void acknowledgeSms(int, @IntRange(from=0, to=65535) int, int); - method public void acknowledgeSmsReport(int, @IntRange(from=0, to=65535) int, int); - method public String getSmsFormat(); - method public void onReady(); - method @Deprecated public final void onSendSmsResult(int, @IntRange(from=0, to=65535) int, int, int) throws java.lang.RuntimeException; - method public final void onSendSmsResultError(int, @IntRange(from=0, to=65535) int, int, int, int) throws java.lang.RuntimeException; - method public final void onSendSmsResultSuccess(int, @IntRange(from=0, to=65535) int) throws java.lang.RuntimeException; - method public final void onSmsReceived(int, String, byte[]) throws java.lang.RuntimeException; - method @Deprecated public final void onSmsStatusReportReceived(int, @IntRange(from=0, to=65535) int, String, byte[]) throws java.lang.RuntimeException; - method public final void onSmsStatusReportReceived(int, String, byte[]) throws java.lang.RuntimeException; - method public void sendSms(int, @IntRange(from=0, to=65535) int, String, String, boolean, byte[]); - field public static final int DELIVER_STATUS_ERROR_GENERIC = 2; // 0x2 - field public static final int DELIVER_STATUS_ERROR_NO_MEMORY = 3; // 0x3 - field public static final int DELIVER_STATUS_ERROR_REQUEST_NOT_SUPPORTED = 4; // 0x4 - field public static final int DELIVER_STATUS_OK = 1; // 0x1 - field public static final int RESULT_NO_NETWORK_ERROR = -1; // 0xffffffff - field public static final int SEND_STATUS_ERROR = 2; // 0x2 - field public static final int SEND_STATUS_ERROR_FALLBACK = 4; // 0x4 - field public static final int SEND_STATUS_ERROR_RETRY = 3; // 0x3 - field public static final int SEND_STATUS_OK = 1; // 0x1 - field public static final int STATUS_REPORT_STATUS_ERROR = 2; // 0x2 - field public static final int STATUS_REPORT_STATUS_OK = 1; // 0x1 - } - - public class ImsUtImplBase { - ctor public ImsUtImplBase(); - method public void close(); - method public int queryCallBarring(int); - method public int queryCallBarringForServiceClass(int, int); - method public int queryCallForward(int, String); - method public int queryCallWaiting(); - method public int queryClip(); - method public int queryClir(); - method public int queryColp(); - method public int queryColr(); - method public void setListener(android.telephony.ims.ImsUtListener); - method public int transact(android.os.Bundle); - method public int updateCallBarring(int, int, String[]); - method public int updateCallBarringForServiceClass(int, int, String[], int); - method public int updateCallForward(int, int, String, int, int); - method public int updateCallWaiting(boolean, int); - method public int updateClip(boolean); - method public int updateClir(int); - method public int updateColp(boolean); - method public int updateColr(int); - } - -} - -package android.telephony.mbms { - - public static class DownloadRequest.Builder { - method public android.telephony.mbms.DownloadRequest.Builder setServiceId(String); - } - - public final class FileInfo implements android.os.Parcelable { - ctor public FileInfo(android.net.Uri, String); - } - - public final class FileServiceInfo extends android.telephony.mbms.ServiceInfo implements android.os.Parcelable { - ctor public FileServiceInfo(java.util.Map, String, java.util.List, String, java.util.Date, java.util.Date, java.util.List); - } - - public final class StreamingServiceInfo extends android.telephony.mbms.ServiceInfo implements android.os.Parcelable { - ctor public StreamingServiceInfo(java.util.Map, String, java.util.List, String, java.util.Date, java.util.Date); - } - - public final class UriPathPair implements android.os.Parcelable { - method public int describeContents(); - method public android.net.Uri getContentUri(); - method public android.net.Uri getFilePathUri(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - } - -} - -package android.telephony.mbms.vendor { - - public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface { - ctor public MbmsDownloadServiceBase(); - method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException; - method public int addServiceAnnouncement(int, @NonNull byte[]); - method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException; - method public android.os.IBinder asBinder(); - method public int cancelDownload(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException; - method public void dispose(int) throws android.os.RemoteException; - method public int download(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException; - method public int initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback) throws android.os.RemoteException; - method @NonNull public java.util.List listPendingDownloads(int) throws android.os.RemoteException; - method public void onAppCallbackDied(int, int); - method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException; - method public int removeProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException; - method public int removeStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException; - method public int requestDownloadState(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) throws android.os.RemoteException; - method public int requestUpdateFileServices(int, java.util.List) throws android.os.RemoteException; - method public int resetDownloadKnowledge(android.telephony.mbms.DownloadRequest) throws android.os.RemoteException; - method public int setTempFileRootDirectory(int, String) throws android.os.RemoteException; - } - - public class MbmsGroupCallServiceBase extends android.app.Service { - ctor public MbmsGroupCallServiceBase(); - method public void dispose(int) throws android.os.RemoteException; - method public int initialize(@NonNull android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException; - method public void onAppCallbackDied(int, int); - method public android.os.IBinder onBind(android.content.Intent); - method public int startGroupCall(int, long, @NonNull java.util.List, @NonNull java.util.List, @NonNull android.telephony.mbms.GroupCallCallback); - method public void stopGroupCall(int, long); - method public void updateGroupCall(int, long, @NonNull java.util.List, @NonNull java.util.List); - } - - public class MbmsStreamingServiceBase extends android.os.Binder implements android.os.IInterface { - ctor public MbmsStreamingServiceBase(); - method public android.os.IBinder asBinder(); - method public void dispose(int) throws android.os.RemoteException; - method @Nullable public android.net.Uri getPlaybackUri(int, String) throws android.os.RemoteException; - method public int initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int) throws android.os.RemoteException; - method public void onAppCallbackDied(int, int); - method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException; - method public int requestUpdateStreamingServices(int, java.util.List) throws android.os.RemoteException; - method public int startStreaming(int, String, android.telephony.mbms.StreamingServiceCallback) throws android.os.RemoteException; - method public void stopStreaming(int, String) throws android.os.RemoteException; - } - - public class VendorUtils { - ctor public VendorUtils(); - method public static android.content.ComponentName getAppReceiverFromPackageName(android.content.Context, String); - field public static final String ACTION_CLEANUP = "android.telephony.mbms.action.CLEANUP"; - field public static final String ACTION_DOWNLOAD_RESULT_INTERNAL = "android.telephony.mbms.action.DOWNLOAD_RESULT_INTERNAL"; - field public static final String ACTION_FILE_DESCRIPTOR_REQUEST = "android.telephony.mbms.action.FILE_DESCRIPTOR_REQUEST"; - field public static final String EXTRA_FD_COUNT = "android.telephony.mbms.extra.FD_COUNT"; - field public static final String EXTRA_FINAL_URI = "android.telephony.mbms.extra.FINAL_URI"; - field public static final String EXTRA_FREE_URI_LIST = "android.telephony.mbms.extra.FREE_URI_LIST"; - field public static final String EXTRA_PAUSED_LIST = "android.telephony.mbms.extra.PAUSED_LIST"; - field public static final String EXTRA_PAUSED_URI_LIST = "android.telephony.mbms.extra.PAUSED_URI_LIST"; - field public static final String EXTRA_SERVICE_ID = "android.telephony.mbms.extra.SERVICE_ID"; - field public static final String EXTRA_TEMP_FILES_IN_USE = "android.telephony.mbms.extra.TEMP_FILES_IN_USE"; - field public static final String EXTRA_TEMP_FILE_ROOT = "android.telephony.mbms.extra.TEMP_FILE_ROOT"; - field public static final String EXTRA_TEMP_LIST = "android.telephony.mbms.extra.TEMP_LIST"; - } - } package android.text { @@ -5396,10 +2058,7 @@ package android.view.accessibility { public final class AccessibilityManager { method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, @Nullable android.os.Handler); method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public java.util.List getAccessibilityShortcutTargets(int); - method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void performAccessibilityShortcut(); - method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void registerSystemAction(@NonNull android.app.RemoteAction, int); method public void removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener); - method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void unregisterSystemAction(int); } public static interface AccessibilityManager.AccessibilityServicesStateChangeListener { @@ -5445,7 +2104,6 @@ package android.view.autofill { } public final class AutofillManager { - method public void setAugmentedAutofillWhitelist(@Nullable java.util.Set, @Nullable java.util.Set); field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes"; field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0 field public static final int FLAG_SMART_SUGGESTION_SYSTEM = 1; // 0x1 @@ -5456,42 +2114,7 @@ package android.view.autofill { package android.view.contentcapture { - public final class ContentCaptureContext implements android.os.Parcelable { - method @Nullable public android.content.ComponentName getActivityComponent(); - method public int getDisplayId(); - method public int getFlags(); - method @Nullable public android.view.contentcapture.ContentCaptureSessionId getParentSessionId(); - method public int getTaskId(); - field public static final int FLAG_DISABLED_BY_APP = 1; // 0x1 - field public static final int FLAG_DISABLED_BY_FLAG_SECURE = 2; // 0x2 - field public static final int FLAG_RECONNECTED = 4; // 0x4 - } - - public final class ContentCaptureEvent implements android.os.Parcelable { - method public int describeContents(); - method @Nullable public android.view.contentcapture.ContentCaptureContext getContentCaptureContext(); - method public long getEventTime(); - method @Nullable public android.view.autofill.AutofillId getId(); - method @Nullable public java.util.List getIds(); - method @Nullable public android.graphics.Insets getInsets(); - method @Nullable public CharSequence getText(); - method public int getType(); - method @Nullable public android.view.contentcapture.ViewNode getViewNode(); - method public void writeToParcel(android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; - field public static final int TYPE_CONTEXT_UPDATED = 6; // 0x6 - field public static final int TYPE_SESSION_PAUSED = 8; // 0x8 - field public static final int TYPE_SESSION_RESUMED = 7; // 0x7 - field public static final int TYPE_VIEW_APPEARED = 1; // 0x1 - field public static final int TYPE_VIEW_DISAPPEARED = 2; // 0x2 - field public static final int TYPE_VIEW_INSETS_CHANGED = 9; // 0x9 - field public static final int TYPE_VIEW_TEXT_CHANGED = 3; // 0x3 - field public static final int TYPE_VIEW_TREE_APPEARED = 5; // 0x5 - field public static final int TYPE_VIEW_TREE_APPEARING = 4; // 0x4 - } - public final class ContentCaptureManager { - method public boolean isContentCaptureFeatureEnabled(); field public static final String DEVICE_CONFIG_PROPERTY_IDLE_FLUSH_FREQUENCY = "idle_flush_frequency"; field public static final String DEVICE_CONFIG_PROPERTY_LOGGING_LEVEL = "logging_level"; field public static final String DEVICE_CONFIG_PROPERTY_LOG_HISTORY_SIZE = "log_history_size"; @@ -5504,7 +2127,6 @@ package android.view.contentcapture { } public final class ViewNode extends android.app.assist.AssistStructure.ViewNode { - method @Nullable public android.view.autofill.AutofillId getParentAutofillId(); method @Nullable public static android.view.contentcapture.ViewNode readFromParcel(@NonNull android.os.Parcel); method public static void writeToParcel(@NonNull android.os.Parcel, @Nullable android.view.contentcapture.ViewNode, int); } diff --git a/api/test-removed.txt b/api/test-removed.txt index e47f6edfbff1..d802177e249b 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -1,10 +1 @@ // Signature format: 2.0 -package android.app.prediction { - - public static final class AppTarget.Builder { - method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle); - method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo); - } - -} - diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index cb98093a1a24..250f2f0b2dc9 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -3608,7 +3608,7 @@ public class ActivityManager { * running its code, {@link RunningAppProcessInfo#IMPORTANCE_GONE} is returned. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public @RunningAppProcessInfo.Importance int getPackageImportance(String packageName) { try { @@ -3628,7 +3628,7 @@ public class ActivityManager { * running its code, {@link RunningAppProcessInfo#IMPORTANCE_GONE} is returned. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public @RunningAppProcessInfo.Importance int getUidImportance(int uid) { try { @@ -3645,7 +3645,7 @@ public class ActivityManager { * {@link #addOnUidImportanceListener}. * @hide */ - @SystemApi @TestApi + @SystemApi public interface OnUidImportanceListener { /** * The importance if a given uid has changed. Will be one of the importance @@ -3676,7 +3676,7 @@ public class ActivityManager { * {@link android.Manifest.permission#PACKAGE_USAGE_STATS}. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(OnUidImportanceListener listener, @RunningAppProcessInfo.Importance int importanceCutpoint) { @@ -3705,7 +3705,7 @@ public class ActivityManager { * @throws IllegalArgumentException If the listener is not registered. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(OnUidImportanceListener listener) { synchronized (this) { @@ -3847,7 +3847,7 @@ public class ActivityManager { * @see #forceStopPackageAsUser(String, int) * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String packageName) { forceStopPackageAsUser(packageName, mContext.getUserId()); @@ -4186,7 +4186,6 @@ public class ActivityManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull UserHandle user) { if (user == null) { @@ -4619,7 +4618,7 @@ public class ActivityManager { * * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[] pids, @NonNull String reason) { try { diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index c5bc3564ceab..f3b37891876d 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -461,7 +461,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_PERSISTENT = 100; @@ -470,7 +469,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_TOP = 200; @@ -482,7 +480,6 @@ public class AppOpsManager { * @hide * @deprecated */ - @TestApi @SystemApi @Deprecated public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; @@ -492,7 +489,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_FOREGROUND_SERVICE = 400; @@ -501,7 +497,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_FOREGROUND = 500; @@ -517,7 +512,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_BACKGROUND = 600; @@ -526,7 +520,6 @@ public class AppOpsManager { * state the more important the UID is for the user. * @hide */ - @TestApi @SystemApi public static final int UID_STATE_CACHED = 700; @@ -604,7 +597,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAG_SELF = 0x1; @@ -615,7 +607,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAG_TRUSTED_PROXY = 0x2; @@ -626,7 +617,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAG_UNTRUSTED_PROXY = 0x4; @@ -637,7 +627,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAG_TRUSTED_PROXIED = 0x8; @@ -648,7 +637,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAG_UNTRUSTED_PROXIED = 0x10; @@ -660,7 +648,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final int OP_FLAGS_ALL = OP_FLAG_SELF @@ -1185,7 +1172,7 @@ public class AppOpsManager { public static final String OPSTR_GET_USAGE_STATS = "android:get_usage_stats"; /** Activate a VPN connection without user intervention. @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn"; /** Allows an application to read the user's contacts data. */ @@ -1267,7 +1254,7 @@ public class AppOpsManager { public static final String OPSTR_WRITE_SETTINGS = "android:write_settings"; /** @hide Get device accounts. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_GET_ACCOUNTS = "android:get_accounts"; public static final String OPSTR_READ_PHONE_NUMBERS @@ -1276,7 +1263,7 @@ public class AppOpsManager { public static final String OPSTR_PICTURE_IN_PICTURE = "android:picture_in_picture"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_INSTANT_APP_START_FOREGROUND = "android:instant_app_start_foreground"; /** Answer incoming phone calls */ @@ -1286,129 +1273,129 @@ public class AppOpsManager { * Accept call handover * @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_GPS = "android:gps"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_VIBRATE = "android:vibrate"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WIFI_SCAN = "android:wifi_scan"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_POST_NOTIFICATION = "android:post_notification"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_SMS = "android:write_sms"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_RECEIVE_EMERGENCY_BROADCAST = "android:receive_emergency_broadcast"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_READ_ICC_SMS = "android:read_icc_sms"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_ICC_SMS = "android:write_icc_sms"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_PLAY_AUDIO = "android:play_audio"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_READ_CLIPBOARD = "android:read_clipboard"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_CLIPBOARD = "android:write_clipboard"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_TAKE_MEDIA_BUTTONS = "android:take_media_buttons"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_TAKE_AUDIO_FOCUS = "android:take_audio_focus"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_MASTER_VOLUME = "android:audio_master_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_VOICE_VOLUME = "android:audio_voice_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_RING_VOLUME = "android:audio_ring_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_MEDIA_VOLUME = "android:audio_media_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_ALARM_VOLUME = "android:audio_alarm_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_NOTIFICATION_VOLUME = "android:audio_notification_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_BLUETOOTH_VOLUME = "android:audio_bluetooth_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WAKE_LOCK = "android:wake_lock"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_TOAST_WINDOW = "android:toast_window"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_PROJECT_MEDIA = "android:project_media"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_TURN_SCREEN_ON = "android:turn_screen_on"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_RUN_IN_BACKGROUND = "android:run_in_background"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_AUDIO_ACCESSIBILITY_VOLUME = "android:audio_accessibility_volume"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_REQUEST_INSTALL_PACKAGES = "android:request_install_packages"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_RUN_ANY_IN_BACKGROUND = "android:run_any_in_background"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_CHANGE_WIFI_STATE = "android:change_wifi_state"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_REQUEST_DELETE_PACKAGES = "android:request_delete_packages"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_BIND_ACCESSIBILITY_SERVICE = "android:bind_accessibility_service"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels"; /** @hide */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_START_FOREGROUND = "android:start_foreground"; /** @hide */ public static final String OPSTR_BLUETOOTH_SCAN = "android:bluetooth_scan"; @@ -1424,25 +1411,25 @@ public class AppOpsManager { "android:sms_financial_transactions"; /** @hide Read media of audio type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_READ_MEDIA_AUDIO = "android:read_media_audio"; /** @hide Write media of audio type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_MEDIA_AUDIO = "android:write_media_audio"; /** @hide Read media of video type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_READ_MEDIA_VIDEO = "android:read_media_video"; /** @hide Write media of video type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_MEDIA_VIDEO = "android:write_media_video"; /** @hide Read media of image type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_READ_MEDIA_IMAGES = "android:read_media_images"; /** @hide Write media of image type. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images"; /** @hide Has a legacy (non-isolated) view of storage. */ - @SystemApi @TestApi + @SystemApi public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage"; /** @hide Read location metadata from media */ public static final String OPSTR_ACCESS_MEDIA_LOCATION = "android:access_media_location"; @@ -1456,7 +1443,6 @@ public class AppOpsManager { public static final String OPSTR_QUERY_ALL_PACKAGES = "android:query_all_packages"; /** @hide Access all external storage */ @SystemApi - @TestApi public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage"; @@ -2683,7 +2669,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static int opToDefaultMode(@NonNull String appOp) { return opToDefaultMode(strOpToOp(appOp)); @@ -2775,7 +2760,6 @@ public class AppOpsManager { * Class holding all of the operation information associated with an app. * @hide */ - @TestApi @SystemApi public static final class PackageOps implements Parcelable { private final String mPackageName; @@ -2854,7 +2838,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi // @DataClass(genHiddenConstructor = true, genHiddenCopyConstructor = true) // genHiddenCopyConstructor does not work for @hide @SystemApi classes @@ -3222,7 +3205,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi @Immutable // @DataClass(genHiddenConstructor = true) codegen verifier is broken @@ -3796,7 +3778,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @Immutable @SystemApi // @DataClass(genHiddenConstructor = true) codegen verifier is broken @@ -4474,7 +4455,6 @@ public class AppOpsManager { * @hide */ @Immutable - @TestApi @SystemApi public static final class HistoricalOpsRequest { private final int mUid; @@ -4505,7 +4485,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final class Builder { private int mUid = Process.INVALID_UID; @@ -4643,7 +4622,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final class HistoricalOps implements Parcelable { private long mBeginTimeMillis; @@ -5079,7 +5057,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final class HistoricalUidOps implements Parcelable { private final int mUid; @@ -5333,7 +5310,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final class HistoricalPackageOps implements Parcelable { private final @NonNull String mPackageName; @@ -5664,7 +5640,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi /* codegen verifier cannot deal with nested class parameters @DataClass(genHiddenConstructor = true, @@ -5975,7 +5950,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi public static final class HistoricalOp implements Parcelable { private final int mOp; @@ -6612,7 +6586,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public @NonNull List getOpsForPackage(int uid, @@ -6647,7 +6620,6 @@ public class AppOpsManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(@NonNull HistoricalOpsRequest request, @@ -6756,7 +6728,6 @@ public class AppOpsManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES) public void setUidMode(@NonNull String appOp, int uid, @Mode int mode) { try { @@ -6810,7 +6781,6 @@ public class AppOpsManager { * be changed. * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES) public void setMode(@NonNull String op, int uid, @Nullable String packageName, @@ -8773,7 +8743,6 @@ public class AppOpsManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.GET_APP_OPS_STATS) public @Nullable RuntimeAppOpAccessMessage collectRuntimeAppOpAccessMessage() { try { @@ -8788,7 +8757,6 @@ public class AppOpsManager { * @hide */ @SystemApi - @TestApi public static String[] getOpStrs() { return Arrays.copyOf(sOpToString, sOpToString.length); } diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java index 1bfdaf57e7f4..f0e457e9691a 100644 --- a/core/java/android/app/NotificationChannel.java +++ b/core/java/android/app/NotificationChannel.java @@ -134,7 +134,6 @@ public final class NotificationChannel implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int USER_LOCKED_SOUND = 0x00000020; /** @@ -391,7 +390,6 @@ public final class NotificationChannel implements Parcelable { * @hide */ @SystemApi - @TestApi public void setBlockable(boolean blockable) { mBlockableSystem = blockable; } diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index aefaf781eb35..f3bd04cd132e 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1430,7 +1430,6 @@ public class NotificationManager { * @hide */ @SystemApi - @TestApi public boolean isNotificationAssistantAccessGranted(@NonNull ComponentName assistant) { INotificationManager service = getService(); try { @@ -1466,7 +1465,6 @@ public class NotificationManager { * @hide */ @SystemApi - @TestApi public @NonNull @Adjustment.Keys List getAllowedAssistantAdjustments() { INotificationManager service = getService(); try { @@ -1577,7 +1575,6 @@ public class NotificationManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted( @NonNull ComponentName listener, boolean granted) { @@ -1611,7 +1608,6 @@ public class NotificationManager { * @hide */ @SystemApi - @TestApi public void setNotificationAssistantAccessGranted(@Nullable ComponentName assistant, boolean granted) { INotificationManager service = getService(); @@ -1631,7 +1627,6 @@ public class NotificationManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public @NonNull List getEnabledNotificationListeners() { return getEnabledNotificationListeners(mContext.getUserId()); @@ -1649,7 +1644,6 @@ public class NotificationManager { /** @hide */ @SystemApi - @TestApi public @Nullable ComponentName getAllowedNotificationAssistant() { INotificationManager service = getService(); try { diff --git a/core/java/android/app/RuntimeAppOpAccessMessage.java b/core/java/android/app/RuntimeAppOpAccessMessage.java index a19f815c4298..db3ba4a8cc3f 100644 --- a/core/java/android/app/RuntimeAppOpAccessMessage.java +++ b/core/java/android/app/RuntimeAppOpAccessMessage.java @@ -20,7 +20,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +31,6 @@ import com.android.internal.util.DataClass; * @hide */ @Immutable -@TestApi @SystemApi /*@DataClass(genConstructor = false) @DataClass.Suppress("getOpCode")*/ diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 99d21272236d..864db2722d53 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -374,7 +374,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean disabled) { try { @@ -423,7 +422,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.STATUS_BAR) @NonNull public DisableInfo getDisableInfo() { @@ -456,7 +454,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public static final class DisableInfo { private boolean mStatusBarExpansion; @@ -489,7 +486,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean isStatusBarExpansionDisabled() { return mStatusBarExpansion; } @@ -505,7 +501,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean isNavigateToHomeDisabled() { return mNavigateHome; } @@ -521,7 +516,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean isNotificationPeekingDisabled() { return mNotificationPeeking; } @@ -537,7 +531,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean isRecentsDisabled() { return mRecents; } @@ -553,7 +546,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean isSearchDisabled() { return mSearch; } @@ -611,7 +603,6 @@ public class StatusBarManager { * @hide */ @SystemApi - @TestApi public boolean areAllComponentsEnabled() { return !mStatusBarExpansion && !mNavigateHome && !mNotificationPeeking && !mRecents && !mSearch && !mSystemIcons && !mClock && !mNotificationIcons; diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 06d1b74abc86..e2fc5dbf10e2 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -314,7 +314,6 @@ public class UiModeManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.ENTER_CAR_MODE_PRIORITIZED) public void enableCarMode(@IntRange(from = 0) int priority, @EnableCarMode int flags) { if (mService != null) { diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 0a80ccc13487..54f3209e17be 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1766,7 +1766,6 @@ public class WallpaperManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(ComponentName name) { diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b74e18b099ce..ad902a028f13 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1465,7 +1465,7 @@ public class DevicePolicyManager { * @see #createAdminSupportIntent(String) * @hide */ - @TestApi @SystemApi + @SystemApi public static final String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION"; /** @@ -2688,13 +2688,11 @@ public class DevicePolicyManager { * */ @SystemApi - @TestApi public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED"; /** @hide See {@link #ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED} */ @SystemApi - @TestApi public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED"; @@ -6671,7 +6669,6 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @TestApi @SuppressLint("Doclava125") public boolean isDeviceManaged() { try { @@ -10381,7 +10378,6 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @TestApi @SuppressLint("Doclava125") public @Nullable CharSequence getDeviceOwnerOrganizationName() { try { diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index b5234f8e2e17..c15504cc0843 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -3,7 +3,6 @@ package android.app.assist; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Activity; import android.content.ComponentName; import android.content.Context; @@ -722,7 +721,6 @@ public class AssistStructure implements Parcelable { // COntent Capture. /** @hide */ @SystemApi - @TestApi public ViewNode() { } diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java index 9b67587c4dcd..05313592faa5 100644 --- a/core/java/android/app/backup/BackupManager.java +++ b/core/java/android/app/backup/BackupManager.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -919,7 +918,6 @@ public class BackupManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.BACKUP) public Intent getConfigurationIntent(String transportName) { checkServiceBinder(); @@ -941,7 +939,6 @@ public class BackupManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.BACKUP) public String getDestinationString(String transportName) { checkServiceBinder(); @@ -963,7 +960,6 @@ public class BackupManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.BACKUP) public Intent getDataManagementIntent(String transportName) { checkServiceBinder(); @@ -989,7 +985,6 @@ public class BackupManager { */ @Deprecated @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.BACKUP) @Nullable public String getDataManagementLabel(@NonNull String transportName) { @@ -1006,7 +1001,6 @@ public class BackupManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.BACKUP) @Nullable public CharSequence getDataManagementIntentLabel(@NonNull String transportName) { diff --git a/core/java/android/app/prediction/AppPredictionContext.java b/core/java/android/app/prediction/AppPredictionContext.java index d14238bb2672..99fa869cee93 100644 --- a/core/java/android/app/prediction/AppPredictionContext.java +++ b/core/java/android/app/prediction/AppPredictionContext.java @@ -19,7 +19,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Context; import android.os.Bundle; import android.os.Parcel; @@ -32,7 +31,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class AppPredictionContext implements Parcelable { private final int mPredictedTargetCount; @@ -129,7 +127,6 @@ public final class AppPredictionContext implements Parcelable { * @hide */ @SystemApi - @TestApi public static final class Builder { @NonNull @@ -147,7 +144,6 @@ public final class AppPredictionContext implements Parcelable { * @hide */ @SystemApi - @TestApi public Builder(@NonNull Context context) { mPackageName = context.getPackageName(); } diff --git a/core/java/android/app/prediction/AppPredictionManager.java b/core/java/android/app/prediction/AppPredictionManager.java index ca22721622b7..5da7aa97ea0f 100644 --- a/core/java/android/app/prediction/AppPredictionManager.java +++ b/core/java/android/app/prediction/AppPredictionManager.java @@ -17,7 +17,6 @@ package android.app.prediction; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Context; import java.util.Objects; @@ -28,7 +27,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class AppPredictionManager { private final Context mContext; diff --git a/core/java/android/app/prediction/AppPredictionSessionId.java b/core/java/android/app/prediction/AppPredictionSessionId.java index 876bafdfb7d1..6277a7de258f 100644 --- a/core/java/android/app/prediction/AppPredictionSessionId.java +++ b/core/java/android/app/prediction/AppPredictionSessionId.java @@ -18,7 +18,6 @@ package android.app.prediction; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -30,7 +29,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class AppPredictionSessionId implements Parcelable { private final String mId; diff --git a/core/java/android/app/prediction/AppPredictor.java b/core/java/android/app/prediction/AppPredictor.java index fa135b10ae1f..fd1b9e3bede2 100644 --- a/core/java/android/app/prediction/AppPredictor.java +++ b/core/java/android/app/prediction/AppPredictor.java @@ -70,7 +70,6 @@ import java.util.function.Consumer; * @hide */ @SystemApi -@TestApi public final class AppPredictor { private static final String TAG = AppPredictor.class.getSimpleName(); diff --git a/core/java/android/app/prediction/AppTarget.java b/core/java/android/app/prediction/AppTarget.java index 14e32b8397a8..fef9e7020097 100644 --- a/core/java/android/app/prediction/AppTarget.java +++ b/core/java/android/app/prediction/AppTarget.java @@ -19,7 +19,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.pm.ShortcutInfo; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class AppTarget implements Parcelable { private final AppTargetId mId; @@ -190,7 +188,6 @@ public final class AppTarget implements Parcelable { * @hide */ @SystemApi - @TestApi public static final class Builder { @NonNull @@ -221,7 +218,6 @@ public final class AppTarget implements Parcelable { * @hide */ @SystemApi - @TestApi public Builder(@NonNull AppTargetId id, @NonNull String packageName, @NonNull UserHandle user) { mId = Objects.requireNonNull(id); @@ -235,7 +231,6 @@ public final class AppTarget implements Parcelable { * @hide */ @SystemApi - @TestApi public Builder(@NonNull AppTargetId id, @NonNull ShortcutInfo info) { mId = Objects.requireNonNull(id); mShortcutInfo = Objects.requireNonNull(info); diff --git a/core/java/android/app/prediction/AppTargetEvent.java b/core/java/android/app/prediction/AppTargetEvent.java index f519145c4aa8..963e750e4fd1 100644 --- a/core/java/android/app/prediction/AppTargetEvent.java +++ b/core/java/android/app/prediction/AppTargetEvent.java @@ -19,7 +19,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +31,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class AppTargetEvent implements Parcelable { /** @@ -141,7 +139,6 @@ public final class AppTargetEvent implements Parcelable { * @hide */ @SystemApi - @TestApi public static final class Builder { private AppTarget mTarget; private String mLocation; diff --git a/core/java/android/app/prediction/AppTargetId.java b/core/java/android/app/prediction/AppTargetId.java index 052fdc11ef21..048e12c5c48e 100644 --- a/core/java/android/app/prediction/AppTargetId.java +++ b/core/java/android/app/prediction/AppTargetId.java @@ -18,7 +18,6 @@ package android.app.prediction; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -28,7 +27,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class AppTargetId implements Parcelable { @NonNull @@ -40,7 +38,6 @@ public final class AppTargetId implements Parcelable { * @hide */ @SystemApi - @TestApi public AppTargetId(@NonNull String id) { mId = id; } diff --git a/core/java/android/app/role/OnRoleHoldersChangedListener.java b/core/java/android/app/role/OnRoleHoldersChangedListener.java index d6f76794da20..5958debc86dd 100644 --- a/core/java/android/app/role/OnRoleHoldersChangedListener.java +++ b/core/java/android/app/role/OnRoleHoldersChangedListener.java @@ -18,7 +18,6 @@ package android.app.role; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.UserHandle; /** @@ -27,7 +26,6 @@ import android.os.UserHandle; * @hide */ @SystemApi -@TestApi public interface OnRoleHoldersChangedListener { /** diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index 82159235ae28..408ce0f2ab1a 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -144,7 +144,6 @@ public final class RoleManager { * @hide */ @SystemApi - @TestApi public static final int MANAGE_HOLDERS_FLAG_DONT_KILL_APP = 1; /** @@ -255,7 +254,6 @@ public final class RoleManager { @NonNull @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi - @TestApi public List getRoleHolders(@NonNull String roleName) { return getRoleHoldersAsUser(roleName, Process.myUserHandle()); } @@ -281,7 +279,6 @@ public final class RoleManager { @NonNull @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi - @TestApi public List getRoleHoldersAsUser(@NonNull String roleName, @NonNull UserHandle user) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Objects.requireNonNull(user, "user cannot be null"); @@ -315,7 +312,6 @@ public final class RoleManager { */ @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi - @TestApi public void addRoleHolderAsUser(@NonNull String roleName, @NonNull String packageName, @ManageHoldersFlags int flags, @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor, @NonNull Consumer callback) { @@ -354,7 +350,6 @@ public final class RoleManager { */ @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi - @TestApi public void removeRoleHolderAsUser(@NonNull String roleName, @NonNull String packageName, @ManageHoldersFlags int flags, @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor, @NonNull Consumer callback) { @@ -392,7 +387,6 @@ public final class RoleManager { */ @RequiresPermission(Manifest.permission.MANAGE_ROLE_HOLDERS) @SystemApi - @TestApi public void clearRoleHoldersAsUser(@NonNull String roleName, @ManageHoldersFlags int flags, @NonNull UserHandle user, @CallbackExecutor @NonNull Executor executor, @NonNull Consumer callback) { @@ -439,7 +433,6 @@ public final class RoleManager { */ @RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS) @SystemApi - @TestApi public void addOnRoleHoldersChangedListenerAsUser(@CallbackExecutor @NonNull Executor executor, @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) { Objects.requireNonNull(executor, "executor cannot be null"); @@ -485,7 +478,6 @@ public final class RoleManager { */ @RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS) @SystemApi - @TestApi public void removeOnRoleHoldersChangedListenerAsUser( @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) { Objects.requireNonNull(listener, "listener cannot be null"); @@ -527,7 +519,6 @@ public final class RoleManager { */ @RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER) @SystemApi - @TestApi public void setRoleNamesFromController(@NonNull List roleNames) { Objects.requireNonNull(roleNames, "roleNames cannot be null"); try { @@ -558,7 +549,6 @@ public final class RoleManager { */ @RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER) @SystemApi - @TestApi public boolean addRoleHolderFromController(@NonNull String roleName, @NonNull String packageName) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); @@ -591,7 +581,6 @@ public final class RoleManager { */ @RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER) @SystemApi - @TestApi public boolean removeRoleHolderFromController(@NonNull String roleName, @NonNull String packageName) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); @@ -614,7 +603,6 @@ public final class RoleManager { @NonNull @RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER) @SystemApi - @TestApi public List getHeldRolesFromController(@NonNull String packageName) { Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty"); try { diff --git a/core/java/android/app/usage/CacheQuotaHint.java b/core/java/android/app/usage/CacheQuotaHint.java index d5c72f286a32..0ccb058d11cf 100644 --- a/core/java/android/app/usage/CacheQuotaHint.java +++ b/core/java/android/app/usage/CacheQuotaHint.java @@ -19,7 +19,6 @@ package android.app.usage; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,6 @@ import java.util.Objects; * allows apps to understand how much cache to use. * {@hide} */ -@TestApi @SystemApi public final class CacheQuotaHint implements Parcelable { public static final long QUOTA_NOT_SET = -1; diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index e94556b8d97b..c3c270e52eb6 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.app.Activity; import android.app.Application; import android.app.PendingIntent; @@ -285,7 +284,6 @@ public final class CompanionDeviceManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES) public boolean isDeviceAssociatedForWifiConnection( @NonNull String packageName, diff --git a/core/java/android/content/ApexEnvironment.java b/core/java/android/content/ApexEnvironment.java index 9f15a425d92b..b4cc3c2bb156 100644 --- a/core/java/android/content/ApexEnvironment.java +++ b/core/java/android/content/ApexEnvironment.java @@ -18,7 +18,6 @@ package android.content; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Environment; import android.os.UserHandle; @@ -31,7 +30,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public class ApexEnvironment { private static final String APEX_DATA = "apexdata"; diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java index d0f5ec467458..5af7861e1a20 100644 --- a/core/java/android/content/ContentProviderClient.java +++ b/core/java/android/content/ContentProviderClient.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetFileDescriptor; import android.database.CrossProcessCursorWrapper; @@ -123,7 +122,6 @@ public class ContentProviderClient implements ContentInterface, AutoCloseable { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.REMOVE_TASKS) public void setDetectNotResponding(@DurationMillisLong long timeoutMillis) { synchronized (ContentProviderClient.class) { diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index c39f176ac0d1..fd7074c29891 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -4098,7 +4098,6 @@ public abstract class ContentResolver implements ContentInterface { * @hide */ @SystemApi - @TestApi // We can't accept an already-opened FD here, since these methods are // rewriting actual filesystem paths @SuppressLint("StreamFiles") @@ -4118,7 +4117,6 @@ public abstract class ContentResolver implements ContentInterface { * @hide */ @SystemApi - @TestApi // We can't accept an already-opened FD here, since these methods are // rewriting actual filesystem paths @SuppressLint("StreamFiles") diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index bbc1406fb7ea..42fe0e1c465d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1849,7 +1849,6 @@ public abstract class Context { */ @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi - @TestApi public void startActivityAsUser(@RequiresPermission @NonNull Intent intent, @NonNull UserHandle user) { throw new RuntimeException("Not implemented. Must override in a subclass."); @@ -3982,7 +3981,6 @@ public abstract class Context { * @hide */ @SystemApi - @TestApi @SuppressLint("ServiceName") public static final String STATUS_BAR_SERVICE = "statusbar"; @@ -4194,7 +4192,6 @@ public abstract class Context { * @hide */ @SystemApi - @TestApi public static final String ETHERNET_SERVICE = "ethernet"; /** @@ -4517,7 +4514,6 @@ public abstract class Context { * @see #getSystemService(String) * @hide */ - @TestApi @SystemApi public static final String PERMISSION_SERVICE = "permission"; @@ -4548,7 +4544,7 @@ public abstract class Context { * @see #getSystemService(String) * @hide */ - @SystemApi @TestApi + @SystemApi public static final String ROLLBACK_SERVICE = "rollback"; /** @@ -5022,7 +5018,7 @@ public abstract class Context { * @see android.os.BugreportManager * @hide */ - @SystemApi @TestApi + @SystemApi public static final String BUGREPORT_SERVICE = "bugreport"; /** @@ -5184,7 +5180,6 @@ public abstract class Context { * @hide */ @SystemApi - @TestApi public static final String APP_INTEGRITY_SERVICE = "app_integrity"; /** @@ -5756,7 +5751,6 @@ public abstract class Context { * @hide */ @SystemApi - @TestApi @NonNull public Context createPackageContextAsUser( @NonNull String packageName, @CreatePackageOptions int flags, @NonNull UserHandle user) @@ -5775,7 +5769,6 @@ public abstract class Context { * @hide */ @SystemApi - @TestApi @NonNull public Context createContextAsUser(@NonNull UserHandle user, @CreatePackageOptions int flags) { if (Build.IS_ENG) { diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 653064d41bff..c62194b380dd 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -28,7 +28,6 @@ import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressLint; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.AppGlobals; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; @@ -1748,7 +1747,6 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SystemApi - @TestApi public static final String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID"; @@ -1979,7 +1977,6 @@ public class Intent implements Parcelable, Cloneable { @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SystemApi - @TestApi public static final String ACTION_MANAGE_DEFAULT_APP = "android.intent.action.MANAGE_DEFAULT_APP"; @@ -1994,7 +1991,6 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SystemApi - @TestApi public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME"; /** @@ -2541,7 +2537,7 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ - @SystemApi @TestApi + @SystemApi @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ROLLBACK_COMMITTED = "android.intent.action.ROLLBACK_COMMITTED"; diff --git a/core/java/android/content/integrity/AppIntegrityManager.java b/core/java/android/content/integrity/AppIntegrityManager.java index 4db4c7316433..1196064768e8 100644 --- a/core/java/android/content/integrity/AppIntegrityManager.java +++ b/core/java/android/content/integrity/AppIntegrityManager.java @@ -36,7 +36,6 @@ import java.util.List; * * @hide */ -@TestApi @SystemApi @SystemService(Context.APP_INTEGRITY_SERVICE) public class AppIntegrityManager { diff --git a/core/java/android/content/integrity/IntegrityFormula.java b/core/java/android/content/integrity/IntegrityFormula.java index fc177721240c..d965ef5c71a8 100644 --- a/core/java/android/content/integrity/IntegrityFormula.java +++ b/core/java/android/content/integrity/IntegrityFormula.java @@ -19,7 +19,6 @@ package android.content.integrity; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.integrity.AtomicFormula.BooleanAtomicFormula; import android.content.integrity.AtomicFormula.LongAtomicFormula; import android.content.integrity.AtomicFormula.StringAtomicFormula; @@ -38,7 +37,6 @@ import java.util.Arrays; * @hide */ @SystemApi -@TestApi @VisibleForTesting public abstract class IntegrityFormula { diff --git a/core/java/android/content/integrity/Rule.java b/core/java/android/content/integrity/Rule.java index 8f6d73f6f028..391d1d04d553 100644 --- a/core/java/android/content/integrity/Rule.java +++ b/core/java/android/content/integrity/Rule.java @@ -22,7 +22,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +38,6 @@ import java.util.Objects; * * @hide */ -@TestApi @SystemApi @VisibleForTesting public final class Rule implements Parcelable { diff --git a/core/java/android/content/integrity/RuleSet.java b/core/java/android/content/integrity/RuleSet.java index e121ff8bbcaa..b423b54a7d92 100644 --- a/core/java/android/content/integrity/RuleSet.java +++ b/core/java/android/content/integrity/RuleSet.java @@ -18,7 +18,6 @@ package android.content.integrity; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import java.util.ArrayList; import java.util.Collections; @@ -30,7 +29,6 @@ import java.util.Objects; * * @hide */ -@TestApi @SystemApi public class RuleSet { private final String mVersion; diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index d5f2c12e8462..8f4fc261df37 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -1141,7 +1141,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public int targetSandboxVersion; /** diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index f03425b9e117..e2f85282948a 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1722,7 +1722,6 @@ public class PackageInstaller { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS) public void setGrantedRuntimePermissions(String[] permissions) { @@ -1794,7 +1793,7 @@ public class PackageInstaller { * @see SessionParams#setEnableRollback(boolean, int) * @hide */ - @SystemApi @TestApi + @SystemApi public void setEnableRollback(boolean enable) { if (enable) { installFlags |= PackageManager.INSTALL_ENABLE_ROLLBACK; @@ -1818,7 +1817,7 @@ public class PackageInstaller { * @param dataPolicy the rollback data policy for this session * @hide */ - @SystemApi @TestApi + @SystemApi public void setEnableRollback(boolean enable, @PackageManager.RollbackDataPolicy int dataPolicy) { if (enable) { @@ -1841,7 +1840,7 @@ public class PackageInstaller { } /** {@hide} */ - @SystemApi @TestApi + @SystemApi public void setRequestDowngrade(boolean requestDowngrade) { if (requestDowngrade) { installFlags |= PackageManager.INSTALL_REQUEST_DOWNGRADE; @@ -1880,7 +1879,6 @@ public class PackageInstaller { /** {@hide} */ @SystemApi - @TestApi public void setInstallAsInstantApp(boolean isInstantApp) { if (isInstantApp) { installFlags |= PackageManager.INSTALL_INSTANT_APP; @@ -1965,7 +1963,7 @@ public class PackageInstaller { * * {@hide} */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.INSTALL_PACKAGES) public void setStaged() { this.isStaged = true; @@ -1976,7 +1974,7 @@ public class PackageInstaller { * * {@hide} */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.INSTALL_PACKAGES) public void setInstallAsApex() { installFlags |= PackageManager.INSTALL_APEX; @@ -2480,7 +2478,6 @@ public class PackageInstaller { * * @hide */ - @TestApi @SystemApi public @NonNull Set getWhitelistedRestrictedPermissions() { if ((installFlags & PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS) != 0) { @@ -2504,7 +2501,6 @@ public class PackageInstaller { * * @hide */ - @TestApi @SystemApi public int getAutoRevokePermissionsMode() { return autoRevokePermissionsMode; @@ -2633,7 +2629,7 @@ public class PackageInstaller { * * @hide */ - @SystemApi @TestApi + @SystemApi @PackageManager.RollbackDataPolicy public int getRollbackDataPolicy() { return rollbackDataPolicy; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 923f8cb38d38..fc7b3e011cad 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -120,7 +120,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public interface OnPermissionsChangedListener { /** @@ -479,7 +478,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int MATCH_FACTORY_ONLY = 0x00200000; /** @@ -611,7 +609,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int MODULE_APEX_NAME = 0x00000001; /** @hide */ @@ -3319,7 +3316,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_USER_SET = 1 << 0; /** @@ -3330,7 +3326,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_USER_FIXED = 1 << 1; /** @@ -3341,7 +3336,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_POLICY_FIXED = 1 << 2; /** @@ -3358,7 +3352,6 @@ public abstract class PackageManager { */ @Deprecated @SystemApi - @TestApi public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 1 << 3; /** @@ -3368,7 +3361,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_SYSTEM_FIXED = 1 << 4; /** @@ -3380,7 +3372,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 1 << 5; /** @@ -3390,7 +3381,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 1 << 6; /** @@ -3428,7 +3418,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 1 << 11; @@ -3440,7 +3429,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 1 << 12; @@ -3453,7 +3441,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi public static final int FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT = 1 << 13; @@ -3466,7 +3453,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 1 << 14; @@ -3476,7 +3462,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 1 << 15; /** @@ -3488,7 +3473,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_REVOKED_COMPAT = FLAG_PERMISSION_REVOKE_ON_UPGRADE; /** @@ -3498,7 +3482,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi public static final int FLAG_PERMISSION_ONE_TIME = 1 << 16; /** @@ -3516,7 +3499,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi public static final int FLAG_PERMISSION_RESTRICTION_ROLE_EXEMPT = 1 << 18; @@ -4083,7 +4065,7 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi + @SystemApi public abstract boolean arePermissionsIndividuallyControlled(); /** @@ -4334,7 +4316,6 @@ public abstract class PackageManager { * @hide */ @NonNull - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract List getInstalledPackagesAsUser(@PackageInfoFlags int flags, @@ -4495,7 +4476,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String packageName, @@ -4522,7 +4502,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String packageName, @@ -4550,7 +4529,6 @@ public abstract class PackageManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermission(@NonNull String packageName, @@ -4569,7 +4547,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(anyOf = { android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, @@ -4592,7 +4569,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(anyOf = { android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS @@ -6440,7 +6416,6 @@ public abstract class PackageManager { * @hide */ @Nullable - @TestApi @SystemApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract String getDefaultBrowserPackageNameAsUser(@UserIdInt int userId); @@ -7094,7 +7069,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS) public abstract void addOnPermissionsChangeListener( @NonNull OnPermissionsChangedListener listener); @@ -7107,7 +7081,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS) public abstract void removeOnPermissionsChangeListener( @NonNull OnPermissionsChangedListener listener); @@ -8126,7 +8099,6 @@ public abstract class PackageManager { * @hide */ @SystemApi - @TestApi @Nullable public String getIncidentReportApproverPackageName() { throw new UnsupportedOperationException( diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 5d4c843d2eab..e730fee7f812 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -160,7 +160,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_OEM = 0x4000; /** @@ -181,7 +180,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 0x10000; /** @@ -192,7 +190,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_WELLBEING = 0x20000; /** @@ -202,7 +199,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_DOCUMENTER = 0x40000; /** @@ -212,7 +208,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_CONFIGURATOR = 0x80000; /** @@ -223,7 +218,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 0x100000; /** @@ -234,7 +228,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_APP_PREDICTOR = 0x200000; /** @@ -245,7 +238,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_COMPANION = 0x800000; /** @@ -256,7 +248,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int PROTECTION_FLAG_RETAIL_DEMO = 0x1000000; /** @hide */ @@ -340,7 +331,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * value of {@link android.R.attr#permissionFlags}. * @hide */ - @TestApi @SystemApi public static final int FLAG_REMOVED = 1<<1; @@ -436,7 +426,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public final @Nullable String backgroundPermission; /** diff --git a/core/java/android/content/rollback/PackageRollbackInfo.java b/core/java/android/content/rollback/PackageRollbackInfo.java index 642a76b453c9..0140280cd3d5 100644 --- a/core/java/android/content/rollback/PackageRollbackInfo.java +++ b/core/java/android/content/rollback/PackageRollbackInfo.java @@ -18,7 +18,6 @@ package android.content.rollback; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.pm.PackageManager; import android.content.pm.VersionedPackage; import android.os.Parcel; @@ -32,7 +31,7 @@ import java.util.List; * * @hide */ -@SystemApi @TestApi +@SystemApi public final class PackageRollbackInfo implements Parcelable { private final VersionedPackage mVersionRolledBackFrom; diff --git a/core/java/android/content/rollback/RollbackInfo.java b/core/java/android/content/rollback/RollbackInfo.java index c09cfd54866c..a363718a8b1d 100644 --- a/core/java/android/content/rollback/RollbackInfo.java +++ b/core/java/android/content/rollback/RollbackInfo.java @@ -18,7 +18,6 @@ package android.content.rollback; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.pm.VersionedPackage; import android.os.Parcel; import android.os.Parcelable; @@ -31,7 +30,7 @@ import java.util.List; * * @hide */ -@SystemApi @TestApi +@SystemApi public final class RollbackInfo implements Parcelable { /** diff --git a/core/java/android/content/rollback/RollbackManager.java b/core/java/android/content/rollback/RollbackManager.java index 7ebeb212b64a..3636222f558c 100644 --- a/core/java/android/content/rollback/RollbackManager.java +++ b/core/java/android/content/rollback/RollbackManager.java @@ -24,7 +24,6 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.content.Context; import android.content.IntentSender; -import android.content.pm.PackageInstaller; import android.content.pm.ParceledListSlice; import android.content.pm.VersionedPackage; import android.os.RemoteException; @@ -43,7 +42,7 @@ import java.util.List; * @see PackageInstaller.SessionParams#setEnableRollback(boolean) * @hide */ -@SystemApi @TestApi +@SystemApi @SystemService(Context.ROLLBACK_SERVICE) public final class RollbackManager { private final String mCallerPackageName; diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index decf05396c1f..cd137078818c 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.hardware.camera2.params.InputConfiguration; import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.params.SessionConfiguration; @@ -358,7 +357,6 @@ public abstract class CameraDevice implements AutoCloseable { * @hide */ @SystemApi - @TestApi public static final int SESSION_OPERATION_MODE_NORMAL = 0; // ICameraDeviceUser.NORMAL_MODE; @@ -369,7 +367,6 @@ public abstract class CameraDevice implements AutoCloseable { * @hide */ @SystemApi - @TestApi public static final int SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED = 1; // ICameraDeviceUser.CONSTRAINED_HIGH_SPEED_MODE; @@ -380,7 +377,6 @@ public abstract class CameraDevice implements AutoCloseable { * @hide */ @SystemApi - @TestApi public static final int SESSION_OPERATION_MODE_VENDOR_START = 0x8000; // ICameraDeviceUser.VENDOR_MODE_START; @@ -423,7 +419,6 @@ public abstract class CameraDevice implements AutoCloseable { * @hide */ @SystemApi - @TestApi @Deprecated public abstract void createCustomCaptureSession( InputConfiguration inputConfig, diff --git a/core/java/android/hardware/display/AmbientBrightnessDayStats.java b/core/java/android/hardware/display/AmbientBrightnessDayStats.java index 26fd2654239f..8aff911ea42c 100644 --- a/core/java/android/hardware/display/AmbientBrightnessDayStats.java +++ b/core/java/android/hardware/display/AmbientBrightnessDayStats.java @@ -19,7 +19,6 @@ package android.hardware.display; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class AmbientBrightnessDayStats implements Parcelable { /** The localdate for which brightness stats are being tracked */ diff --git a/core/java/android/hardware/display/BrightnessChangeEvent.java b/core/java/android/hardware/display/BrightnessChangeEvent.java index a6a44bea816b..e2d836c59099 100644 --- a/core/java/android/hardware/display/BrightnessChangeEvent.java +++ b/core/java/android/hardware/display/BrightnessChangeEvent.java @@ -19,7 +19,6 @@ package android.hardware.display; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +31,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class BrightnessChangeEvent implements Parcelable { /** Brightness in nits */ public final float brightness; diff --git a/core/java/android/hardware/display/BrightnessConfiguration.java b/core/java/android/hardware/display/BrightnessConfiguration.java index 6412a0ce7219..d9c1063cd39d 100644 --- a/core/java/android/hardware/display/BrightnessConfiguration.java +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -20,7 +20,6 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.pm.ApplicationInfo; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +43,6 @@ import java.util.Objects; /** @hide */ @SystemApi -@TestApi public final class BrightnessConfiguration implements Parcelable { private static final String TAG_BRIGHTNESS_CURVE = "brightness-curve"; private static final String TAG_BRIGHTNESS_POINT = "brightness-point"; diff --git a/core/java/android/hardware/display/BrightnessCorrection.java b/core/java/android/hardware/display/BrightnessCorrection.java index 0879787077aa..bbfc45edb89a 100644 --- a/core/java/android/hardware/display/BrightnessCorrection.java +++ b/core/java/android/hardware/display/BrightnessCorrection.java @@ -20,7 +20,6 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.MathUtils; @@ -44,7 +43,6 @@ import java.io.IOException; * @hide */ @SystemApi -@TestApi public final class BrightnessCorrection implements Parcelable { private static final int SCALE_AND_TRANSLATE_LOG = 1; diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index fc14b89d83f7..68b9d5227746 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -699,7 +699,6 @@ public final class DisplayManager { * @hide */ @SystemApi - @TestApi public Point getStableDisplaySize() { return mGlobal.getStableDisplaySize(); } @@ -709,7 +708,6 @@ public final class DisplayManager { * @hide until we make it a system api. */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.BRIGHTNESS_SLIDER_USAGE) public List getBrightnessEvents() { return mGlobal.getBrightnessEvents(mContext.getOpPackageName()); @@ -721,7 +719,6 @@ public final class DisplayManager { * @hide until we make it a system api */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.ACCESS_AMBIENT_LIGHT_STATS) public List getAmbientBrightnessStats() { return mGlobal.getAmbientBrightnessStats(); @@ -733,7 +730,6 @@ public final class DisplayManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(BrightnessConfiguration c) { setBrightnessConfigurationForUser(c, mContext.getUserId(), mContext.getPackageName()); @@ -758,7 +754,6 @@ public final class DisplayManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public BrightnessConfiguration getBrightnessConfiguration() { return getBrightnessConfigurationForUser(mContext.getUserId()); @@ -784,7 +779,6 @@ public final class DisplayManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) @Nullable public BrightnessConfiguration getDefaultBrightnessConfiguration() { diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index e5e73200c8ef..5b186c78df54 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -28,7 +28,6 @@ import android.annotation.StringDef; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import android.content.pm.PackageManager; import android.os.Binder; @@ -60,7 +59,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi @SystemService(Context.HDMI_CONTROL_SERVICE) @RequiresFeature(PackageManager.FEATURE_HDMI_CEC) public final class HdmiControlManager { diff --git a/core/java/android/hardware/hdmi/HdmiPortInfo.java b/core/java/android/hardware/hdmi/HdmiPortInfo.java index 52c3628f358b..e97e120109bf 100644 --- a/core/java/android/hardware/hdmi/HdmiPortInfo.java +++ b/core/java/android/hardware/hdmi/HdmiPortInfo.java @@ -18,7 +18,6 @@ package android.hardware.hdmi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +28,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class HdmiPortInfo implements Parcelable { /** HDMI port type: Input */ public static final int PORT_INPUT = 0; diff --git a/core/java/android/hardware/hdmi/HdmiSwitchClient.java b/core/java/android/hardware/hdmi/HdmiSwitchClient.java index 4685e1e04618..cbfbe3940e47 100644 --- a/core/java/android/hardware/hdmi/HdmiSwitchClient.java +++ b/core/java/android/hardware/hdmi/HdmiSwitchClient.java @@ -18,7 +18,6 @@ package android.hardware.hdmi; import android.annotation.CallbackExecutor; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.hardware.hdmi.HdmiControlManager.ControlCallbackResult; import android.os.Binder; import android.os.RemoteException; @@ -39,7 +38,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi public class HdmiSwitchClient extends HdmiClient { private static final String TAG = "HdmiSwitchClient"; diff --git a/core/java/android/hardware/lights/Light.java b/core/java/android/hardware/lights/Light.java index 1c95fb632548..da270182052d 100644 --- a/core/java/android/hardware/lights/Light.java +++ b/core/java/android/hardware/lights/Light.java @@ -19,7 +19,6 @@ package android.hardware.lights; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +28,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class Light implements Parcelable { private final int mId; private final int mOrdinal; diff --git a/core/java/android/hardware/lights/LightState.java b/core/java/android/hardware/lights/LightState.java index e55aa702f15c..cd39e6df91a9 100644 --- a/core/java/android/hardware/lights/LightState.java +++ b/core/java/android/hardware/lights/LightState.java @@ -19,7 +19,6 @@ package android.hardware.lights; import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class LightState implements Parcelable { private final int mColor; diff --git a/core/java/android/hardware/lights/LightsManager.java b/core/java/android/hardware/lights/LightsManager.java index 8cd231224472..33e5fcaf2abb 100644 --- a/core/java/android/hardware/lights/LightsManager.java +++ b/core/java/android/hardware/lights/LightsManager.java @@ -45,7 +45,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi @SystemService(Context.LIGHTS_SERVICE) public final class LightsManager { private static final String TAG = "LightsManager"; diff --git a/core/java/android/hardware/lights/LightsRequest.java b/core/java/android/hardware/lights/LightsRequest.java index 5c4fc6707e96..a318992c35ee 100644 --- a/core/java/android/hardware/lights/LightsRequest.java +++ b/core/java/android/hardware/lights/LightsRequest.java @@ -18,7 +18,6 @@ package android.hardware.lights; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.util.SparseArray; import com.android.internal.util.Preconditions; @@ -29,7 +28,6 @@ import com.android.internal.util.Preconditions; * @hide */ @SystemApi -@TestApi public final class LightsRequest { /** Visible to {@link LightsManager.Session}. */ diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index ecdbf4cdf9ec..e58403fe387d 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -67,7 +67,6 @@ import java.util.UUID; * * @hide */ -@TestApi @SystemApi public class SoundTrigger { private static final String TAG = "SoundTrigger"; diff --git a/core/java/android/metrics/LogMaker.java b/core/java/android/metrics/LogMaker.java index d8a2082f4eae..a19eb5668d55 100644 --- a/core/java/android/metrics/LogMaker.java +++ b/core/java/android/metrics/LogMaker.java @@ -16,7 +16,6 @@ package android.metrics; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.ComponentName; import android.util.Log; import android.util.SparseArray; @@ -32,7 +31,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; * @hide */ @SystemApi -@TestApi public class LogMaker { private static final String TAG = "LogBuilder"; diff --git a/core/java/android/metrics/MetricsReader.java b/core/java/android/metrics/MetricsReader.java index 27f9a5dbf51c..5f356ca00d88 100644 --- a/core/java/android/metrics/MetricsReader.java +++ b/core/java/android/metrics/MetricsReader.java @@ -16,7 +16,6 @@ package android.metrics; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.util.EventLog; import com.android.internal.annotations.VisibleForTesting; @@ -36,7 +35,6 @@ import java.util.concurrent.TimeUnit; * @hide */ @SystemApi -@TestApi public class MetricsReader { private Queue mPendingQueue = new LinkedList<>(); private Queue mSeenQueue = new LinkedList<>(); diff --git a/core/java/android/net/CaptivePortal.java b/core/java/android/net/CaptivePortal.java index 8afeb3033cdb..c2586fa0c825 100644 --- a/core/java/android/net/CaptivePortal.java +++ b/core/java/android/net/CaptivePortal.java @@ -19,7 +19,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +41,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int APP_RETURN_DISMISSED = 0; /** * Response code from the captive portal application, indicating that the user did not login and @@ -52,7 +50,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int APP_RETURN_UNWANTED = 1; /** * Response code from the captive portal application, indicating that the user does not wish to @@ -62,7 +59,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int APP_RETURN_WANTED_AS_IS = 2; /** Event offset of request codes from captive portal application. */ private static final int APP_REQUEST_BASE = 100; @@ -74,7 +70,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int APP_REQUEST_REEVALUATION_REQUIRED = APP_REQUEST_BASE + 0; private final IBinder mBinder; @@ -154,7 +149,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public void useNetwork() { try { ICaptivePortal.Stub.asInterface(mBinder).appResponse(APP_RETURN_WANTED_AS_IS); @@ -167,7 +161,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void reevaluateNetwork() { try { @@ -183,7 +176,6 @@ public class CaptivePortal implements Parcelable { * @hide */ @SystemApi - @TestApi public void logEvent(@EventId int eventId, @NonNull String packageName) { try { ICaptivePortal.Stub.asInterface(mBinder).logEvent(eventId, packageName); diff --git a/core/java/android/net/CaptivePortalData.java b/core/java/android/net/CaptivePortalData.java index 09f47625a8e4..59e62a675abc 100644 --- a/core/java/android/net/CaptivePortalData.java +++ b/core/java/android/net/CaptivePortalData.java @@ -19,7 +19,6 @@ package android.net; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -30,7 +29,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class CaptivePortalData implements Parcelable { private final long mRefreshTimeMillis; @Nullable diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index b2eba6318730..1012f47f8c0a 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -269,7 +269,6 @@ public class ConnectivityManager { * {@hide} */ @SystemApi - @TestApi public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC"; @@ -278,7 +277,6 @@ public class ConnectivityManager { * {@hide} */ @SystemApi - @TestApi public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT"; @@ -4413,7 +4411,6 @@ public class ConnectivityManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull Network network, @NonNull Bundle appExtras) { try { diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index d975017f9c8e..5860e20ad3b4 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -37,7 +37,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi @SystemService(Context.ETHERNET_SERVICE) public class EthernetManager { private static final String TAG = "EthernetManager"; diff --git a/core/java/android/net/IpPrefix.java b/core/java/android/net/IpPrefix.java index 06f5f270d189..bcb65fab8571 100644 --- a/core/java/android/net/IpPrefix.java +++ b/core/java/android/net/IpPrefix.java @@ -20,7 +20,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.Pair; @@ -89,7 +88,6 @@ public final class IpPrefix implements Parcelable { * @hide */ @SystemApi - @TestApi public IpPrefix(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength) { // We don't reuse the (byte[], int) constructor because it calls clone() on the byte array, // which is unnecessary because getAddress() already returns a clone. @@ -108,7 +106,6 @@ public final class IpPrefix implements Parcelable { * @hide */ @SystemApi - @TestApi public IpPrefix(@NonNull String prefix) { // We don't reuse the (InetAddress, int) constructor because "error: call to this must be // first statement in constructor". We could factor out setting the member variables to an diff --git a/core/java/android/net/LinkAddress.java b/core/java/android/net/LinkAddress.java index 772c685856c7..d1bdaa078cdc 100644 --- a/core/java/android/net/LinkAddress.java +++ b/core/java/android/net/LinkAddress.java @@ -30,7 +30,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Parcel; @@ -158,7 +157,6 @@ public class LinkAddress implements Parcelable { * @return true if the address is IPv6. * @hide */ - @TestApi @SystemApi public boolean isIpv6() { return address instanceof Inet6Address; @@ -180,7 +178,6 @@ public class LinkAddress implements Parcelable { * @return true if the address is IPv4 or is a mapped IPv4 address. * @hide */ - @TestApi @SystemApi public boolean isIpv4() { return address instanceof Inet4Address; @@ -243,7 +240,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkAddress(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength, int flags, int scope) { init(address, prefixLength, flags, scope, LIFETIME_UNKNOWN, LIFETIME_UNKNOWN); @@ -275,7 +271,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkAddress(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength, int flags, int scope, long deprecationTime, long expirationTime) { init(address, prefixLength, flags, scope, deprecationTime, expirationTime); @@ -289,7 +284,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkAddress(@NonNull InetAddress address, @IntRange(from = 0, to = 128) int prefixLength) { this(address, prefixLength, 0, 0); @@ -314,7 +308,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkAddress(@NonNull String address) { this(address, 0, 0); this.scope = scopeForUnicastAddress(this.address); @@ -329,7 +322,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkAddress(@NonNull String address, int flags, int scope) { // This may throw an IllegalArgumentException; catching it is the caller's responsibility. // TODO: consider rejecting mapped IPv4 addresses such as "::ffff:192.0.2.5/24". @@ -389,7 +381,6 @@ public class LinkAddress implements Parcelable { * otherwise. * @hide */ - @TestApi @SystemApi public boolean isSameAddressAs(@Nullable LinkAddress other) { if (other == null) { @@ -469,7 +460,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public long getDeprecationTime() { return deprecationTime; } @@ -485,7 +475,6 @@ public class LinkAddress implements Parcelable { * @hide */ @SystemApi - @TestApi public long getExpirationTime() { return expirationTime; } @@ -496,7 +485,6 @@ public class LinkAddress implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean isGlobalPreferred() { /** diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 7cb3f920cf93..25a76f43553a 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -19,7 +19,6 @@ package android.net; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.util.LinkPropertiesUtils; import android.os.Build; @@ -161,7 +160,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkProperties(@Nullable LinkProperties source) { this(source, false /* parcelSensitiveFields */); } @@ -177,7 +175,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public LinkProperties(@Nullable LinkProperties source, boolean parcelSensitiveFields) { mParcelSensitiveFields = parcelSensitiveFields; if (source == null) return; @@ -292,7 +289,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public boolean addLinkAddress(@NonNull LinkAddress address) { if (address == null) { return false; @@ -321,7 +317,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public boolean removeLinkAddress(@NonNull LinkAddress toRemove) { int i = findLinkAddressIndex(toRemove); if (i >= 0) { @@ -375,7 +370,6 @@ public final class LinkProperties implements Parcelable { * @return true if the DNS server was added, false if it was already present. * @hide */ - @TestApi @SystemApi public boolean addDnsServer(@NonNull InetAddress dnsServer) { if (dnsServer != null && !mDnses.contains(dnsServer)) { @@ -392,7 +386,6 @@ public final class LinkProperties implements Parcelable { * @return true if the DNS server was removed, false if it did not exist. * @hide */ - @TestApi @SystemApi public boolean removeDnsServer(@NonNull InetAddress dnsServer) { return mDnses.remove(dnsServer); @@ -427,7 +420,6 @@ public final class LinkProperties implements Parcelable { * @param usePrivateDns The private DNS state. * @hide */ - @TestApi @SystemApi public void setUsePrivateDns(boolean usePrivateDns) { mUsePrivateDns = usePrivateDns; @@ -454,7 +446,6 @@ public final class LinkProperties implements Parcelable { * @param privateDnsServerName The private DNS server name. * @hide */ - @TestApi @SystemApi public void setPrivateDnsServerName(@Nullable String privateDnsServerName) { mPrivateDnsServerName = privateDnsServerName; @@ -533,7 +524,6 @@ public final class LinkProperties implements Parcelable { * object. * @hide */ - @TestApi @SystemApi public void setValidatedPrivateDnsServers(@NonNull Collection dnsServers) { mValidatedPrivateDnses.clear(); @@ -550,7 +540,6 @@ public final class LinkProperties implements Parcelable { * DNS servers on this link. * @hide */ - @TestApi @SystemApi public @NonNull List getValidatedPrivateDnsServers() { return Collections.unmodifiableList(mValidatedPrivateDnses); @@ -591,7 +580,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public void setPcscfServers(@NonNull Collection pcscfServers) { mPcscfs.clear(); for (InetAddress pcscfServer: pcscfServers) { @@ -607,7 +595,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public @NonNull List getPcscfServers() { return Collections.unmodifiableList(mPcscfs); } @@ -661,7 +648,6 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @TestApi @SystemApi public void setTcpBufferSizes(@Nullable String tcpBufferSizes) { mTcpBufferSizes = tcpBufferSizes; @@ -674,7 +660,6 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @TestApi @SystemApi public @Nullable String getTcpBufferSizes() { return mTcpBufferSizes; @@ -743,7 +728,6 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean removeRoute(@NonNull RouteInfo route) { return Objects.equals(mIfaceName, route.getInterface()) && mRoutes.remove(route); @@ -1020,7 +1004,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if there is an IPv4 address, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean hasIpv4Address() { for (LinkAddress address : mLinkAddresses) { @@ -1061,7 +1044,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if there is a global preferred IPv6 address, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean hasGlobalIpv6Address() { for (LinkAddress address : mLinkAddresses) { @@ -1148,7 +1130,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if there is an IPv6 default route, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean hasIpv6DefaultRoute() { for (RouteInfo r : mRoutes) { @@ -1264,7 +1245,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if the link is provisioned, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean isIpv4Provisioned() { return (hasIpv4Address() @@ -1279,7 +1259,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if the link is provisioned, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean isIpv6Provisioned() { return (hasGlobalIpv6Address() @@ -1307,7 +1286,6 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if the link is provisioned, {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean isProvisioned() { return (isIpv4Provisioned() || isIpv6Provisioned()); @@ -1320,7 +1298,6 @@ public final class LinkProperties implements Parcelable { * {@code false} otherwise. * @hide */ - @TestApi @SystemApi public boolean isReachable(@NonNull InetAddress ip) { final List allRoutes = getAllRoutes(); @@ -1577,7 +1554,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public void setCaptivePortalApiUrl(@Nullable Uri url) { mCaptivePortalApiUrl = url; } @@ -1592,7 +1568,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi @Nullable public Uri getCaptivePortalApiUrl() { return mCaptivePortalApiUrl; @@ -1603,7 +1578,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi public void setCaptivePortalData(@Nullable CaptivePortalData data) { mCaptivePortalData = data; } @@ -1617,7 +1591,6 @@ public final class LinkProperties implements Parcelable { * @hide */ @SystemApi - @TestApi @Nullable public CaptivePortalData getCaptivePortalData() { return mCaptivePortalData; diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 10ee72e48ecc..3e4f73555e58 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -19,7 +19,6 @@ package android.net; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -128,7 +127,6 @@ public class Network implements Parcelable { * @hide */ @SystemApi - @TestApi public Network(@NonNull Network that) { this(that.netId, that.mPrivateDnsBypass); } @@ -165,7 +163,6 @@ public class Network implements Parcelable { * * @hide */ - @TestApi @SystemApi public @NonNull Network getPrivateDnsBypassingCopy() { return new Network(netId, true); @@ -176,7 +173,6 @@ public class Network implements Parcelable { * * @hide */ - @TestApi @SystemApi public int getNetId() { return netId; diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 004f84422b44..be33f4edb5d1 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -850,7 +850,6 @@ public final class NetworkCapabilities implements Parcelable { * @return an array of transport type values for this instance. * @hide */ - @TestApi @SystemApi @NonNull public @Transport int[] getTransportTypes() { return BitUtils.unpackBits(mTransportTypes); @@ -1025,7 +1024,6 @@ public final class NetworkCapabilities implements Parcelable { */ @NonNull @SystemApi - @TestApi public int[] getAdministratorUids() { return Arrays.copyOf(mAdministratorUids, mAdministratorUids.length); } @@ -1506,7 +1504,6 @@ public final class NetworkCapabilities implements Parcelable { * @hide */ @SystemApi - @TestApi public @Nullable String getSsid() { return mSSID; } @@ -1590,7 +1587,6 @@ public final class NetworkCapabilities implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean satisfiedByNetworkCapabilities(@Nullable NetworkCapabilities nc) { return satisfiedByNetworkCapabilities(nc, false); @@ -2136,7 +2132,6 @@ public final class NetworkCapabilities implements Parcelable { * @hide */ @SystemApi - @TestApi public static final class Builder { private final NetworkCapabilities mCaps; diff --git a/core/java/android/net/NetworkStack.java b/core/java/android/net/NetworkStack.java index 86f3dfd412f6..79f9e6ef2a97 100644 --- a/core/java/android/net/NetworkStack.java +++ b/core/java/android/net/NetworkStack.java @@ -33,7 +33,6 @@ import java.util.Arrays; * @hide */ @SystemApi -@TestApi public class NetworkStack { /** * Permission granted only to the NetworkStack APK, defined in NetworkStackStub with signature @@ -41,7 +40,6 @@ public class NetworkStack { * @hide */ @SystemApi - @TestApi public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK"; @@ -54,7 +52,6 @@ public class NetworkStack { */ @Nullable @SystemApi - @TestApi public static IBinder getService() { final IBinder mockService = sMockService; if (mockService != null) return mockService; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index d9568756bbac..93ad41f7c524 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.util.NetUtils; import android.os.Build; @@ -87,17 +86,14 @@ public final class RouteInfo implements Parcelable { /** Unicast route. @hide */ @SystemApi - @TestApi public static final int RTN_UNICAST = 1; /** Unreachable route. @hide */ @SystemApi - @TestApi public static final int RTN_UNREACHABLE = 7; /** Throw route. @hide */ @SystemApi - @TestApi public static final int RTN_THROW = 9; /** @@ -135,7 +131,6 @@ public final class RouteInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public RouteInfo(@Nullable IpPrefix destination, @Nullable InetAddress gateway, @Nullable String iface, @RouteType int type) { this(destination, gateway, iface, type, 0); @@ -397,7 +392,6 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @TestApi @SystemApi @RouteType public int getType() { diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index a973455baa04..f56d656f07ed 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -19,7 +19,6 @@ package android.net; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -52,7 +51,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class StaticIpConfiguration implements Parcelable { /** @hide */ @UnsupportedAppUsage diff --git a/core/java/android/net/apf/ApfCapabilities.java b/core/java/android/net/apf/ApfCapabilities.java index 92c543294ae1..bf5b26e278f9 100644 --- a/core/java/android/net/apf/ApfCapabilities.java +++ b/core/java/android/net/apf/ApfCapabilities.java @@ -19,7 +19,6 @@ package android.net.apf; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,6 @@ import com.android.internal.R; * @hide */ @SystemApi -@TestApi public final class ApfCapabilities implements Parcelable { /** * Version of APF instruction set supported for packet filtering. 0 indicates no support for diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java index f93907a37f3f..c50bae90488b 100644 --- a/core/java/android/net/metrics/ApfProgramEvent.java +++ b/core/java/android/net/metrics/ApfProgramEvent.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +39,6 @@ import java.util.List; * the APF program in place with a new APF program. * {@hide} */ -@TestApi @SystemApi public final class ApfProgramEvent implements IpConnectivityLog.Event { diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java index b221cb97b28f..2a601b273ef4 100644 --- a/core/java/android/net/metrics/ApfStats.java +++ b/core/java/android/net/metrics/ApfStats.java @@ -19,7 +19,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +28,6 @@ import android.os.Parcelable; * {@hide} */ @SystemApi -@TestApi public final class ApfStats implements IpConnectivityLog.Event { /** @@ -126,7 +124,6 @@ public final class ApfStats implements IpConnectivityLog.Event { * @hide */ @SystemApi - @TestApi public static final class Builder { private long mDurationMs; private int mReceivedRas; diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index 8fc1ef80bba9..e0a93dd1c18f 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -19,7 +19,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -30,7 +29,6 @@ import android.text.TextUtils; * {@hide} */ @SystemApi -@TestApi public final class DhcpClientEvent implements IpConnectivityLog.Event { // Names for recording DhcpClient pseudo-state transitions. diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java index 32efb5adafcd..de3129d5e94d 100644 --- a/core/java/android/net/metrics/DhcpErrorEvent.java +++ b/core/java/android/net/metrics/DhcpErrorEvent.java @@ -18,7 +18,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -30,7 +29,6 @@ import com.android.internal.util.MessageUtils; * {@hide} */ @SystemApi -@TestApi public final class DhcpErrorEvent implements IpConnectivityLog.Event { public static final int L2_ERROR = 1; public static final int L3_ERROR = 2; diff --git a/core/java/android/net/metrics/IpConnectivityLog.java b/core/java/android/net/metrics/IpConnectivityLog.java index 680c01573f98..a008d855025a 100644 --- a/core/java/android/net/metrics/IpConnectivityLog.java +++ b/core/java/android/net/metrics/IpConnectivityLog.java @@ -18,7 +18,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.ConnectivityMetricsEvent; import android.net.IIpConnectivityMetrics; import android.net.Network; @@ -35,7 +34,6 @@ import com.android.internal.util.BitUtils; * {@hide} */ @SystemApi -@TestApi public class IpConnectivityLog { private static final String TAG = IpConnectivityLog.class.getSimpleName(); private static final boolean DBG = false; @@ -52,7 +50,6 @@ public class IpConnectivityLog { /** @hide */ @SystemApi - @TestApi public IpConnectivityLog() { } diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java index f14abb895cb4..4f7f3263117b 100644 --- a/core/java/android/net/metrics/IpManagerEvent.java +++ b/core/java/android/net/metrics/IpManagerEvent.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -36,7 +35,6 @@ import java.lang.annotation.RetentionPolicy; * {@hide} */ @SystemApi -@TestApi public final class IpManagerEvent implements IpConnectivityLog.Event { public static final int PROVISIONING_OK = 1; diff --git a/core/java/android/net/metrics/IpReachabilityEvent.java b/core/java/android/net/metrics/IpReachabilityEvent.java index 79e01d7116b6..d5003badd614 100644 --- a/core/java/android/net/metrics/IpReachabilityEvent.java +++ b/core/java/android/net/metrics/IpReachabilityEvent.java @@ -19,7 +19,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -32,7 +31,6 @@ import com.android.internal.util.MessageUtils; * {@hide} */ @SystemApi -@TestApi public final class IpReachabilityEvent implements IpConnectivityLog.Event { // Event types. diff --git a/core/java/android/net/metrics/NetworkEvent.java b/core/java/android/net/metrics/NetworkEvent.java index fe603cf9305c..8c28f7a7d643 100644 --- a/core/java/android/net/metrics/NetworkEvent.java +++ b/core/java/android/net/metrics/NetworkEvent.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -34,7 +33,6 @@ import java.lang.annotation.RetentionPolicy; * {@hide} */ @SystemApi -@TestApi public final class NetworkEvent implements IpConnectivityLog.Event { public static final int NETWORK_CONNECTED = 1; diff --git a/core/java/android/net/metrics/RaEvent.java b/core/java/android/net/metrics/RaEvent.java index 661f648fc74e..b54874f5a573 100644 --- a/core/java/android/net/metrics/RaEvent.java +++ b/core/java/android/net/metrics/RaEvent.java @@ -19,7 +19,6 @@ package android.net.metrics; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -28,7 +27,6 @@ import android.os.Parcelable; * {@hide} */ @SystemApi -@TestApi public final class RaEvent implements IpConnectivityLog.Event { private static final long NO_LIFETIME = -1L; diff --git a/core/java/android/net/metrics/ValidationProbeEvent.java b/core/java/android/net/metrics/ValidationProbeEvent.java index 8fab64ae6c4e..7f4e4a73677e 100644 --- a/core/java/android/net/metrics/ValidationProbeEvent.java +++ b/core/java/android/net/metrics/ValidationProbeEvent.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -35,7 +34,6 @@ import java.lang.annotation.RetentionPolicy; * {@hide} */ @SystemApi -@TestApi public final class ValidationProbeEvent implements IpConnectivityLog.Event { public static final int PROBE_DNS = 0; diff --git a/core/java/android/net/util/SocketUtils.java b/core/java/android/net/util/SocketUtils.java index 696708408c22..e64060f1b220 100644 --- a/core/java/android/net/util/SocketUtils.java +++ b/core/java/android/net/util/SocketUtils.java @@ -22,7 +22,6 @@ import static android.system.OsConstants.SO_BINDTODEVICE; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.NetworkUtils; import android.system.ErrnoException; import android.system.NetlinkSocketAddress; @@ -40,7 +39,6 @@ import java.net.SocketAddress; * @hide */ @SystemApi -@TestApi public final class SocketUtils { /** * Create a raw datagram socket that is bound to an interface. diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 12ec0a0c21d5..9a16d3fee600 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -20,7 +20,6 @@ import android.Manifest.permission; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; @@ -392,7 +391,6 @@ public class BatteryManager { */ @RequiresPermission(permission.POWER_SAVER) @SystemApi - @TestApi public boolean setChargingStateUpdateDelayMillis(int delayMillis) { try { return mBatteryStats.setChargingStateUpdateDelayMillis(delayMillis); diff --git a/core/java/android/os/BugreportManager.java b/core/java/android/os/BugreportManager.java index 9e996d15fa84..fe4d7296503f 100644 --- a/core/java/android/os/BugreportManager.java +++ b/core/java/android/os/BugreportManager.java @@ -24,13 +24,13 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; import android.os.Handler; import android.util.Log; import android.widget.Toast; + import com.android.internal.R; import com.android.internal.util.Preconditions; @@ -48,7 +48,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi @SystemService(Context.BUGREPORT_SERVICE) public final class BugreportManager { diff --git a/core/java/android/os/BugreportParams.java b/core/java/android/os/BugreportParams.java index c834781346f6..279ccae7c94f 100644 --- a/core/java/android/os/BugreportParams.java +++ b/core/java/android/os/BugreportParams.java @@ -18,7 +18,6 @@ package android.os; import android.annotation.IntDef; import android.annotation.SystemApi; -import android.annotation.TestApi; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -29,7 +28,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class BugreportParams { private final int mMode; diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 085681d412e9..5745187fcbb9 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -256,7 +256,6 @@ public class Environment { * @hide */ @SystemApi - @TestApi public static @NonNull File getOemDirectory() { return DIR_OEM_ROOT; } @@ -268,7 +267,6 @@ public class Environment { * @hide */ @SystemApi - @TestApi public static @NonNull File getOdmDirectory() { return DIR_ODM_ROOT; } @@ -279,7 +277,6 @@ public class Environment { * @hide */ @SystemApi - @TestApi public static @NonNull File getVendorDirectory() { return DIR_VENDOR_ROOT; } @@ -291,7 +288,6 @@ public class Environment { * @hide */ @SystemApi - @TestApi public static @NonNull File getProductDirectory() { return DIR_PRODUCT_ROOT; } @@ -318,7 +314,6 @@ public class Environment { * @hide */ @SystemApi - @TestApi public static @NonNull File getSystemExtDirectory() { return DIR_SYSTEM_EXT_ROOT; } diff --git a/core/java/android/os/HidlMemory.java b/core/java/android/os/HidlMemory.java index 02d1e0ce9109..26fc6f0ae4ce 100644 --- a/core/java/android/os/HidlMemory.java +++ b/core/java/android/os/HidlMemory.java @@ -20,7 +20,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import java.io.Closeable; import java.io.IOException; @@ -41,7 +40,6 @@ import java.io.IOException; * @hide */ @SystemApi -@TestApi public class HidlMemory implements Closeable { private final @NonNull String mName; private final long mSize; diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index 64ab1d711765..0d2bfdf04905 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -17,7 +17,6 @@ package android.os; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import libcore.util.NativeAllocationRegistry; @@ -26,7 +25,6 @@ import java.util.NoSuchElementException; /** @hide */ @SystemApi -@TestApi public abstract class HwBinder implements IHwBinder { private static final String TAG = "HwBinder"; diff --git a/core/java/android/os/HwBlob.java b/core/java/android/os/HwBlob.java index 154227b2a786..a43fbdbde4d2 100644 --- a/core/java/android/os/HwBlob.java +++ b/core/java/android/os/HwBlob.java @@ -19,7 +19,6 @@ package android.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import libcore.util.NativeAllocationRegistry; @@ -30,7 +29,6 @@ import libcore.util.NativeAllocationRegistry; * @hide */ @SystemApi -@TestApi public class HwBlob { private static final String TAG = "HwBlob"; diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java index 228548ad7802..9fd37d4548ac 100644 --- a/core/java/android/os/HwParcel.java +++ b/core/java/android/os/HwParcel.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import dalvik.annotation.optimization.FastNative; @@ -34,7 +33,6 @@ import java.util.Arrays; /** @hide */ @SystemApi -@TestApi public class HwParcel { private static final String TAG = "HwParcel"; diff --git a/core/java/android/os/IHwBinder.java b/core/java/android/os/IHwBinder.java index 46fa6ef3b783..249eb3aa3456 100644 --- a/core/java/android/os/IHwBinder.java +++ b/core/java/android/os/IHwBinder.java @@ -17,11 +17,9 @@ package android.os; import android.annotation.SystemApi; -import android.annotation.TestApi; /** @hide */ @SystemApi -@TestApi public interface IHwBinder { /** * Process a hwbinder transaction. diff --git a/core/java/android/os/IHwInterface.java b/core/java/android/os/IHwInterface.java index 0a5a71550b06..f21f6e30a041 100644 --- a/core/java/android/os/IHwInterface.java +++ b/core/java/android/os/IHwInterface.java @@ -17,11 +17,9 @@ package android.os; import android.annotation.SystemApi; -import android.annotation.TestApi; /** @hide */ @SystemApi -@TestApi public interface IHwInterface { /** * @return the binder object that corresponds to this interface. diff --git a/core/java/android/os/IncidentManager.java b/core/java/android/os/IncidentManager.java index 565d31a26dbc..a543a2d6a983 100644 --- a/core/java/android/os/IncidentManager.java +++ b/core/java/android/os/IncidentManager.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import android.net.Uri; import android.util.Slog; @@ -45,7 +44,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi @SystemService(Context.INCIDENT_SERVICE) public class IncidentManager { private static final String TAG = "IncidentManager"; @@ -159,7 +157,6 @@ public class IncidentManager { * @hide */ @SystemApi - @TestApi public static class PendingReport { /** * Encoded data. @@ -277,7 +274,6 @@ public class IncidentManager { * @hide */ @SystemApi - @TestApi public static class IncidentReport implements Parcelable, Closeable { private final long mTimestampNs; private final int mPrivacyPolicy; diff --git a/core/java/android/os/IncidentReportArgs.java b/core/java/android/os/IncidentReportArgs.java index 7e858e1dc390..73e4914ce6ae 100644 --- a/core/java/android/os/IncidentReportArgs.java +++ b/core/java/android/os/IncidentReportArgs.java @@ -18,7 +18,6 @@ package android.os; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.util.IntArray; @@ -30,7 +29,6 @@ import java.util.ArrayList; * {@hide} */ @SystemApi -@TestApi public final class IncidentReportArgs implements Parcelable { private final IntArray mSections = new IntArray(); diff --git a/core/java/android/os/NativeHandle.java b/core/java/android/os/NativeHandle.java index 8d341b603eb4..a26873a87552 100644 --- a/core/java/android/os/NativeHandle.java +++ b/core/java/android/os/NativeHandle.java @@ -20,7 +20,6 @@ import static android.system.OsConstants.F_DUPFD_CLOEXEC; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.system.ErrnoException; import android.system.Os; @@ -33,7 +32,6 @@ import java.io.FileDescriptor; * @hide */ @SystemApi -@TestApi public final class NativeHandle implements Closeable { // whether this object owns mFds private boolean mOwn = false; diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 50f0c28cb8f8..000b23f5d5ca 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1565,7 +1565,6 @@ public final class PowerManager { * @see #isPowerSaveMode() */ @SystemApi - @TestApi @RequiresPermission(anyOf = { android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER @@ -1610,7 +1609,6 @@ public final class PowerManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(permission.POWER_SAVER) public boolean setDynamicPowerSaveHint(boolean powerSaveHint, int disableThreshold) { try { @@ -1670,7 +1668,6 @@ public final class PowerManager { * @hide */ @SystemApi - @TestApi public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0; /** @@ -1683,7 +1680,6 @@ public final class PowerManager { * @hide */ @SystemApi - @TestApi public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1; /** @hide */ @@ -1708,7 +1704,6 @@ public final class PowerManager { */ @AutoPowerSaveModeTriggers @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveModeTrigger() { try { @@ -1732,7 +1727,6 @@ public final class PowerManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void setBatteryDischargePrediction(@NonNull Duration timeRemaining, boolean isPersonalized) { diff --git a/core/java/android/os/RemoteCallback.java b/core/java/android/os/RemoteCallback.java index 373060f4ff4b..49f84adf2c21 100644 --- a/core/java/android/os/RemoteCallback.java +++ b/core/java/android/os/RemoteCallback.java @@ -19,14 +19,12 @@ package android.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; /** * @hide */ @SystemApi -@TestApi public final class RemoteCallback implements Parcelable { public interface OnResultListener { diff --git a/core/java/android/os/SystemConfigManager.java b/core/java/android/os/SystemConfigManager.java index 12a1ffaf69c1..3f0632be90d1 100644 --- a/core/java/android/os/SystemConfigManager.java +++ b/core/java/android/os/SystemConfigManager.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import android.util.ArraySet; import android.util.Log; @@ -40,7 +39,6 @@ import java.util.Set; * @hide */ @SystemApi -@TestApi @SystemService(Context.SYSTEM_CONFIG_SERVICE) public class SystemConfigManager { private static final String TAG = SystemConfigManager.class.getSimpleName(); diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index c5e5cc40d54e..a16452705efc 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -19,7 +19,6 @@ package android.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.util.Log; import android.util.MutableInt; @@ -52,7 +51,6 @@ import java.util.HashMap; * {@hide} */ @SystemApi -@TestApi public class SystemProperties { private static final String TAG = "SystemProperties"; private static final boolean TRACK_KEY_ACCESS = false; @@ -146,7 +144,6 @@ public class SystemProperties { */ @NonNull @SystemApi - @TestApi public static String get(@NonNull String key) { if (TRACK_KEY_ACCESS) onKeyAccess(key); return native_get(key); @@ -163,7 +160,6 @@ public class SystemProperties { */ @NonNull @SystemApi - @TestApi public static String get(@NonNull String key, @Nullable String def) { if (TRACK_KEY_ACCESS) onKeyAccess(key); return native_get(key, def); @@ -179,7 +175,6 @@ public class SystemProperties { * @hide */ @SystemApi - @TestApi public static int getInt(@NonNull String key, int def) { if (TRACK_KEY_ACCESS) onKeyAccess(key); return native_get_int(key, def); @@ -195,7 +190,6 @@ public class SystemProperties { * @hide */ @SystemApi - @TestApi public static long getLong(@NonNull String key, long def) { if (TRACK_KEY_ACCESS) onKeyAccess(key); return native_get_long(key, def); @@ -216,7 +210,6 @@ public class SystemProperties { * @hide */ @SystemApi - @TestApi public static boolean getBoolean(@NonNull String key, boolean def) { if (TRACK_KEY_ACCESS) onKeyAccess(key); return native_get_boolean(key, def); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 60447e76f75e..d39c5328e330 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -47,7 +47,6 @@ public final class UserHandle implements Parcelable { /** @hide A user handle to indicate all users on the device */ @SystemApi - @TestApi public static final @NonNull UserHandle ALL = new UserHandle(USER_ALL); /** @hide A user id to indicate the currently active user */ @@ -56,7 +55,6 @@ public final class UserHandle implements Parcelable { /** @hide A user handle to indicate the current user of the device */ @SystemApi - @TestApi public static final @NonNull UserHandle CURRENT = new UserHandle(USER_CURRENT); /** @hide A user id to indicate that we would like to send to the current @@ -107,7 +105,6 @@ public final class UserHandle implements Parcelable { /** @hide A user handle to indicate the "system" user of the device */ @SystemApi - @TestApi public static final @NonNull UserHandle SYSTEM = new UserHandle(USER_SYSTEM); /** @@ -280,7 +277,6 @@ public final class UserHandle implements Parcelable { } /** @hide */ - @TestApi @SystemApi public static UserHandle of(@UserIdInt int userId) { if (userId == USER_SYSTEM) { @@ -325,7 +321,6 @@ public final class UserHandle implements Parcelable { * Returns the app id (or base uid) for a given uid, stripping out the user id from it. * @hide */ - @TestApi @SystemApi public static @AppIdInt int getAppId(int uid) { return uid % PER_USER_RANGE; @@ -483,7 +478,6 @@ public final class UserHandle implements Parcelable { * @hide */ @SystemApi - @TestApi public static @UserIdInt int myUserId() { return getUserId(Process.myUid()); } @@ -522,7 +516,6 @@ public final class UserHandle implements Parcelable { * @hide */ @SystemApi - @TestApi public @UserIdInt int getIdentifier() { return mHandle; } diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 42ae93030f38..4b63f0f713a0 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -1407,8 +1407,7 @@ public class UserManager { * * @hide */ - @SystemApi - @TestApi // To allow seeing it from CTS. + @SystemApi // To allow seeing it from CTS. public static final String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED"; diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java index 0c0e6b5d73a6..7d85d13094a1 100644 --- a/core/java/android/os/Vibrator.java +++ b/core/java/android/os/Vibrator.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.app.ActivityThread; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; @@ -469,7 +468,6 @@ public abstract class Vibrator { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public boolean isVibrating() { return false; @@ -483,7 +481,6 @@ public abstract class Vibrator { * @hide */ @SystemApi - @TestApi public interface OnVibratorStateChangedListener { /** * Called when the vibrator state has changed. @@ -502,7 +499,6 @@ public abstract class Vibrator { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener(@NonNull OnVibratorStateChangedListener listener) { } @@ -516,7 +512,6 @@ public abstract class Vibrator { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener( @NonNull @CallbackExecutor Executor executor, @@ -531,7 +526,6 @@ public abstract class Vibrator { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void removeVibratorStateListener(@NonNull OnVibratorStateChangedListener listener) { } diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java index a1b4dc3ffded..e0927ebd261a 100644 --- a/core/java/android/os/WorkSource.java +++ b/core/java/android/os/WorkSource.java @@ -98,7 +98,6 @@ public class WorkSource implements Parcelable { * @param uid the uid performing the work * @hide */ - @TestApi @SystemApi public WorkSource(int uid) { mNum = 1; @@ -152,7 +151,6 @@ public class WorkSource implements Parcelable { * Returns the number of uids in this work source. * @hide */ - @TestApi @SystemApi public int size() { return mNum; @@ -173,7 +171,6 @@ public class WorkSource implements Parcelable { * If {@code index} < 0 or {@code index} >= {@link #size() N}, then the behavior is undefined. * @hide */ - @TestApi @SystemApi public int getUid(int index) { return mUids[index]; @@ -209,7 +206,6 @@ public class WorkSource implements Parcelable { * If {@code index} < 0 or {@code index} >= {@link #size() N}, then the behavior is undefined. * @hide */ - @TestApi @SystemApi @Nullable public String getPackageName(int index) { @@ -455,7 +451,6 @@ public class WorkSource implements Parcelable { * @hide */ @SystemApi - @TestApi @NonNull public WorkSource withoutNames() { final WorkSource copy = new WorkSource(this); @@ -582,7 +577,6 @@ public class WorkSource implements Parcelable { * @hide for internal use only. */ @SystemApi - @TestApi public boolean isEmpty() { return mNum == 0 && (mChains == null || mChains.isEmpty()); } diff --git a/core/java/android/os/image/DynamicSystemClient.java b/core/java/android/os/image/DynamicSystemClient.java index 50d8d8079ed5..58268e2fc914 100644 --- a/core/java/android/os/image/DynamicSystemClient.java +++ b/core/java/android/os/image/DynamicSystemClient.java @@ -22,7 +22,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -68,7 +67,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi public class DynamicSystemClient { /** @hide */ @IntDef(prefix = { "STATUS_" }, value = { @@ -286,7 +284,6 @@ public class DynamicSystemClient { * @hide */ @SystemApi - @TestApi public DynamicSystemClient(@NonNull Context context) { mContext = context; mConnection = new DynSystemServiceConnection(); @@ -322,7 +319,6 @@ public class DynamicSystemClient { */ @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) @SystemApi - @TestApi public void bind() { if (!featureFlagEnabled()) { Slog.w(TAG, FeatureFlagUtils.DYNAMIC_SYSTEM + " not enabled; bind() aborted."); @@ -345,7 +341,6 @@ public class DynamicSystemClient { */ @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) @SystemApi - @TestApi public void unbind() { if (!mBound) { return; @@ -381,7 +376,6 @@ public class DynamicSystemClient { */ @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) @SystemApi - @TestApi public void start(@NonNull Uri systemUrl, @BytesLong long systemSize) { start(systemUrl, systemSize, 0 /* Use the default userdata size */); } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 6b5eb16d7bff..270115beb09b 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -43,7 +43,6 @@ import android.annotation.SdkConstant; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.annotation.WorkerThread; import android.app.Activity; import android.app.ActivityThread; @@ -1701,7 +1700,6 @@ public class StorageManager { * @hide */ @SystemApi - @TestApi public static boolean hasIsolatedStorage() { // Prefer to use snapshot for current boot when available return SystemProperties.getBoolean(PROP_ISOLATED_STORAGE_SNAPSHOT, diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java index d6c95db95e85..0ba09fdab808 100644 --- a/core/java/android/permission/PermissionControllerManager.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -79,7 +79,6 @@ import java.util.function.Consumer; * * @hide */ -@TestApi @SystemApi @SystemService(Context.PERMISSION_CONTROLLER_SERVICE) public final class PermissionControllerManager { diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index 70b536d7ede0..c319e8580f76 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -24,7 +24,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.ActivityThread; @@ -57,7 +56,6 @@ import java.util.function.Consumer; * * @hide */ -@TestApi @SystemApi @SystemService(Context.PERMISSION_SERVICE) public final class PermissionManager { @@ -115,7 +113,6 @@ public final class PermissionManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(anyOf = { Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, @@ -136,7 +133,6 @@ public final class PermissionManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(anyOf = { Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, diff --git a/core/java/android/permission/RuntimePermissionPresentationInfo.java b/core/java/android/permission/RuntimePermissionPresentationInfo.java index d696feabfc30..4fce14cef3f0 100644 --- a/core/java/android/permission/RuntimePermissionPresentationInfo.java +++ b/core/java/android/permission/RuntimePermissionPresentationInfo.java @@ -18,7 +18,6 @@ package android.permission; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,6 @@ import com.android.internal.util.Preconditions; * * @hide */ -@TestApi @SystemApi public final class RuntimePermissionPresentationInfo implements Parcelable { private static final int FLAG_GRANTED = 1 << 0; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 99ffee3e2ad9..0315b561c120 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -55,7 +55,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi public final class DeviceConfig { /** * The content:// style URL for the config table. @@ -116,7 +115,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static final String NAMESPACE_AUTOFILL = "autofill"; /** @@ -150,7 +148,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; /** @@ -250,7 +247,7 @@ public final class DeviceConfig { * * @hide */ - @SystemApi @TestApi + @SystemApi public static final String NAMESPACE_ROLLBACK = "rollback"; /** @@ -258,7 +255,7 @@ public final class DeviceConfig { * * @hide */ - @SystemApi @TestApi + @SystemApi public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; /** @@ -403,7 +400,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static final String NAMESPACE_PRIVACY = "privacy"; /** @@ -412,7 +408,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static final String NAMESPACE_BIOMETRICS = "biometrics"; /** @@ -421,7 +416,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static final String NAMESPACE_PERMISSIONS = "permissions"; /** @@ -467,7 +461,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static String getProperty(@NonNull String namespace, @NonNull String name) { // Fetch all properties for the namespace at once and cache them in the local process, so we @@ -496,7 +489,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @NonNull @RequiresPermission(READ_DEVICE_CONFIG) public static Properties getProperties(@NonNull String namespace, @NonNull String ... names) { @@ -516,7 +508,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static String getString(@NonNull String namespace, @NonNull String name, @Nullable String defaultValue) { @@ -535,7 +526,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static boolean getBoolean(@NonNull String namespace, @NonNull String name, boolean defaultValue) { @@ -554,7 +544,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static int getInt(@NonNull String namespace, @NonNull String name, int defaultValue) { String value = getProperty(namespace, name); @@ -580,7 +569,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static long getLong(@NonNull String namespace, @NonNull String name, long defaultValue) { String value = getProperty(namespace, name); @@ -606,7 +594,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static float getFloat(@NonNull String namespace, @NonNull String name, float defaultValue) { @@ -642,7 +629,6 @@ public final class DeviceConfig { * @see #resetToDefaults(int, String). */ @SystemApi - @TestApi @RequiresPermission(WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String namespace, @NonNull String name, @Nullable String value, boolean makeDefault) { @@ -666,7 +652,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi @RequiresPermission(WRITE_DEVICE_CONFIG) public static boolean setProperties(@NonNull Properties properties) throws BadConfigException { ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); @@ -686,7 +671,6 @@ public final class DeviceConfig { * @see #setProperty(String, String, String, boolean) */ @SystemApi - @TestApi @RequiresPermission(WRITE_DEVICE_CONFIG) public static void resetToDefaults(@ResetMode int resetMode, @Nullable String namespace) { ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); @@ -708,7 +692,6 @@ public final class DeviceConfig { * @see #removeOnPropertiesChangedListener(OnPropertiesChangedListener) */ @SystemApi - @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static void addOnPropertiesChangedListener( @NonNull String namespace, @@ -743,7 +726,6 @@ public final class DeviceConfig { * @see #addOnPropertiesChangedListener(String, Executor, OnPropertiesChangedListener) */ @SystemApi - @TestApi public static void removeOnPropertiesChangedListener( @NonNull OnPropertiesChangedListener onPropertiesChangedListener) { Preconditions.checkNotNull(onPropertiesChangedListener); @@ -878,7 +860,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public interface OnPropertiesChangedListener { /** * Called when one or more properties have changed, providing a Properties object with all @@ -899,7 +880,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static class BadConfigException extends Exception {} /** @@ -908,7 +888,6 @@ public final class DeviceConfig { * @hide */ @SystemApi - @TestApi public static class Properties { private final String mNamespace; private final HashMap mMap; diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 8f69edb982cb..062d92900643 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -22,7 +22,6 @@ import static com.android.internal.util.Preconditions.checkCollectionNotEmpty; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ContentProvider; import android.content.ContentResolver; @@ -1304,7 +1303,6 @@ public final class DocumentsContract { * {@hide} */ @SystemApi - @TestApi public static @NonNull Uri setManageMode(@NonNull Uri uri) { Preconditions.checkNotNull(uri, "uri can not be null"); return uri.buildUpon().appendQueryParameter(PARAM_MANAGE, "true").build(); @@ -1316,7 +1314,6 @@ public final class DocumentsContract { * {@hide} */ @SystemApi - @TestApi public static boolean isManageMode(@NonNull Uri uri) { Preconditions.checkNotNull(uri, "uri can not be null"); return uri.getBooleanQueryParameter(PARAM_MANAGE, false); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2eee6436beae..0e3708e04dd9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -229,7 +229,6 @@ public final class Settings { */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SystemApi - @TestApi public static final String ACTION_TETHER_PROVISIONING_UI = "android.settings.TETHER_PROVISIONING_UI"; @@ -1053,7 +1052,6 @@ public final class Settings { * * @hide */ - @TestApi @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_MANAGE_APP_OVERLAY_PERMISSION = @@ -2017,7 +2015,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS"; @@ -2100,7 +2097,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE"; @@ -5580,7 +5576,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull ContentResolver resolver, @Nullable String tag) { @@ -6051,7 +6046,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification"; @@ -6085,7 +6079,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE = "autofill_user_data_max_user_data_size"; @@ -6096,7 +6089,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE = "autofill_user_data_max_field_classification_size"; @@ -6107,7 +6099,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT = "autofill_user_data_max_category_count"; @@ -6117,7 +6108,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_USER_DATA_MAX_VALUE_LENGTH = "autofill_user_data_max_value_length"; @@ -6127,7 +6117,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length"; @@ -6177,7 +6166,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String USER_SETUP_COMPLETE = "user_setup_complete"; /** @@ -6553,7 +6541,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications"; @@ -7841,7 +7828,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String DOZE_ALWAYS_ON = "doze_always_on"; /** @@ -8274,7 +8260,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications"; @@ -8961,7 +8946,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis"; @@ -8970,7 +8954,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis"; @@ -10391,7 +10374,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled"; /** @@ -13369,7 +13351,6 @@ public final class Settings { * @hide */ @SystemApi - @TestApi public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages"; diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 79d6bb4a062a..2c735fd9012f 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4045,7 +4045,6 @@ public final class Telephony { * @hide */ @SystemApi - @TestApi public static final class CellBroadcasts implements BaseColumns { /** diff --git a/core/java/android/service/appprediction/AppPredictionService.java b/core/java/android/service/appprediction/AppPredictionService.java index be20570ef62d..2d8aee567010 100644 --- a/core/java/android/service/appprediction/AppPredictionService.java +++ b/core/java/android/service/appprediction/AppPredictionService.java @@ -22,7 +22,6 @@ import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.app.prediction.AppPredictionContext; import android.app.prediction.AppPredictionSessionId; @@ -52,7 +51,6 @@ import java.util.function.Consumer; * @hide */ @SystemApi -@TestApi public abstract class AppPredictionService extends Service { private static final String TAG = "AppPredictionService"; diff --git a/core/java/android/service/autofill/AutofillFieldClassificationService.java b/core/java/android/service/autofill/AutofillFieldClassificationService.java index 28842a7fa1d7..9d9b881ebdfc 100644 --- a/core/java/android/service/autofill/AutofillFieldClassificationService.java +++ b/core/java/android/service/autofill/AutofillFieldClassificationService.java @@ -20,7 +20,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.os.Bundle; @@ -53,7 +52,6 @@ import java.util.Map; * {@hide} */ @SystemApi -@TestApi public abstract class AutofillFieldClassificationService extends Service { private static final String TAG = "AutofillFieldClassificationService"; @@ -121,7 +119,6 @@ public abstract class AutofillFieldClassificationService extends Service { /** @hide */ @SystemApi - @TestApi public AutofillFieldClassificationService() { } diff --git a/core/java/android/service/autofill/Dataset.java b/core/java/android/service/autofill/Dataset.java index 2d99c413cc89..18d79927388b 100644 --- a/core/java/android/service/autofill/Dataset.java +++ b/core/java/android/service/autofill/Dataset.java @@ -21,7 +21,6 @@ import static android.view.autofill.Helper.sDebug; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.IntentSender; import android.os.Parcel; import android.os.Parcelable; @@ -249,7 +248,6 @@ public final class Dataset implements Parcelable { * @hide */ @SystemApi - @TestApi public Builder(@NonNull InlinePresentation inlinePresentation) { Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null"); mInlinePresentation = inlinePresentation; @@ -604,7 +602,6 @@ public final class Dataset implements Parcelable { * @hide */ @SystemApi - @TestApi public @NonNull Builder setFieldInlinePresentation(@NonNull AutofillId id, @Nullable AutofillValue value, @Nullable Pattern filter, @NonNull InlinePresentation inlinePresentation) { diff --git a/core/java/android/service/autofill/InlineSuggestionRenderService.java b/core/java/android/service/autofill/InlineSuggestionRenderService.java index 839caff5c3d4..cdcd65910974 100644 --- a/core/java/android/service/autofill/InlineSuggestionRenderService.java +++ b/core/java/android/service/autofill/InlineSuggestionRenderService.java @@ -20,7 +20,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.content.IntentSender; @@ -51,7 +50,6 @@ import java.lang.ref.WeakReference; * {@hide} */ @SystemApi -@TestApi public abstract class InlineSuggestionRenderService extends Service { private static final String TAG = "InlineSuggestionRenderService"; diff --git a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java b/core/java/android/service/autofill/augmented/AugmentedAutofillService.java index 620c457024b8..b34c2dceeee8 100644 --- a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java +++ b/core/java/android/service/autofill/augmented/AugmentedAutofillService.java @@ -25,7 +25,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.ComponentName; import android.content.Intent; @@ -70,7 +69,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public abstract class AugmentedAutofillService extends Service { private static final String TAG = AugmentedAutofillService.class.getSimpleName(); diff --git a/core/java/android/service/autofill/augmented/FillCallback.java b/core/java/android/service/autofill/augmented/FillCallback.java index fc3baf1c9836..9fc7f34ec0ef 100644 --- a/core/java/android/service/autofill/augmented/FillCallback.java +++ b/core/java/android/service/autofill/augmented/FillCallback.java @@ -20,7 +20,6 @@ import static android.service.autofill.augmented.AugmentedAutofillService.sDebug import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.service.autofill.Dataset; import android.service.autofill.augmented.AugmentedAutofillService.AutofillProxy; @@ -34,7 +33,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public final class FillCallback { private static final String TAG = FillCallback.class.getSimpleName(); diff --git a/core/java/android/service/autofill/augmented/FillController.java b/core/java/android/service/autofill/augmented/FillController.java index 7d552d62fa72..7cd674e847fd 100644 --- a/core/java/android/service/autofill/augmented/FillController.java +++ b/core/java/android/service/autofill/augmented/FillController.java @@ -19,7 +19,6 @@ import static android.service.autofill.augmented.AugmentedAutofillService.sDebug import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.service.autofill.augmented.AugmentedAutofillService.AutofillProxy; import android.util.Log; @@ -37,7 +36,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public final class FillController { private static final String TAG = FillController.class.getSimpleName(); diff --git a/core/java/android/service/autofill/augmented/FillResponse.java b/core/java/android/service/autofill/augmented/FillResponse.java index f72eb782c407..53484cf200c4 100644 --- a/core/java/android/service/autofill/augmented/FillResponse.java +++ b/core/java/android/service/autofill/augmented/FillResponse.java @@ -18,7 +18,6 @@ package android.service.autofill.augmented; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.service.autofill.Dataset; @@ -33,7 +32,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi @DataClass( genBuilder = true, genHiddenGetters = true) diff --git a/core/java/android/service/autofill/augmented/FillWindow.java b/core/java/android/service/autofill/augmented/FillWindow.java index 8e866466e8df..d4f7e114c291 100644 --- a/core/java/android/service/autofill/augmented/FillWindow.java +++ b/core/java/android/service/autofill/augmented/FillWindow.java @@ -23,7 +23,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.graphics.Rect; import android.os.Handler; import android.os.Looper; @@ -64,7 +63,6 @@ import java.lang.ref.WeakReference; * @hide */ @SystemApi -@TestApi public final class FillWindow implements AutoCloseable { private static final String TAG = FillWindow.class.getSimpleName(); diff --git a/core/java/android/service/autofill/augmented/PresentationParams.java b/core/java/android/service/autofill/augmented/PresentationParams.java index 8b3a001f58e6..fe78d2218266 100644 --- a/core/java/android/service/autofill/augmented/PresentationParams.java +++ b/core/java/android/service/autofill/augmented/PresentationParams.java @@ -18,7 +18,6 @@ package android.service.autofill.augmented; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.graphics.Rect; import android.service.autofill.augmented.AugmentedAutofillService.AutofillProxy; import android.view.View; @@ -36,7 +35,6 @@ import java.io.PrintWriter; * @hide */ @SystemApi -@TestApi public abstract class PresentationParams { // /** @hide */ @@ -61,7 +59,6 @@ public abstract class PresentationParams { * @hide */ @SystemApi - @TestApi public abstract static class Area { /** @hide */ diff --git a/core/java/android/service/contentcapture/ActivityEvent.java b/core/java/android/service/contentcapture/ActivityEvent.java index b741cff9328e..1188a3f1021e 100644 --- a/core/java/android/service/contentcapture/ActivityEvent.java +++ b/core/java/android/service/contentcapture/ActivityEvent.java @@ -19,7 +19,6 @@ package android.service.contentcapture; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.usage.UsageEvents.Event; import android.content.ComponentName; import android.os.Parcel; @@ -34,7 +33,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class ActivityEvent implements Parcelable { /** diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index 84f602820f4a..3c44cfd4c7f6 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -26,7 +26,6 @@ import android.annotation.CallSuper; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.ComponentName; import android.content.ContentCaptureOptions; @@ -74,7 +73,6 @@ import java.util.function.Consumer; * @hide */ @SystemApi -@TestApi public abstract class ContentCaptureService extends Service { private static final String TAG = ContentCaptureService.class.getSimpleName(); @@ -344,7 +342,6 @@ public abstract class ContentCaptureService extends Service { * @hide */ @SystemApi - @TestApi public void onDataShareRequest(@NonNull DataShareRequest request, @NonNull DataShareCallback callback) { if (sVerbose) Log.v(TAG, "onDataShareRequest()"); diff --git a/core/java/android/service/contentcapture/DataShareCallback.java b/core/java/android/service/contentcapture/DataShareCallback.java index 5df8a4b174bf..e3c7bb3cd24f 100644 --- a/core/java/android/service/contentcapture/DataShareCallback.java +++ b/core/java/android/service/contentcapture/DataShareCallback.java @@ -19,7 +19,6 @@ package android.service.contentcapture; import android.annotation.CallbackExecutor; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import java.util.concurrent.Executor; @@ -33,7 +32,6 @@ import java.util.concurrent.Executor; * @hide **/ @SystemApi -@TestApi public interface DataShareCallback { /** Accept the data share. diff --git a/core/java/android/service/contentcapture/DataShareReadAdapter.java b/core/java/android/service/contentcapture/DataShareReadAdapter.java index 8cd9eea1e6e0..4526aba6933b 100644 --- a/core/java/android/service/contentcapture/DataShareReadAdapter.java +++ b/core/java/android/service/contentcapture/DataShareReadAdapter.java @@ -18,7 +18,6 @@ package android.service.contentcapture; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.ParcelFileDescriptor; import android.view.contentcapture.ContentCaptureManager.DataShareError; @@ -29,7 +28,6 @@ import android.view.contentcapture.ContentCaptureManager.DataShareError; * @hide **/ @SystemApi -@TestApi public interface DataShareReadAdapter { /** diff --git a/core/java/android/service/contentcapture/SnapshotData.java b/core/java/android/service/contentcapture/SnapshotData.java index 5b3930ab6336..bf469b4b3ad8 100644 --- a/core/java/android/service/contentcapture/SnapshotData.java +++ b/core/java/android/service/contentcapture/SnapshotData.java @@ -19,7 +19,6 @@ package android.service.contentcapture; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.assist.AssistContent; import android.app.assist.AssistStructure; import android.os.Bundle; @@ -32,7 +31,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class SnapshotData implements Parcelable { private final @NonNull Bundle mAssistData; diff --git a/core/java/android/service/notification/Adjustment.java b/core/java/android/service/notification/Adjustment.java index 8464c6df4425..4b25c8832068 100644 --- a/core/java/android/service/notification/Adjustment.java +++ b/core/java/android/service/notification/Adjustment.java @@ -19,7 +19,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringDef; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Notification; import android.os.Bundle; import android.os.Parcel; @@ -42,7 +41,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class Adjustment implements Parcelable { private final String mPackage; private final String mKey; @@ -148,7 +146,6 @@ public final class Adjustment implements Parcelable { * @hide */ @SystemApi - @TestApi public Adjustment(String pkg, String key, Bundle signals, CharSequence explanation, int user) { mPackage = pkg; mKey = key; @@ -232,7 +229,6 @@ public final class Adjustment implements Parcelable { /** @hide */ @SystemApi - @TestApi public int getUser() { return mUser; } diff --git a/core/java/android/service/notification/NotificationAssistantService.java b/core/java/android/service/notification/NotificationAssistantService.java index 975e75ccaeeb..632014936425 100644 --- a/core/java/android/service/notification/NotificationAssistantService.java +++ b/core/java/android/service/notification/NotificationAssistantService.java @@ -23,7 +23,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -66,7 +65,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public abstract class NotificationAssistantService extends NotificationListenerService { private static final String TAG = "NotificationAssistants"; diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index e1b2dfb3c3f0..25f140f29e00 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -22,7 +22,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.ActivityManager; import android.app.INotificationManager; import android.app.Notification; @@ -452,7 +451,6 @@ public abstract class NotificationListenerService extends Service { * * @hide */ - @TestApi @SystemApi public void onNotificationRemoved(@NonNull StatusBarNotification sbn, @NonNull RankingMap rankingMap, @NonNull NotificationStats stats, int reason) { diff --git a/core/java/android/service/notification/NotificationStats.java b/core/java/android/service/notification/NotificationStats.java index 2cd8b8ba42d9..206e4fa4fb11 100644 --- a/core/java/android/service/notification/NotificationStats.java +++ b/core/java/android/service/notification/NotificationStats.java @@ -19,7 +19,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.RemoteInput; import android.os.Parcel; import android.os.Parcelable; @@ -31,7 +30,6 @@ import java.lang.annotation.RetentionPolicy; * Information about how the user has interacted with a given notification. * @hide */ -@TestApi @SystemApi public final class NotificationStats implements Parcelable { diff --git a/core/java/android/service/notification/SnoozeCriterion.java b/core/java/android/service/notification/SnoozeCriterion.java index eb624c9d85f4..d3da07a6fb80 100644 --- a/core/java/android/service/notification/SnoozeCriterion.java +++ b/core/java/android/service/notification/SnoozeCriterion.java @@ -17,7 +17,6 @@ package android.service.notification; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -27,7 +26,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class SnoozeCriterion implements Parcelable { private final String mId; private final CharSequence mExplanation; diff --git a/core/java/android/service/textclassifier/TextClassifierService.java b/core/java/android/service/textclassifier/TextClassifierService.java index 93faa5872a69..1fb18fab3775 100644 --- a/core/java/android/service/textclassifier/TextClassifierService.java +++ b/core/java/android/service/textclassifier/TextClassifierService.java @@ -22,7 +22,6 @@ import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.ComponentName; import android.content.Context; @@ -88,7 +87,6 @@ import java.util.concurrent.Executors; * @hide */ @SystemApi -@TestApi public abstract class TextClassifierService extends Service { private static final String LOG_TAG = "TextClassifierService"; diff --git a/core/java/android/service/watchdog/ExplicitHealthCheckService.java b/core/java/android/service/watchdog/ExplicitHealthCheckService.java index b1647fe0fcf9..49e00d6f6328 100644 --- a/core/java/android/service/watchdog/ExplicitHealthCheckService.java +++ b/core/java/android/service/watchdog/ExplicitHealthCheckService.java @@ -66,7 +66,6 @@ import java.util.concurrent.TimeUnit; * * @hide */ -@TestApi @SystemApi public abstract class ExplicitHealthCheckService extends Service { @@ -195,7 +194,6 @@ public abstract class ExplicitHealthCheckService extends Service { * * @hide */ - @TestApi @SystemApi public static final class PackageConfig implements Parcelable { private static final long DEFAULT_HEALTH_CHECK_TIMEOUT_MILLIS = TimeUnit.HOURS.toMillis(1); diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index 70c11f282a2b..6a5d5c63cb4d 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -20,7 +20,6 @@ import android.Manifest; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.ChangeId; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; @@ -437,7 +436,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 0x10000000; @@ -450,7 +448,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 0x20000000; @@ -969,7 +966,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi @Deprecated public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) { // default implementation empty @@ -994,7 +990,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber, int subscriptionId) { // Default implementation for backwards compatibility @@ -1011,7 +1006,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi @Deprecated public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) { // default implementation empty @@ -1033,7 +1027,6 @@ public class PhoneStateListener { * @hide */ @SystemApi - @TestApi public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber, int subscriptionId) { // Default implementation for backwards compatibility diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index aed9b89747d0..a9e8d5498a57 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -1249,7 +1249,6 @@ public final class AccessibilityManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) public void performAccessibilityShortcut() { performAccessibilityShortcut(null); @@ -1294,7 +1293,6 @@ public final class AccessibilityManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) public void registerSystemAction(@NonNull RemoteAction action, int actionId) { final IAccessibilityManager service; @@ -1322,7 +1320,6 @@ public final class AccessibilityManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.MANAGE_ACCESSIBILITY) public void unregisterSystemAction(int actionId) { final IAccessibilityManager service; diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 9ba886aba81a..fb66b5298839 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -2076,7 +2076,6 @@ public final class AutofillManager { * @hide */ @SystemApi - @TestApi public void setAugmentedAutofillWhitelist(@Nullable Set packages, @Nullable Set activities) { if (!hasAutofillFeature()) { diff --git a/core/java/android/view/contentcapture/ContentCaptureContext.java b/core/java/android/view/contentcapture/ContentCaptureContext.java index b84cb88ccd84..9bf3626fe868 100644 --- a/core/java/android/view/contentcapture/ContentCaptureContext.java +++ b/core/java/android/view/contentcapture/ContentCaptureContext.java @@ -21,7 +21,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.TaskInfo; import android.content.ComponentName; import android.content.Context; @@ -58,7 +57,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int FLAG_DISABLED_BY_APP = 0x1; /** @@ -69,7 +67,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int FLAG_DISABLED_BY_FLAG_SECURE = 0x2; /** @@ -79,7 +76,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public static final int FLAG_RECONNECTED = 0x4; /** @hide */ @@ -173,7 +169,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public int getTaskId() { return mTaskId; } @@ -184,7 +179,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public @Nullable ComponentName getActivityComponent() { return mComponentName; } @@ -197,7 +191,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public @Nullable ContentCaptureSessionId getParentSessionId() { return mParentSessionId == NO_SESSION_ID ? null : new ContentCaptureSessionId(mParentSessionId); @@ -215,7 +208,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public int getDisplayId() { return mDisplayId; } @@ -229,7 +221,6 @@ public final class ContentCaptureContext implements Parcelable { * @hide */ @SystemApi - @TestApi public @ContextCreationFlags int getFlags() { return mFlags; } diff --git a/core/java/android/view/contentcapture/ContentCaptureEvent.java b/core/java/android/view/contentcapture/ContentCaptureEvent.java index f49b1beee8ad..2b12230510bf 100644 --- a/core/java/android/view/contentcapture/ContentCaptureEvent.java +++ b/core/java/android/view/contentcapture/ContentCaptureEvent.java @@ -22,7 +22,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.graphics.Insets; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +38,6 @@ import java.util.List; /** @hide */ @SystemApi -@TestApi public final class ContentCaptureEvent implements Parcelable { private static final String TAG = ContentCaptureEvent.class.getSimpleName(); diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java index 029552d4902e..10f6c610d5d3 100644 --- a/core/java/android/view/contentcapture/ContentCaptureManager.java +++ b/core/java/android/view/contentcapture/ContentCaptureManager.java @@ -644,7 +644,6 @@ public final class ContentCaptureManager { * @hide */ @SystemApi - @TestApi public boolean isContentCaptureFeatureEnabled() { final SyncResultReceiver resultReceiver = syncRun( (r) -> mService.isContentCaptureFeatureEnabled(r)); diff --git a/core/java/android/view/contentcapture/ViewNode.java b/core/java/android/view/contentcapture/ViewNode.java index e035c620d1fd..e731d4b76fb9 100644 --- a/core/java/android/view/contentcapture/ViewNode.java +++ b/core/java/android/view/contentcapture/ViewNode.java @@ -42,7 +42,6 @@ import com.android.internal.util.Preconditions; // instead /** @hide */ @SystemApi -@TestApi public final class ViewNode extends AssistStructure.ViewNode { private static final String TAG = ViewNode.class.getSimpleName(); diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java index c8d4be319bab..f48da74eb397 100644 --- a/keystore/java/android/security/keystore/AttestationUtils.java +++ b/keystore/java/android/security/keystore/AttestationUtils.java @@ -20,7 +20,6 @@ import android.Manifest; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Context; import android.os.Build; import android.security.KeyStore; @@ -44,7 +43,6 @@ import java.util.Set; * @hide */ @SystemApi -@TestApi public abstract class AttestationUtils { private AttestationUtils() { } diff --git a/keystore/java/android/security/keystore/DeviceIdAttestationException.java b/keystore/java/android/security/keystore/DeviceIdAttestationException.java index 8ba0317845d0..4f9f9e633a98 100644 --- a/keystore/java/android/security/keystore/DeviceIdAttestationException.java +++ b/keystore/java/android/security/keystore/DeviceIdAttestationException.java @@ -18,7 +18,6 @@ package android.security.keystore; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; /** * Thrown when {@link AttestationUtils} is unable to attest the given device ids. @@ -26,7 +25,6 @@ import android.annotation.TestApi; * @hide */ @SystemApi -@TestApi public class DeviceIdAttestationException extends Exception { /** * Constructs a new {@code DeviceIdAttestationException} with the current stack trace and the diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 46bd22148fb2..62b4bc173bb9 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -19,7 +19,6 @@ package android.location; import static java.util.concurrent.TimeUnit.NANOSECONDS; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Bundle; @@ -75,7 +74,6 @@ public class Location implements Parcelable { * gps locations separate from other locations for coarsening. Providers that do not need to * support platforms below Android R should not use this constant. */ - @TestApi @SystemApi @Deprecated public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation"; @@ -1074,7 +1072,6 @@ public class Location implements Parcelable { * @see #isComplete * @hide */ - @TestApi @SystemApi public void makeComplete() { if (mProvider == null) mProvider = "?"; diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 30a4ada1b388..ac775ca05cab 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -575,7 +575,6 @@ public class LocationManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean enabled, @NonNull UserHandle userHandle) { try { @@ -751,7 +750,6 @@ public class LocationManager { */ @Deprecated @SystemApi - @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void getCurrentLocation(@NonNull LocationRequest locationRequest, @Nullable CancellationSignal cancellationSignal, @@ -1192,7 +1190,6 @@ public class LocationManager { */ @Deprecated @SystemApi - @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates( @Nullable LocationRequest locationRequest, @@ -1223,7 +1220,6 @@ public class LocationManager { */ @Deprecated @SystemApi - @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates( @Nullable LocationRequest locationRequest, @@ -1255,7 +1251,6 @@ public class LocationManager { */ @Deprecated @SystemApi - @TestApi @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates( @Nullable LocationRequest locationRequest, diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 4977c2161be9..3046cfd7c32b 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -27,7 +27,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.compat.annotation.UnsupportedAppUsage; @@ -101,7 +100,6 @@ public final class LocationRequest implements Parcelable { */ @Deprecated @SystemApi - @TestApi public static final int ACCURACY_FINE = QUALITY_HIGH_ACCURACY; /** @@ -116,7 +114,6 @@ public final class LocationRequest implements Parcelable { */ @Deprecated @SystemApi - @TestApi public static final int ACCURACY_BLOCK = QUALITY_BALANCED_POWER_ACCURACY; /** @@ -131,7 +128,6 @@ public final class LocationRequest implements Parcelable { */ @Deprecated @SystemApi - @TestApi public static final int ACCURACY_CITY = QUALITY_LOW_POWER; /** @@ -159,7 +155,6 @@ public final class LocationRequest implements Parcelable { */ @Deprecated @SystemApi - @TestApi public static final int POWER_LOW = 201; /** @@ -172,7 +167,6 @@ public final class LocationRequest implements Parcelable { */ @Deprecated @SystemApi - @TestApi public static final int POWER_HIGH = 203; private static final long IMPLICIT_MIN_UPDATE_INTERVAL = -1; @@ -618,7 +612,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean isHiddenFromAppOps() { return mHideFromAppOps; @@ -644,7 +637,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean isLocationSettingsIgnored() { return mLocationSettingsIgnored; @@ -680,7 +672,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi public boolean isLowPower() { return mLowPower; @@ -707,7 +698,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi public @NonNull WorkSource getWorkSource() { return mWorkSource; @@ -1038,7 +1028,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi @RequiresPermission(Manifest.permission.UPDATE_APP_OPS_STATS) public @NonNull Builder setHiddenFromAppOps(boolean hiddenFromAppOps) { @@ -1057,7 +1046,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) public @NonNull Builder setLocationSettingsIgnored(boolean locationSettingsIgnored) { @@ -1075,7 +1063,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi @RequiresPermission(Manifest.permission.LOCATION_HARDWARE) public @NonNull Builder setLowPower(boolean lowPower) { @@ -1093,7 +1080,6 @@ public final class LocationRequest implements Parcelable { * * @hide */ - @TestApi @SystemApi @RequiresPermission(Manifest.permission.UPDATE_DEVICE_STATS) public @NonNull Builder setWorkSource(@Nullable WorkSource workSource) { diff --git a/media/java/android/media/AudioFocusInfo.java b/media/java/android/media/AudioFocusInfo.java index 675cf7360b82..3647b6ebcfbc 100644 --- a/media/java/android/media/AudioFocusInfo.java +++ b/media/java/android/media/AudioFocusInfo.java @@ -19,7 +19,6 @@ package android.media; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +28,6 @@ import java.util.Objects; * @hide * A class to encapsulate information about an audio focus owner or request. */ -@TestApi @SystemApi public final class AudioFocusInfo implements Parcelable { diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 22b5ca53e7e9..195122db146a 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3916,7 +3916,6 @@ public class AudioManager { * @param requestResult the result to the focus request to be passed to the requester * @param ap a valid registered {@link AudioPolicy} configured as a focus policy. */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull AudioFocusInfo afi, @@ -3956,7 +3955,6 @@ public class AudioManager { * if there was an error sending the request. * @throws NullPointerException if the {@link AudioFocusInfo} or {@link AudioPolicy} are null. */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull AudioFocusInfo afi, int focusChange, @@ -4219,7 +4217,6 @@ public class AudioManager { * {@link android.Manifest.permission#MODIFY_AUDIO_ROUTING} permission, * {@link #SUCCESS} otherwise. */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull AudioPolicy policy) { @@ -4254,7 +4251,6 @@ public class AudioManager { * Unregisters an {@link AudioPolicy} asynchronously. * @param policy the non-null {@link AudioPolicy} to unregister. */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicyAsync(@NonNull AudioPolicy policy) { @@ -4281,7 +4277,6 @@ public class AudioManager { * associated with mixes of this policy. * @param policy the non-null {@link AudioPolicy} to unregister. */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicy(@NonNull AudioPolicy policy) { @@ -5619,7 +5614,6 @@ public class AudioManager { */ /** @hide */ - @TestApi @SystemApi public static final int SUCCESS = AudioSystem.SUCCESS; /** diff --git a/media/java/android/media/MediaTranscodeManager.java b/media/java/android/media/MediaTranscodeManager.java index 8676462c5c54..046403670693 100644 --- a/media/java/android/media/MediaTranscodeManager.java +++ b/media/java/android/media/MediaTranscodeManager.java @@ -22,7 +22,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; @@ -101,7 +100,6 @@ import java.util.concurrent.Executors; TODO(hkuang): Clarify whether supports framerate conversion. @hide */ -@TestApi @SystemApi public final class MediaTranscodeManager { private static final String TAG = "MediaTranscodeManager"; diff --git a/media/java/android/media/audiopolicy/AudioMix.java b/media/java/android/media/audiopolicy/AudioMix.java index 61113bc858db..4e451c6e42b1 100644 --- a/media/java/android/media/audiopolicy/AudioMix.java +++ b/media/java/android/media/audiopolicy/AudioMix.java @@ -19,7 +19,6 @@ package android.media.audiopolicy; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioDeviceInfo; import android.media.AudioFormat; @@ -32,7 +31,6 @@ import java.util.Objects; /** * @hide */ -@TestApi @SystemApi public class AudioMix { diff --git a/media/java/android/media/audiopolicy/AudioMixingRule.java b/media/java/android/media/audiopolicy/AudioMixingRule.java index 68c9593d102d..f6f982a4ebe2 100644 --- a/media/java/android/media/audiopolicy/AudioMixingRule.java +++ b/media/java/android/media/audiopolicy/AudioMixingRule.java @@ -18,7 +18,6 @@ package android.media.audiopolicy; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioAttributes; import android.os.Parcel; @@ -42,7 +41,6 @@ import java.util.Objects; * .build(); * */ -@TestApi @SystemApi public class AudioMixingRule { diff --git a/media/java/android/media/audiopolicy/AudioPolicy.java b/media/java/android/media/audiopolicy/AudioPolicy.java index 8a17465c53b3..3e8d76ac7551 100644 --- a/media/java/android/media/audiopolicy/AudioPolicy.java +++ b/media/java/android/media/audiopolicy/AudioPolicy.java @@ -58,7 +58,6 @@ import java.util.Objects; * @hide * AudioPolicy provides access to the management of audio routing and audio focus. */ -@TestApi @SystemApi public class AudioPolicy { @@ -418,7 +417,6 @@ public class AudioPolicy { * @param devices list of devices to which the audio stream of the application may be routed. * @return true if the change was successful, false otherwise. */ - @TestApi @SystemApi public boolean setUidDeviceAffinity(int uid, @NonNull List devices) { if (devices == null) { @@ -460,7 +458,6 @@ public class AudioPolicy { * @param uid UID of the application affected. * @return true if the change was successful, false otherwise. */ - @TestApi @SystemApi public boolean removeUidDeviceAffinity(int uid) { synchronized (mLock) { @@ -486,7 +483,6 @@ public class AudioPolicy { * {@link UserHandle#getIdentifier}. Not to be confused with application uid. * @return true if the change was successful, false otherwise. */ - @TestApi @SystemApi public boolean removeUserIdDeviceAffinity(@UserIdInt int userId) { synchronized (mLock) { @@ -519,7 +515,6 @@ public class AudioPolicy { * @param devices list of devices to which the audio stream of the application may be routed. * @return true if the change was successful, false otherwise. */ - @TestApi @SystemApi public boolean setUserIdDeviceAffinity(@UserIdInt int userId, @NonNull List devices) { diff --git a/media/java/android/media/musicrecognition/MusicRecognitionManager.java b/media/java/android/media/musicrecognition/MusicRecognitionManager.java index c7f55dfe1c76..6bbcfd3b5b66 100644 --- a/media/java/android/media/musicrecognition/MusicRecognitionManager.java +++ b/media/java/android/media/musicrecognition/MusicRecognitionManager.java @@ -25,7 +25,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.content.Context; import android.media.MediaMetadata; import android.os.Bundle; @@ -41,7 +40,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi @SystemService(Context.MUSIC_RECOGNITION_SERVICE) public class MusicRecognitionManager { diff --git a/media/java/android/media/musicrecognition/MusicRecognitionService.java b/media/java/android/media/musicrecognition/MusicRecognitionService.java index b75d2c4f1e50..e2071b84c00b 100644 --- a/media/java/android/media/musicrecognition/MusicRecognitionService.java +++ b/media/java/android/media/musicrecognition/MusicRecognitionService.java @@ -21,7 +21,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.media.AudioFormat; @@ -41,7 +40,6 @@ import android.util.Log; * @hide */ @SystemApi -@TestApi public abstract class MusicRecognitionService extends Service { private static final String TAG = MusicRecognitionService.class.getSimpleName(); diff --git a/media/java/android/media/musicrecognition/RecognitionRequest.java b/media/java/android/media/musicrecognition/RecognitionRequest.java index 65b2ccd37f79..e4f484873cd4 100644 --- a/media/java/android/media/musicrecognition/RecognitionRequest.java +++ b/media/java/android/media/musicrecognition/RecognitionRequest.java @@ -23,7 +23,6 @@ import static java.util.Objects.requireNonNull; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.media.AudioAttributes; import android.media.AudioFormat; import android.media.AudioRecord; @@ -37,7 +36,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class RecognitionRequest implements Parcelable { @NonNull private final AudioAttributes mAudioAttributes; @NonNull private final AudioFormat mAudioFormat; @@ -82,7 +80,6 @@ public final class RecognitionRequest implements Parcelable { * @hide */ @SystemApi - @TestApi public static final class Builder { private AudioFormat mAudioFormat = new AudioFormat.Builder() .setSampleRate(16000) diff --git a/media/java/android/media/tv/tuner/TunerVersionChecker.java b/media/java/android/media/tv/tuner/TunerVersionChecker.java index 739f87dd711d..b40ba1e763c1 100644 --- a/media/java/android/media/tv/tuner/TunerVersionChecker.java +++ b/media/java/android/media/tv/tuner/TunerVersionChecker.java @@ -31,7 +31,6 @@ import java.lang.annotation.RetentionPolicy; * * @hide */ -@TestApi @SystemApi public final class TunerVersionChecker { private static final String TAG = "TunerVersionChecker"; diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 9f16543c410e..a85eb53605d6 100755 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -1683,7 +1683,6 @@ public final class Call { * @hide */ @SystemApi - @TestApi public void enterBackgroundAudioProcessing() { if (mState != STATE_ACTIVE && mState != STATE_RINGING) { throw new IllegalStateException("Call must be active or ringing"); @@ -1704,7 +1703,6 @@ public final class Call { * @hide */ @SystemApi - @TestApi public void exitBackgroundAudioProcessing(boolean shouldRing) { if (mState != STATE_AUDIO_PROCESSING) { throw new IllegalStateException("Call must in the audio processing state"); diff --git a/telecomm/java/android/telecom/CallScreeningService.java b/telecomm/java/android/telecom/CallScreeningService.java index 49f183151e27..7988b036ccd3 100644 --- a/telecomm/java/android/telecom/CallScreeningService.java +++ b/telecomm/java/android/telecom/CallScreeningService.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.ComponentName; import android.content.Intent; @@ -323,7 +322,6 @@ public abstract class CallScreeningService extends Service { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.CAPTURE_AUDIO_OUTPUT) public @NonNull Builder setShouldScreenCallViaAudioProcessing( boolean shouldScreenCallViaAudioProcessing) { diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 39c3ff9e8839..dc2fb948fdbe 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -24,7 +24,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; @@ -137,7 +136,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi public final @NonNull String getTelecomCallId() { return mTelecomCallId; } @@ -609,7 +607,6 @@ public abstract class Conference extends Conferenceable { * @return The primary connection. * @hide */ - @TestApi @SystemApi public Connection getPrimaryConnection() { if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) { @@ -1012,7 +1009,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public void setConferenceState(boolean isConference) { mIsMultiparty = isConference; @@ -1067,7 +1063,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public final void setAddress(@NonNull Uri address, @TelecomManager.Presentation int presentation) { @@ -1155,7 +1150,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi public final void setCallerDisplayName(@NonNull String callerDisplayName, @TelecomManager.Presentation int presentation) { Log.d(this, "setCallerDisplayName %s", callerDisplayName); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java old mode 100755 new mode 100644 index 00b711643fe6..bbf34df8fe84 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -25,7 +25,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Notification; import android.bluetooth.BluetoothDevice; import android.compat.annotation.UnsupportedAppUsage; @@ -307,7 +306,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 0x00040000; /** @@ -345,7 +343,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int CAPABILITY_CONFERENCE_HAS_NO_CHILDREN = 0x00200000; /** @@ -417,7 +414,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 1<<0; /** @@ -428,7 +424,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int PROPERTY_GENERIC_CONFERENCE = 1<<1; /** @@ -480,7 +475,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 1<<6; /** @@ -524,7 +518,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final int PROPERTY_REMOTELY_HOSTED = 1 << 11; /** @@ -702,7 +695,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public static final String EXTRA_DISABLE_ADD_CALL = "android.telecom.extra.DISABLE_ADD_CALL"; @@ -2054,7 +2046,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public final @Nullable String getTelecomCallId() { return mTelecomCallId; } @@ -2171,7 +2162,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public final @IntRange(from = 0) long getConnectTimeMillis() { return mConnectTimeMillis; } @@ -2196,7 +2186,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public final @ElapsedRealtimeLong long getConnectionStartElapsedRealtimeMillis() { return mConnectElapsedTimeMillis; } @@ -2279,7 +2268,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public void setTelecomCallId(@NonNull String callId) { mTelecomCallId = callId; } @@ -2628,7 +2616,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public final void setConnectTimeMillis(@IntRange(from = 0) long connectTimeMillis) { mConnectTimeMillis = connectTimeMillis; @@ -2651,7 +2638,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public final void setConnectionStartElapsedRealtimeMillis( @ElapsedRealtimeLong long connectElapsedTimeMillis) { @@ -2722,7 +2708,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public final void resetConnectionTime() { for (Listener l : mListeners) { l.onConnectionTimeReset(this); @@ -3505,7 +3490,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public void setPhoneAccountHandle(@NonNull PhoneAccountHandle phoneAccountHandle) { if (mPhoneAccountHandle != phoneAccountHandle) { mPhoneAccountHandle = phoneAccountHandle; @@ -3524,7 +3508,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public @Nullable PhoneAccountHandle getPhoneAccountHandle() { return mPhoneAccountHandle; } @@ -3590,7 +3573,6 @@ public abstract class Connection extends Conferenceable { * @hide */ @SystemApi - @TestApi public void setCallDirection(@Call.Details.CallDirection int callDirection) { mCallDirection = callDirection; } diff --git a/telecomm/java/android/telecom/ConnectionRequest.java b/telecomm/java/android/telecom/ConnectionRequest.java index 6d7ceca0a2cd..b73ef9b794e4 100644 --- a/telecomm/java/android/telecom/ConnectionRequest.java +++ b/telecomm/java/android/telecom/ConnectionRequest.java @@ -327,7 +327,6 @@ public final class ConnectionRequest implements Parcelable { * @hide */ @SystemApi - @TestApi public @Nullable String getTelecomCallId() { return mTelecomCallId; } diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 866e17148a1a..5024ae27ee49 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -21,7 +21,6 @@ import static android.Manifest.permission.MODIFY_PHONE_STATE; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Intent; import android.graphics.drawable.Icon; import android.net.Uri; @@ -635,7 +634,6 @@ public final class PhoneAccount implements Parcelable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public @NonNull Builder setGroupId(@NonNull String groupId) { if (groupId != null) { diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestionService.java b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java index ba3822cb9951..8a91b9e9ee81 100644 --- a/telecomm/java/android/telecom/PhoneAccountSuggestionService.java +++ b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java @@ -19,7 +19,6 @@ package android.telecom; import android.annotation.NonNull; import android.annotation.SdkConstant; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.os.IBinder; @@ -57,7 +56,6 @@ import java.util.Map; * @hide */ @SystemApi -@TestApi public class PhoneAccountSuggestionService extends Service { /** * The {@link Intent} that must be declared in the {@code intent-filter} element of the diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index f1deec60aca7..82da4475c1b9 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -25,7 +25,6 @@ import android.annotation.SuppressAutoDoc; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -693,7 +692,6 @@ public class TelecomManager { * * @hide */ - @TestApi @SystemApi public static final int TTY_MODE_OFF = 0; @@ -703,7 +701,6 @@ public class TelecomManager { * * @hide */ - @TestApi @SystemApi public static final int TTY_MODE_FULL = 1; @@ -714,7 +711,6 @@ public class TelecomManager { * * @hide */ - @TestApi @SystemApi public static final int TTY_MODE_HCO = 2; @@ -725,7 +721,6 @@ public class TelecomManager { * * @hide */ - @TestApi @SystemApi public static final int TTY_MODE_VCO = 3; @@ -736,7 +731,6 @@ public class TelecomManager { * TTY mode. * @hide */ - @TestApi @SystemApi public static final String ACTION_CURRENT_TTY_MODE_CHANGED = "android.telecom.action.CURRENT_TTY_MODE_CHANGED"; @@ -759,7 +753,6 @@ public class TelecomManager { * plugged into the device. * @hide */ - @TestApi @SystemApi public static final String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE"; @@ -771,7 +764,6 @@ public class TelecomManager { * preferred TTY mode. * @hide */ - @TestApi @SystemApi public static final String ACTION_TTY_PREFERRED_MODE_CHANGED = "android.telecom.action.TTY_PREFERRED_MODE_CHANGED"; @@ -790,7 +782,6 @@ public class TelecomManager { * * @hide */ - @TestApi @SystemApi public static final String EXTRA_TTY_PREFERRED_MODE = "android.telecom.extra.TTY_PREFERRED_MODE"; @@ -1045,7 +1036,6 @@ public class TelecomManager { * @hide */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) - @TestApi @SystemApi public void setUserSelectedOutgoingPhoneAccount(@Nullable PhoneAccountHandle accountHandle) { try { @@ -1219,7 +1209,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @NonNull List getCallCapablePhoneAccounts( boolean includeDisabledAccounts) { @@ -1453,7 +1442,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @Nullable String getDefaultDialerPackage(@NonNull UserHandle userHandle) { try { @@ -1677,7 +1665,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(anyOf = { READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE @@ -1835,7 +1822,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @TtyMode int getCurrentTtyMode() { try { @@ -2249,7 +2235,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @NonNull public Intent createLaunchEmergencyDialerIntent(@Nullable String number) { ITelecomService service = getTelecomService(); @@ -2402,7 +2387,6 @@ public class TelecomManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall() { try { diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index 39a754389254..d01297147fdb 100644 --- a/telephony/java/android/telephony/AccessNetworkConstants.java +++ b/telephony/java/android/telephony/AccessNetworkConstants.java @@ -18,7 +18,6 @@ package android.telephony; import android.annotation.IntDef; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.hardware.radio.V1_1.GeranBands; import android.hardware.radio.V1_5.AccessNetwork; import android.hardware.radio.V1_5.EutranBands; @@ -49,7 +48,6 @@ public final class AccessNetworkConstants { * @hide */ @SystemApi - @TestApi public static final int TRANSPORT_TYPE_INVALID = -1; /** @@ -438,7 +436,6 @@ public final class AccessNetworkConstants { * @hide */ @SystemApi - @TestApi public static final int FREQUENCY_RANGE_GROUP_UNKNOWN = 0; /** @@ -447,7 +444,6 @@ public final class AccessNetworkConstants { * @hide */ @SystemApi - @TestApi public static final int FREQUENCY_RANGE_GROUP_1 = 1; /** @@ -456,7 +452,6 @@ public final class AccessNetworkConstants { * @hide */ @SystemApi - @TestApi public static final int FREQUENCY_RANGE_GROUP_2 = 2; /** @@ -481,7 +476,6 @@ public final class AccessNetworkConstants { * @hide */ @SystemApi - @TestApi public static @FrequencyRangeGroup int getFrequencyRangeGroup(@NgranBand int band) { switch (band) { case BAND_1: diff --git a/telephony/java/android/telephony/BarringInfo.java b/telephony/java/android/telephony/BarringInfo.java index 92423a2f2218..e9698adc0356 100644 --- a/telephony/java/android/telephony/BarringInfo.java +++ b/telephony/java/android/telephony/BarringInfo.java @@ -252,7 +252,6 @@ public final class BarringInfo implements Parcelable { private SparseArray mBarringServiceInfos; /** @hide */ - @TestApi @SystemApi public BarringInfo() { mBarringServiceInfos = new SparseArray<>(); diff --git a/telephony/java/android/telephony/CallQuality.java b/telephony/java/android/telephony/CallQuality.java index 1effeb774484..fa70c33965ed 100644 --- a/telephony/java/android/telephony/CallQuality.java +++ b/telephony/java/android/telephony/CallQuality.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -41,7 +40,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class CallQuality implements Parcelable { // Constants representing the call quality level (see #CallQuality); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java old mode 100755 new mode 100644 index 8261b53a2c9f..3d33b95d34d2 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -23,7 +23,6 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; @@ -4603,7 +4602,6 @@ public class CarrierConfigManager { */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) @SystemApi - @TestApi public void overrideConfig(int subscriptionId, @Nullable PersistableBundle overrideValues) { overrideConfig(subscriptionId, overrideValues, false); } diff --git a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java index e91d6fc9d801..597fe8f85cfa 100644 --- a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java +++ b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java @@ -19,7 +19,6 @@ package android.telephony; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -31,7 +30,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class DataSpecificRegistrationInfo implements Parcelable { /** * @hide diff --git a/telephony/java/android/telephony/LteVopsSupportInfo.java b/telephony/java/android/telephony/LteVopsSupportInfo.java index 7994c1b05977..83e41bf3df3b 100644 --- a/telephony/java/android/telephony/LteVopsSupportInfo.java +++ b/telephony/java/android/telephony/LteVopsSupportInfo.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class LteVopsSupportInfo implements Parcelable { /**@hide*/ diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java index 881d85c73b5d..e164c4bc2491 100644 --- a/telephony/java/android/telephony/ModemActivityInfo.java +++ b/telephony/java/android/telephony/ModemActivityInfo.java @@ -37,7 +37,6 @@ import java.util.Objects; * @hide */ @SystemApi -@TestApi public final class ModemActivityInfo implements Parcelable { private static final int TX_POWER_LEVELS = 5; diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index aee1e84ca356..92238420fd32 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.telephony.AccessNetworkConstants.TransportType; @@ -71,37 +70,37 @@ public final class NetworkRegistrationInfo implements Parcelable { * Not registered. The device is not currently searching a new operator to register. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; /** * Registered on home network. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_HOME = 1; /** * Not registered. The device is currently searching a new operator to register. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; /** * Registration denied. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_DENIED = 3; /** * Registration state is unknown. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_UNKNOWN = 4; /** * Registered on roaming network. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int REGISTRATION_STATE_ROAMING = 5; /** @hide */ @@ -386,7 +385,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * * @hide */ - @SystemApi @TestApi + @SystemApi public @RegistrationState int getRegistrationState() { return mRegistrationState; } @@ -451,7 +450,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return the current network roaming type. * @hide */ - @SystemApi @TestApi + @SystemApi public @ServiceState.RoamingType int getRoamingType() { return mRoamingType; } @@ -460,7 +459,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return Whether emergency is enabled. * @hide */ - @SystemApi @TestApi + @SystemApi public boolean isEmergencyEnabled() { return mEmergencyOnly; } /** @@ -498,7 +497,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * 10.5.3.6 for UMTS, 3GPP TS 24.301 9.9.3.9 for LTE, and 3GPP2 A.S0001 6.2.2.44 for CDMA * @hide */ - @SystemApi @TestApi + @SystemApi public int getRejectCause() { return mRejectCause; } @@ -545,7 +544,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @hide */ @Nullable - @SystemApi @TestApi + @SystemApi public DataSpecificRegistrationInfo getDataSpecificInfo() { return mDataSpecificInfo; } @@ -680,7 +679,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mDomain); dest.writeInt(mTransportType); @@ -772,7 +771,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * * @hide */ - @SystemApi @TestApi + @SystemApi public static final class Builder { @Domain private int mDomain; @@ -877,7 +876,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return The same instance of the builder. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull Builder setEmergencyOnly(boolean emergencyOnly) { mEmergencyOnly = emergencyOnly; return this; @@ -891,7 +890,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return The same instance of the builder. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull Builder setAvailableServices( @NonNull @ServiceType List availableServices) { mAvailableServices = availableServices; @@ -906,7 +905,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return The same instance of the builder. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull Builder setCellIdentity(@Nullable CellIdentity cellIdentity) { mCellIdentity = cellIdentity; return this; @@ -929,7 +928,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return the NetworkRegistrationInfo object. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull NetworkRegistrationInfo build() { return new NetworkRegistrationInfo(mDomain, mTransportType, mRegistrationState, mAccessNetworkTechnology, mRejectCause, mEmergencyOnly, mAvailableServices, diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index ec9940836afe..58e368bcc444 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -2239,7 +2239,6 @@ public class PhoneNumberUtils { * @hide */ @SystemApi - @TestApi public static boolean isVoiceMailNumber(@NonNull Context context, int subId, @Nullable String number) { String vmNumber, mdn; @@ -2728,7 +2727,6 @@ public class PhoneNumberUtils { * @return true if number contains @ */ @SystemApi - @TestApi public static boolean isUriNumber(@Nullable String number) { // Note we allow either "@" or "%40" to indicate a URI, in case // the passed-in string is URI-escaped. (Neither "@" nor "%40" @@ -2747,7 +2745,6 @@ public class PhoneNumberUtils { * @hide */ @SystemApi - @TestApi public static @NonNull String getUsernameFromUriNumber(@NonNull String number) { // The delimiter between username and domain name can be // either "@" or "%40" (the URI-escaped equivalent.) diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index a71a965b1bdb..2e51ef16baf1 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -32,7 +32,6 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressAutoDoc; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.annotation.TestApi; import android.app.PendingIntent; import android.app.PropertyInvalidatedCache; import android.compat.annotation.UnsupportedAppUsage; @@ -279,7 +278,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri WFC_ENABLED_CONTENT_URI = Uri.withAppendedPath(CONTENT_URI, "wfc"); /** @@ -299,7 +297,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri ADVANCED_CALLING_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "advanced_calling"); @@ -318,7 +315,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri WFC_MODE_CONTENT_URI = Uri.withAppendedPath(CONTENT_URI, "wfc_mode"); /** @@ -336,7 +332,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri WFC_ROAMING_MODE_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "wfc_roaming_mode"); @@ -356,7 +351,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri VT_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "vt_enabled"); @@ -375,7 +369,6 @@ public class SubscriptionManager { */ @NonNull @SystemApi - @TestApi public static final Uri WFC_ROAMING_ENABLED_CONTENT_URI = Uri.withAppendedPath( CONTENT_URI, "wfc_roaming_enabled"); @@ -1966,7 +1959,6 @@ public class SubscriptionManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int subscriptionId) { if (VDBG) logd("setDefaultVoiceSubId sub id = " + subscriptionId); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a202644dfafe..9b4d31a51d53 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -8357,13 +8357,13 @@ public class TelephonyManager { /** * Values used to return status for hasCarrierPrivileges call. */ - /** @hide */ @SystemApi @TestApi + /** @hide */ @SystemApi public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; - /** @hide */ @SystemApi @TestApi + /** @hide */ @SystemApi public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; - /** @hide */ @SystemApi @TestApi + /** @hide */ @SystemApi public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; - /** @hide */ @SystemApi @TestApi + /** @hide */ @SystemApi public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; /** @@ -8565,7 +8565,6 @@ public class TelephonyManager { /** @hide */ @SystemApi - @TestApi @SuppressLint("Doclava125") public int checkCarrierPrivilegesForPackage(String pkgName) { try { @@ -8598,7 +8597,6 @@ public class TelephonyManager { /** @hide */ @SystemApi - @TestApi public List getCarrierPackageNamesForIntent(Intent intent) { return getCarrierPackageNamesForIntentAndPhone(intent, getPhoneId()); } @@ -10100,7 +10098,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) public @Nullable ComponentName getAndUpdateDefaultRespondViaMessageApplication() { return SmsApplication.getDefaultRespondViaMessageApplication(mContext, true); @@ -10113,7 +10110,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) public @Nullable ComponentName getDefaultRespondViaMessageApplication() { return SmsApplication.getDefaultRespondViaMessageApplication(mContext, false); @@ -11861,7 +11857,6 @@ public class TelephonyManager { * * @hide */ - @TestApi @SystemApi public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; @@ -11901,7 +11896,6 @@ public class TelephonyManager { */ @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) @SystemApi - @TestApi public void updateOtaEmergencyNumberDbFilePath( @NonNull ParcelFileDescriptor otaParcelFileDescriptor) { try { @@ -11927,7 +11921,6 @@ public class TelephonyManager { */ @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) @SystemApi - @TestApi public void resetOtaEmergencyNumberDbFilePath() { try { ITelephony telephony = getITelephony(); @@ -12149,7 +12142,6 @@ public class TelephonyManager { * * @hide */ - @TestApi @SystemApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion() { @@ -12877,7 +12869,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull List specifiers, @NonNull @CallbackExecutor Executor executor, @@ -12895,7 +12886,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSystemSelectionChannels(@NonNull List specifiers) { Objects.requireNonNull(specifiers, "Specifiers must not be null."); @@ -13307,7 +13297,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi public static final int MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL = 1; /** @@ -13322,7 +13311,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi public static final int MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED = 2; /** @@ -13346,7 +13334,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(@MobileDataPolicy int policy, boolean enabled) { try { @@ -13370,7 +13357,6 @@ public class TelephonyManager { * @hide */ @SystemApi - @TestApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMobileDataPolicyEnabled(@MobileDataPolicy int policy) { try { diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index d53a2e6591a2..3f9c8d26ca91 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class ImsCallForwardInfo implements Parcelable { /** diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index f31fcf4050ea..47a0ab61f970 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -48,7 +48,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public final class ImsCallProfile implements Parcelable { private static final String TAG = "ImsCallProfile"; diff --git a/telephony/java/android/telephony/ims/ImsCallSessionListener.java b/telephony/java/android/telephony/ims/ImsCallSessionListener.java index d21a05103241..2fdd195bbb26 100644 --- a/telephony/java/android/telephony/ims/ImsCallSessionListener.java +++ b/telephony/java/android/telephony/ims/ImsCallSessionListener.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.telephony.Annotation; import android.telephony.CallQuality; @@ -40,7 +39,6 @@ import com.android.ims.internal.IImsCallSession; // TODO: APIs in here do not conform to API guidelines yet. This can be changed if // ImsCallSessionListenerConverter is also changed. @SystemApi -@TestApi public class ImsCallSessionListener { private final IImsCallSessionListener mListener; diff --git a/telephony/java/android/telephony/ims/ImsConferenceState.java b/telephony/java/android/telephony/ims/ImsConferenceState.java index 9bf2f44395c4..1fa5f52968e5 100644 --- a/telephony/java/android/telephony/ims/ImsConferenceState.java +++ b/telephony/java/android/telephony/ims/ImsConferenceState.java @@ -18,7 +18,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -38,7 +37,6 @@ import java.util.Set; * @hide */ @SystemApi -@TestApi public final class ImsConferenceState implements Parcelable { private static final String TAG = "ImsConferenceState"; /** diff --git a/telephony/java/android/telephony/ims/ImsException.java b/telephony/java/android/telephony/ims/ImsException.java index 1c3d58d98b4a..50fb828ea217 100644 --- a/telephony/java/android/telephony/ims/ImsException.java +++ b/telephony/java/android/telephony/ims/ImsException.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.pm.PackageManager; import android.telephony.SubscriptionManager; import android.text.TextUtils; @@ -83,7 +82,6 @@ public final class ImsException extends Exception { * @hide */ @SystemApi - @TestApi public ImsException(@Nullable String message) { super(getMessage(message, CODE_ERROR_UNSPECIFIED)); } @@ -94,7 +92,6 @@ public final class ImsException extends Exception { * @hide */ @SystemApi - @TestApi public ImsException(@Nullable String message, @ImsErrorCode int code) { super(getMessage(message, code)); mCode = code; @@ -108,7 +105,6 @@ public final class ImsException extends Exception { * @hide */ @SystemApi - @TestApi public ImsException(@Nullable String message, @ImsErrorCode int code, @Nullable Throwable cause) { super(getMessage(message, code), cause); diff --git a/telephony/java/android/telephony/ims/ImsExternalCallState.java b/telephony/java/android/telephony/ims/ImsExternalCallState.java index 7d73165d4540..fdf636c323b6 100644 --- a/telephony/java/android/telephony/ims/ImsExternalCallState.java +++ b/telephony/java/android/telephony/ims/ImsExternalCallState.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +34,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class ImsExternalCallState implements Parcelable { private static final String TAG = "ImsExternalCallState"; diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index 3a0e49e204cb..76c1fafe05fb 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -25,7 +25,6 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressAutoDoc; import android.annotation.SuppressLint; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Binder; import android.os.RemoteException; import android.os.ServiceSpecificException; @@ -97,7 +96,7 @@ public class ImsMmTelManager implements RegistrationManager { */ // Do not add to this class, add to RegistrationManager.RegistrationCallback instead. @Deprecated - @SystemApi @TestApi + @SystemApi public static class RegistrationCallback extends RegistrationManager.RegistrationCallback { /** @@ -231,7 +230,6 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @SystemApi - @TestApi @Deprecated @SuppressAutoDoc // No support for device / profile owner or carrier privileges (b/72967236). @RequiresPermission(anyOf = { @@ -280,7 +278,7 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @Deprecated - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull @CallbackExecutor Executor executor, @NonNull RegistrationCallback c) throws ImsException { @@ -366,7 +364,7 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @Deprecated - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull RegistrationCallback c) { if (c == null) { @@ -422,7 +420,7 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @Override - @SystemApi @TestApi + @SystemApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull @CallbackExecutor Executor executor, @NonNull @ImsRegistrationState Consumer stateCallback) { @@ -681,7 +679,7 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) - @SystemApi @TestApi + @SystemApi public void setAdvancedCallingSettingEnabled(boolean isEnabled) { ITelephony iTelephony = getITelephony(); if (iTelephony == null) { @@ -725,7 +723,7 @@ public class ImsMmTelManager implements RegistrationManager { * @hide */ @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - @SystemApi @TestApi + @SystemApi public boolean isCapable(@MmTelFeature.MmTelCapabilities.MmTelCapability int capability, @ImsRegistrationImplBase.ImsRegistrationTech int imsRegTech) { ITelephony iTelephony = getITelephony(); @@ -758,7 +756,7 @@ public class ImsMmTelManager implements RegistrationManager { * otherwise. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(@MmTelFeature.MmTelCapabilities.MmTelCapability int capability, @ImsRegistrationImplBase.ImsRegistrationTech int imsRegTech) { @@ -790,7 +788,7 @@ public class ImsMmTelManager implements RegistrationManager { * available. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void isSupported(@MmTelFeature.MmTelCapabilities.MmTelCapability int capability, @AccessNetworkConstants.TransportType int transportType, @@ -879,7 +877,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #isVtSettingEnabled() * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVtSettingEnabled(boolean isEnabled) { ITelephony iTelephony = getITelephony(); @@ -954,7 +952,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #isVoWiFiSettingEnabled() * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiSettingEnabled(boolean isEnabled) { ITelephony iTelephony = getITelephony(); @@ -1032,7 +1030,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #isVoWiFiRoamingSettingEnabled() * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingSettingEnabled(boolean isEnabled) { ITelephony iTelephony = getITelephony(); @@ -1069,7 +1067,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #setVoWiFiSettingEnabled(boolean) * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiNonPersistent(boolean isCapable, int mode) { ITelephony iTelephony = getITelephony(); @@ -1152,7 +1150,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #getVoWiFiModeSetting() * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiModeSetting(@WiFiCallingMode int mode) { ITelephony iTelephony = getITelephony(); @@ -1188,7 +1186,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #setVoWiFiRoamingSettingEnabled(boolean) * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public @WiFiCallingMode int getVoWiFiRoamingModeSetting() { ITelephony iTelephony = getITelephony(); @@ -1224,7 +1222,7 @@ public class ImsMmTelManager implements RegistrationManager { * @see #getVoWiFiRoamingModeSetting() * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setVoWiFiRoamingModeSetting(@WiFiCallingMode int mode) { ITelephony iTelephony = getITelephony(); @@ -1258,7 +1256,7 @@ public class ImsMmTelManager implements RegistrationManager { * @param isEnabled if true RTT should be enabled during calls made on this subscription. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setRttCapabilitySetting(boolean isEnabled) { ITelephony iTelephony = getITelephony(); @@ -1338,7 +1336,7 @@ public class ImsMmTelManager implements RegistrationManager { * the IMS service is not available. * @hide */ - @SystemApi @TestApi + @SystemApi @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull @CallbackExecutor Executor executor, @NonNull @ImsFeature.ImsState Consumer callback) throws ImsException { diff --git a/telephony/java/android/telephony/ims/ImsService.java b/telephony/java/android/telephony/ims/ImsService.java index 90a6de7b66a3..c806d5c8ed3a 100644 --- a/telephony/java/android/telephony/ims/ImsService.java +++ b/telephony/java/android/telephony/ims/ImsService.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.LongDef; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.os.IBinder; @@ -101,7 +100,6 @@ import java.util.Map; * @hide */ @SystemApi -@TestApi public class ImsService extends Service { private static final String LOG_TAG = "ImsService"; @@ -558,4 +556,4 @@ public class ImsService extends Service { result.append("}"); return result.toString(); } -} \ No newline at end of file +} diff --git a/telephony/java/android/telephony/ims/ImsSsData.java b/telephony/java/android/telephony/ims/ImsSsData.java index 70bf0c57366d..fb8e5d37875b 100644 --- a/telephony/java/android/telephony/ims/ImsSsData.java +++ b/telephony/java/android/telephony/ims/ImsSsData.java @@ -19,7 +19,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -37,7 +36,6 @@ import java.util.List; * {@hide} */ @SystemApi -@TestApi public final class ImsSsData implements Parcelable { private static final String TAG = ImsSsData.class.getCanonicalName(); diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index 9cce95fc67f8..27b56b8c5b47 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -38,7 +37,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public final class ImsSsInfo implements Parcelable { /**@hide*/ diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index b70fd649ab79..131cb1a505fb 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -18,7 +18,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -30,7 +29,6 @@ import android.os.Parcelable; * @hide */ @SystemApi -@TestApi public final class ImsStreamMediaProfile implements Parcelable { private static final String TAG = "ImsStreamMediaProfile"; diff --git a/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java b/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java index f67f68e2e425..16303685d0a3 100644 --- a/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java +++ b/telephony/java/android/telephony/ims/ImsSuppServiceNotification.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +31,6 @@ import java.util.Arrays; * @hide */ @SystemApi -@TestApi public final class ImsSuppServiceNotification implements Parcelable { private static final String TAG = "ImsSuppServiceNotification"; diff --git a/telephony/java/android/telephony/ims/ImsUtListener.java b/telephony/java/android/telephony/ims/ImsUtListener.java index 460a032ce7e0..baa0576cdf13 100644 --- a/telephony/java/android/telephony/ims/ImsUtListener.java +++ b/telephony/java/android/telephony/ims/ImsUtListener.java @@ -18,7 +18,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.stub.ImsUtImplBase; @@ -34,7 +33,6 @@ import com.android.ims.internal.IImsUtListener; // DO NOT remove or change the existing APIs, only add new ones to this Base implementation or you // will break other implementations of ImsUt maintained by other ImsServices. @SystemApi -@TestApi public class ImsUtListener { /** diff --git a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java index 569c6d5a4e4d..2fca4096f447 100644 --- a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java +++ b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java @@ -17,14 +17,12 @@ package android.telephony.ims; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.RemoteException; -import android.telecom.Connection; import android.telecom.VideoProfile; import android.telecom.VideoProfile.CameraCapabilities; import android.view.Surface; @@ -37,7 +35,6 @@ import com.android.internal.os.SomeArgs; * @hide */ @SystemApi -@TestApi public abstract class ImsVideoCallProvider { private static final int MSG_SET_CALLBACK = 1; private static final int MSG_SET_CAMERA = 2; diff --git a/telephony/java/android/telephony/ims/ProvisioningManager.java b/telephony/java/android/telephony/ims/ProvisioningManager.java index 3affdf64aae7..24ae979bb08d 100644 --- a/telephony/java/android/telephony/ims/ProvisioningManager.java +++ b/telephony/java/android/telephony/ims/ProvisioningManager.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.StringDef; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.annotation.WorkerThread; import android.os.Binder; import android.os.RemoteException; @@ -59,7 +58,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@TestApi public class ProvisioningManager { /**@hide*/ diff --git a/telephony/java/android/telephony/ims/RcsUceAdapter.java b/telephony/java/android/telephony/ims/RcsUceAdapter.java index 4606f7d625aa..c2ddcea3dbd3 100644 --- a/telephony/java/android/telephony/ims/RcsUceAdapter.java +++ b/telephony/java/android/telephony/ims/RcsUceAdapter.java @@ -22,7 +22,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Context; import android.net.Uri; import android.os.Binder; @@ -519,7 +518,6 @@ public class RcsUceAdapter { * @hide */ @SystemApi - @TestApi @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean isEnabled) throws ImsException { IImsRcsController imsRcsController = getIImsRcsController(); diff --git a/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java b/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java index 1918bcb00733..87a5094a95f3 100644 --- a/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java +++ b/telephony/java/android/telephony/ims/feature/CapabilityChangeRequest.java @@ -18,7 +18,6 @@ package android.telephony.ims.feature; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.telephony.ims.stub.ImsRegistrationImplBase; @@ -34,7 +33,6 @@ import java.util.Set; * {@hide} */ @SystemApi -@TestApi public final class CapabilityChangeRequest implements Parcelable { /** diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index e5779b315c93..b0a7b62c88ab 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -44,7 +44,6 @@ import java.util.Map; * @hide */ @SystemApi -@TestApi public abstract class ImsFeature { private static final String LOG_TAG = "ImsFeature"; @@ -62,19 +61,19 @@ public abstract class ImsFeature { * CSFB for emergency calling. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int FEATURE_EMERGENCY_MMTEL = 0; /** * This feature supports the MMTEL feature. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int FEATURE_MMTEL = 1; /** * This feature supports the RCS feature. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int FEATURE_RCS = 2; /** * Total number of features defined @@ -124,7 +123,7 @@ public abstract class ImsFeature { * during this time will result in an {@link IllegalStateException}. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int STATE_UNAVAILABLE = 0; /** * This {@link ImsFeature} state is initializing and should not be communicated with. This will @@ -132,14 +131,14 @@ public abstract class ImsFeature { * during this time will result in an {@link IllegalStateException}. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int STATE_INITIALIZING = 1; /** * This {@link ImsFeature} is ready for communication. Do not attempt to call framework methods * until {@see #onFeatureReady()} is called. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int STATE_READY = 2; /** @@ -169,13 +168,13 @@ public abstract class ImsFeature { * The capability was unable to be changed. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int CAPABILITY_ERROR_GENERIC = -1; /** * The capability was able to be changed. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int CAPABILITY_SUCCESS = 0; /** @@ -349,7 +348,7 @@ public abstract class ImsFeature { * subscription IDs associated with this slot. * @hide */ - @SystemApi @TestApi + @SystemApi public final int getSlotIndex() { return mSlotId; } @@ -359,7 +358,7 @@ public abstract class ImsFeature { * or {@link #STATE_UNAVAILABLE} if it has not been updated yet. * @hide */ - @SystemApi @TestApi + @SystemApi public @ImsState int getFeatureState() { synchronized (mLock) { return mState; @@ -373,7 +372,7 @@ public abstract class ImsFeature { * {@link #STATE_INITIALIZING}, or {@link #STATE_READY}. * @hide */ - @SystemApi @TestApi + @SystemApi public final void setFeatureState(@ImsState int state) { synchronized (mLock) { if (mState != state) { diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index d8a10ebb7bde..508d1a79d27e 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.os.Message; import android.os.RemoteException; @@ -60,7 +59,7 @@ public class MmTelFeature extends ImsFeature { /** * @hide */ - @SystemApi @TestApi + @SystemApi public MmTelFeature() { } @@ -228,7 +227,7 @@ public class MmTelFeature extends ImsFeature { * @see #removeCapabilities(int) * @hide */ - @SystemApi @TestApi + @SystemApi public MmTelCapabilities() { super(); } @@ -237,7 +236,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Deprecated - @SystemApi @TestApi + @SystemApi public MmTelCapabilities(Capabilities c) { mCapabilities = c.mCapabilities; } @@ -248,7 +247,7 @@ public class MmTelFeature extends ImsFeature { * bitfield. * @hide */ - @SystemApi @TestApi + @SystemApi public MmTelCapabilities(@MmTelCapability int capabilities) { super(capabilities); } @@ -288,7 +287,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public final void addCapabilities(@MmTelCapability int capabilities) { super.addCapabilities(capabilities); } @@ -297,7 +296,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public final void removeCapabilities(@MmTelCapability int capability) { super.removeCapabilities(capability); } @@ -375,14 +374,14 @@ public class MmTelFeature extends ImsFeature { * outgoing call as IMS. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int PROCESS_CALL_IMS = 0; /** * To be returned by {@link #shouldProcessCall(String[])} when the telephony framework should * not process the outgoing call as IMS and should instead use circuit switch. * @hide */ - @SystemApi @TestApi + @SystemApi public static final int PROCESS_CALL_CSFB = 1; /** @hide */ @@ -400,7 +399,7 @@ public class MmTelFeature extends ImsFeature { * This is an optional boolean flag. * @hide */ - @SystemApi @TestApi + @SystemApi public static final String EXTRA_IS_USSD = "android.telephony.ims.feature.extra.IS_USSD"; /** @@ -413,7 +412,7 @@ public class MmTelFeature extends ImsFeature { * This is an optional boolean flag. * @hide */ - @SystemApi @TestApi + @SystemApi public static final String EXTRA_IS_UNKNOWN_CALL = "android.telephony.ims.feature.extra.IS_UNKNOWN_CALL"; @@ -453,7 +452,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public @NonNull final MmTelCapabilities queryCapabilityStatus() { return new MmTelCapabilities(super.queryCapabilityStatus()); } @@ -468,7 +467,7 @@ public class MmTelFeature extends ImsFeature { * {@link #changeEnabledCapabilities}) should also show the status as disabled. * @hide */ - @SystemApi @TestApi + @SystemApi public final void notifyCapabilitiesStatusChanged(@NonNull MmTelCapabilities c) { if (c == null) { throw new IllegalArgumentException("MmTelCapabilities must be non-null!"); @@ -483,7 +482,7 @@ public class MmTelFeature extends ImsFeature { * {@link #EXTRA_IS_UNKNOWN_CALL} and {@link #EXTRA_IS_USSD} above. * @hide */ - @SystemApi @TestApi + @SystemApi public final void notifyIncomingCall(@NonNull ImsCallSessionImplBase c, @NonNull Bundle extras) { if (c == null || extras == null) { @@ -509,7 +508,7 @@ public class MmTelFeature extends ImsFeature { * @param reason The {@link ImsReasonInfo} call rejection reason. * @hide */ - @SystemApi @TestApi + @SystemApi public final void notifyRejectedCall(@NonNull ImsCallProfile callProfile, @NonNull ImsReasonInfo reason) { if (callProfile == null || reason == null) { @@ -548,7 +547,7 @@ public class MmTelFeature extends ImsFeature { * @link count the new Voice Message count. * @hide */ - @SystemApi @TestApi + @SystemApi public final void notifyVoiceMessageCountUpdate(int count) { IImsMmTelListener listener = getListener(); if (listener == null) { @@ -571,7 +570,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public boolean queryCapabilityConfiguration(@MmTelCapabilities.MmTelCapability int capability, @ImsRegistrationImplBase.ImsRegistrationTech int radioTech) { // Base implementation - Override to provide functionality @@ -592,7 +591,7 @@ public class MmTelFeature extends ImsFeature { * * @hide */ @Override - @SystemApi @TestApi + @SystemApi public void changeEnabledCapabilities(@NonNull CapabilityChangeRequest request, @NonNull CapabilityCallbackProxy c) { // Base implementation, no-op @@ -617,7 +616,7 @@ public class MmTelFeature extends ImsFeature { * @return a {@link ImsCallProfile} object * @hide */ - @SystemApi @TestApi + @SystemApi public @Nullable ImsCallProfile createCallProfile(int callSessionType, int callType) { // Base Implementation - Should be overridden return null; @@ -640,7 +639,7 @@ public class MmTelFeature extends ImsFeature { * @param profile a call profile to make the call * @hide */ - @SystemApi @TestApi + @SystemApi public @Nullable ImsCallSessionImplBase createCallSession(@NonNull ImsCallProfile profile) { // Base Implementation - Should be overridden return null; @@ -659,7 +658,7 @@ public class MmTelFeature extends ImsFeature { * call will be placed over IMS or via CSFB. * @hide */ - @SystemApi @TestApi + @SystemApi public @ProcessCallResult int shouldProcessCall(@NonNull String[] numbers) { return PROCESS_CALL_IMS; } @@ -694,7 +693,7 @@ public class MmTelFeature extends ImsFeature { * configuration. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull ImsUtImplBase getUt() { // Base Implementation - Should be overridden return new ImsUtImplBase(); @@ -705,7 +704,7 @@ public class MmTelFeature extends ImsFeature { * calls that support it. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull ImsEcbmImplBase getEcbm() { // Base Implementation - Should be overridden return new ImsEcbmImplBase(); @@ -716,7 +715,7 @@ public class MmTelFeature extends ImsFeature { * package processing for multi-endpoint. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull ImsMultiEndpointImplBase getMultiEndpoint() { // Base Implementation - Should be overridden return new ImsMultiEndpointImplBase(); @@ -744,7 +743,7 @@ public class MmTelFeature extends ImsFeature { * } * @hide */ - @SystemApi @TestApi + @SystemApi public void setUiTtyMode(int mode, @Nullable Message onCompleteMessage) { // Base Implementation - Should be overridden } @@ -780,7 +779,7 @@ public class MmTelFeature extends ImsFeature { * Provider. * @hide */ - @SystemApi @TestApi + @SystemApi public @NonNull ImsSmsImplBase getSmsImplementation() { return new ImsSmsImplBase(); } @@ -794,7 +793,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public void onFeatureRemoved() { // Base Implementation - Should be overridden } @@ -804,7 +803,7 @@ public class MmTelFeature extends ImsFeature { * @hide */ @Override - @SystemApi @TestApi + @SystemApi public void onFeatureReady() { // Base Implementation - Should be overridden } diff --git a/telephony/java/android/telephony/ims/feature/RcsFeature.java b/telephony/java/android/telephony/ims/feature/RcsFeature.java index 98b0bcf6075b..b8ae146784d4 100644 --- a/telephony/java/android/telephony/ims/feature/RcsFeature.java +++ b/telephony/java/android/telephony/ims/feature/RcsFeature.java @@ -20,7 +20,6 @@ import android.annotation.CallbackExecutor; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.RemoteException; import android.telephony.ims.RcsContactUceCapability; @@ -50,7 +49,6 @@ import java.util.function.Supplier; * @hide */ @SystemApi -@TestApi public class RcsFeature extends ImsFeature { private static final String LOG_TAG = "RcsFeature"; diff --git a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java index 8f738d216cbe..1cebdd582b58 100644 --- a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java @@ -18,7 +18,6 @@ package android.telephony.ims.stub; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Message; import android.os.RemoteException; import android.telephony.ims.ImsCallProfile; @@ -39,7 +38,6 @@ import com.android.ims.internal.IImsVideoCallProvider; * @hide */ @SystemApi -@TestApi // DO NOT remove or change the existing APIs, only add new ones to this Base implementation or you // will break other implementations of ImsCallSession maintained by other ImsServices. public class ImsCallSessionImplBase implements AutoCloseable { diff --git a/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java index 4ef44d3ec9ef..e0290a5dc2af 100644 --- a/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java @@ -19,7 +19,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Context; import android.os.PersistableBundle; import android.os.RemoteException; @@ -51,7 +50,6 @@ import java.util.HashMap; * @hide */ @SystemApi -@TestApi public class ImsConfigImplBase { private static final String TAG = "ImsConfigImplBase"; diff --git a/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java b/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java index 4a3a2eaf4225..06c35eaec6dd 100644 --- a/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java @@ -17,7 +17,6 @@ package android.telephony.ims.stub; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.util.Log; @@ -34,7 +33,6 @@ import com.android.ims.internal.IImsEcbmListener; * @hide */ @SystemApi -@TestApi public class ImsEcbmImplBase { private static final String TAG = "ImsEcbmImplBase"; diff --git a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java index 4e7307e2fa0c..cd9ebbf38e35 100644 --- a/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java +++ b/telephony/java/android/telephony/ims/stub/ImsFeatureConfiguration.java @@ -19,7 +19,6 @@ package android.telephony.ims.stub; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; import android.telephony.ims.feature.ImsFeature; @@ -36,7 +35,6 @@ import java.util.Set; * @hide */ @SystemApi -@TestApi public final class ImsFeatureConfiguration implements Parcelable { public static final class FeatureSlotPair { diff --git a/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java b/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java index 0ae5bba5d722..d002903a11b6 100644 --- a/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java @@ -17,7 +17,6 @@ package android.telephony.ims.stub; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.telephony.ims.ImsExternalCallState; import android.util.Log; @@ -38,7 +37,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public class ImsMultiEndpointImplBase { private static final String TAG = "MultiEndpointImplBase"; diff --git a/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java b/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java index 2cdf70e6cf4c..12abdd1d7e11 100644 --- a/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java @@ -18,7 +18,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.RemoteException; import android.telephony.ims.ImsReasonInfo; @@ -40,7 +39,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public class ImsRegistrationImplBase { private static final String LOG_TAG = "ImsRegistrationImplBase"; diff --git a/telephony/java/android/telephony/ims/stub/ImsSmsImplBase.java b/telephony/java/android/telephony/ims/stub/ImsSmsImplBase.java index a9a33c0e1507..2783e299236b 100644 --- a/telephony/java/android/telephony/ims/stub/ImsSmsImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsSmsImplBase.java @@ -19,7 +19,6 @@ package android.telephony.ims.stub; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.RemoteException; import android.telephony.SmsManager; import android.telephony.SmsMessage; @@ -38,7 +37,6 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@TestApi public class ImsSmsImplBase { private static final String LOG_TAG = "SmsImplBase"; diff --git a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java index 8564f7affd6d..f5219d5b49e8 100644 --- a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.ImsUtListener; @@ -40,7 +39,6 @@ import java.lang.annotation.RetentionPolicy; // DO NOT remove or change the existing APIs, only add new ones to this Base implementation or you // will break other implementations of ImsUt maintained by other ImsServices. @SystemApi -@TestApi public class ImsUtImplBase { /** * Bar all incoming calls. (See 3GPP TS 24.611) diff --git a/telephony/java/android/telephony/mbms/DownloadRequest.java b/telephony/java/android/telephony/mbms/DownloadRequest.java index ac258cd40d65..eb59f87a6c02 100644 --- a/telephony/java/android/telephony/mbms/DownloadRequest.java +++ b/telephony/java/android/telephony/mbms/DownloadRequest.java @@ -19,7 +19,6 @@ package android.telephony.mbms; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Intent; import android.net.Uri; import android.os.Parcel; @@ -186,7 +185,6 @@ public final class DownloadRequest implements Parcelable { * @hide */ @SystemApi - @TestApi public Builder setServiceId(String serviceId) { fileServiceId = serviceId; return this; diff --git a/telephony/java/android/telephony/mbms/FileInfo.java b/telephony/java/android/telephony/mbms/FileInfo.java index ada2872874f5..e52b2ce0c505 100644 --- a/telephony/java/android/telephony/mbms/FileInfo.java +++ b/telephony/java/android/telephony/mbms/FileInfo.java @@ -17,7 +17,6 @@ package android.telephony.mbms; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -50,7 +49,6 @@ public final class FileInfo implements Parcelable { * @hide */ @SystemApi - @TestApi public FileInfo(Uri uri, String mimeType) { this.uri = uri; this.mimeType = mimeType; diff --git a/telephony/java/android/telephony/mbms/FileServiceInfo.java b/telephony/java/android/telephony/mbms/FileServiceInfo.java index 8c79ab63b131..8777e7f59e3f 100644 --- a/telephony/java/android/telephony/mbms/FileServiceInfo.java +++ b/telephony/java/android/telephony/mbms/FileServiceInfo.java @@ -17,7 +17,6 @@ package android.telephony.mbms; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,6 @@ public final class FileServiceInfo extends ServiceInfo implements Parcelable { /** @hide */ @SystemApi - @TestApi public FileServiceInfo(Map newNames, String newClassName, List newLocales, String newServiceId, Date start, Date end, List newFiles) { diff --git a/telephony/java/android/telephony/mbms/StreamingServiceInfo.java b/telephony/java/android/telephony/mbms/StreamingServiceInfo.java index 8ad1d8940ca7..316e86568213 100644 --- a/telephony/java/android/telephony/mbms/StreamingServiceInfo.java +++ b/telephony/java/android/telephony/mbms/StreamingServiceInfo.java @@ -17,7 +17,6 @@ package android.telephony.mbms; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +41,6 @@ public final class StreamingServiceInfo extends ServiceInfo implements Parcelabl * @hide */ @SystemApi - @TestApi public StreamingServiceInfo(Map names, String className, List locales, String serviceId, Date start, Date end) { super(names, className, locales, serviceId, start, end); diff --git a/telephony/java/android/telephony/mbms/UriPathPair.java b/telephony/java/android/telephony/mbms/UriPathPair.java index f53d7e0287f3..9258919919b7 100644 --- a/telephony/java/android/telephony/mbms/UriPathPair.java +++ b/telephony/java/android/telephony/mbms/UriPathPair.java @@ -17,7 +17,6 @@ package android.telephony.mbms; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.ContentResolver; import android.net.Uri; import android.os.Parcel; @@ -30,7 +29,6 @@ import android.telephony.mbms.vendor.VendorUtils; * @hide */ @SystemApi -@TestApi public final class UriPathPair implements Parcelable { private final Uri mFilePathUri; private final Uri mContentUri; diff --git a/telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java b/telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java index 3053ea03bebe..ffc1d2efe2ae 100644 --- a/telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java +++ b/telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java @@ -18,7 +18,6 @@ package android.telephony.mbms.vendor; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Intent; import android.os.Binder; import android.os.IBinder; @@ -45,7 +44,6 @@ import java.util.Map; * @hide */ @SystemApi -@TestApi public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub { private final Map mDownloadStatusListenerBinderMap = new HashMap<>(); @@ -576,7 +574,6 @@ public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub { // Following two methods exist to workaround b/124210145 /** @hide */ @SystemApi - @TestApi @Override public android.os.IBinder asBinder() { return super.asBinder(); @@ -584,7 +581,6 @@ public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub { /** @hide */ @SystemApi - @TestApi @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws RemoteException { diff --git a/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java b/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java index 1335b52673d2..e5b18bb5d644 100644 --- a/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java +++ b/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java @@ -18,7 +18,6 @@ package android.telephony.mbms.vendor; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.app.Service; import android.content.Intent; import android.os.Binder; @@ -41,7 +40,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public class MbmsGroupCallServiceBase extends Service { private final IBinder mInterface = new Stub() { @Override diff --git a/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java b/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java index cced44759527..e169b16ca958 100644 --- a/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java +++ b/telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java @@ -18,7 +18,6 @@ package android.telephony.mbms.vendor; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Intent; import android.net.Uri; import android.os.Binder; @@ -39,7 +38,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub { /** * Initialize streaming service for this app and subId, registering the listener. @@ -299,7 +297,6 @@ public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub { // Following two methods exist to workaround b/124210145 /** @hide */ @SystemApi - @TestApi @Override public android.os.IBinder asBinder() { return super.asBinder(); @@ -307,7 +304,6 @@ public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub { /** @hide */ @SystemApi - @TestApi @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws RemoteException { diff --git a/telephony/java/android/telephony/mbms/vendor/VendorUtils.java b/telephony/java/android/telephony/mbms/vendor/VendorUtils.java index f1cac8cf8286..a43f12244168 100644 --- a/telephony/java/android/telephony/mbms/vendor/VendorUtils.java +++ b/telephony/java/android/telephony/mbms/vendor/VendorUtils.java @@ -17,7 +17,6 @@ package android.telephony.mbms.vendor; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -35,7 +34,6 @@ import java.util.List; * @hide */ @SystemApi -@TestApi public class VendorUtils { /** diff --git a/test-mock/api/test-current.txt b/test-mock/api/test-current.txt index 32ca250b6c74..79d746a57cc5 100644 --- a/test-mock/api/test-current.txt +++ b/test-mock/api/test-current.txt @@ -6,21 +6,12 @@ package android.test.mock { } @Deprecated public class MockPackageManager extends android.content.pm.PackageManager { - method public void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); - method public boolean arePermissionsIndividuallyControlled(); - method public String getDefaultBrowserPackageNameAsUser(int); method public int getInstallReason(String, android.os.UserHandle); method public java.util.List getInstalledApplicationsAsUser(int, int); - method public java.util.List getInstalledPackagesAsUser(int, int); method public String[] getNamesForUids(int[]); method public String getPermissionControllerPackageName(); - method public int getPermissionFlags(String, String, android.os.UserHandle); method @NonNull public String getServicesSystemSharedLibraryPackageName(); method @NonNull public String getSharedSystemSharedLibraryPackageName(); - method public void grantRuntimePermission(String, String, android.os.UserHandle); - method public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); - method public void revokeRuntimePermission(String, String, android.os.UserHandle); - method public void updatePermissionFlags(String, String, int, int, android.os.UserHandle); } } -- cgit v1.2.3-59-g8ed1b From 4d0652699a88ad60c2dfdbf7b59065ee684df6d6 Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Tue, 20 Oct 2020 11:04:28 -0700 Subject: Introduce hasCompanionInCallServiceAccess API It retruns whether the caller has InCallService access for the companion apps. A companion app is an app associated with a physical wearable device via the {@link android.companion.CompanionDeviceManager} API. Test: cts Bug: 169595473 Change-Id: Id659bfae8556e965d3c31613848bde808f28a858 --- api/current.txt | 1 + non-updatable-api/current.txt | 1 + telecomm/java/android/telecom/TelecomManager.java | 29 ++++++++++++++++++++++ .../android/internal/telecom/ITelecomService.aidl | 5 ++++ 4 files changed, 36 insertions(+) (limited to 'telecomm/java') diff --git a/api/current.txt b/api/current.txt index 43c08695348b..9c2f2dec8976 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46508,6 +46508,7 @@ package android.telecom { method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String, android.telecom.PhoneAccountHandle); + method public boolean hasCompanionInCallServiceAccess(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInCall(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInManagedCall(); method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle); diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 7c3ff268a10c..3ef9da3f5379 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -44634,6 +44634,7 @@ package android.telecom { method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String, android.telecom.PhoneAccountHandle); + method public boolean hasCompanionInCallServiceAccess(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInCall(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInManagedCall(); method public boolean isIncomingCallPermitted(android.telecom.PhoneAccountHandle); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 82da4475c1b9..ae485d502a1e 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -32,6 +32,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; @@ -1604,6 +1605,30 @@ public class TelecomManager { return false; } + /** + * Returns whether the caller has {@link InCallService} access for companion apps. + * + * A companion app is an app associated with a physical wearable device via the + * {@link android.companion.CompanionDeviceManager} API. + * + * @return {@code true} if the caller has {@link InCallService} access for + * companion app; {@code false} otherwise. + */ + public boolean hasCompanionInCallServiceAccess() { + try { + if (isServiceConnected()) { + return getTelecomService().hasCompanionInCallServiceAccess( + mContext.getOpPackageName()); + } + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling hasCompanionInCallServiceAccess().", e); + if (!isSystemProcess()) { + e.rethrowAsRuntimeException(); + } + } + return false; + } + /** * Returns whether there is an ongoing call originating from a managed * {@link ConnectionService}. An ongoing call can be in dialing, ringing, active or holding @@ -2416,6 +2441,10 @@ public class TelecomManager { } } + private boolean isSystemProcess() { + return Process.myUid() == Process.SYSTEM_UID; + } + private ITelecomService getTelecomService() { if (mTelecomServiceOverride != null) { return mTelecomServiceOverride; diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index 7c6f1df972f3..e636b93deace 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -178,6 +178,11 @@ interface ITelecomService { */ boolean isInCall(String callingPackage, String callingFeatureId); + /** + * @see TelecomServiceImpl#hasCompanionInCallServiceAccess + */ + boolean hasCompanionInCallServiceAccess(String callingPackage); + /** * @see TelecomServiceImpl#isInManagedCall */ -- cgit v1.2.3-59-g8ed1b From 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 27 Oct 2020 11:47:29 +0000 Subject: Add maxTargetSdk restriction to unused APIs. These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. Bug: 170729553 Test: Treehugger Change-Id: I4c8fd0006f950de9955242e93968fb0996ceb372 --- .../framework/java/android/app/IAlarmManager.aidl | 6 +- .../framework/java/android/app/job/JobInfo.java | 10 +- .../java/android/os/IDeviceIdleController.aidl | 4 +- .../AccessibilityServiceInfo.java | 2 +- core/java/android/accounts/Account.java | 5 +- core/java/android/accounts/AccountManager.java | 6 +- core/java/android/animation/Animator.java | 3 +- core/java/android/app/Activity.java | 16 +-- core/java/android/app/ActivityManager.java | 32 +++--- core/java/android/app/ActivityThread.java | 10 +- core/java/android/app/AppOpsManager.java | 10 +- core/java/android/app/Application.java | 29 ++--- .../android/app/ApplicationPackageManager.java | 4 +- core/java/android/app/ContextImpl.java | 2 +- core/java/android/app/DialogFragment.java | 5 +- core/java/android/app/DownloadManager.java | 6 +- core/java/android/app/Fragment.java | 2 +- core/java/android/app/FragmentController.java | 3 +- core/java/android/app/FragmentManager.java | 2 +- core/java/android/app/IActivityManager.aidl | 48 ++++---- core/java/android/app/IAppTask.aidl | 2 +- core/java/android/app/IAssistDataReceiver.aidl | 4 +- core/java/android/app/INotificationManager.aidl | 2 +- core/java/android/app/IStopUserCallback.aidl | 2 +- core/java/android/app/ITransientNotification.aidl | 2 +- core/java/android/app/IWallpaperManager.aidl | 2 +- core/java/android/app/Instrumentation.java | 8 +- core/java/android/app/KeyguardManager.java | 2 +- core/java/android/app/LoadedApk.java | 14 +-- core/java/android/app/NativeActivity.java | 12 +- core/java/android/app/Notification.java | 2 +- core/java/android/app/NotificationManager.java | 2 +- core/java/android/app/PackageDeleteObserver.java | 3 +- core/java/android/app/PendingIntent.java | 2 +- core/java/android/app/QueuedWork.java | 3 +- core/java/android/app/SearchManager.java | 3 +- core/java/android/app/SharedPreferencesImpl.java | 2 +- core/java/android/app/StatusBarManager.java | 11 +- core/java/android/app/TaskInfo.java | 3 +- core/java/android/app/TaskStackListener.java | 29 ++--- core/java/android/app/UiAutomationConnection.java | 3 +- core/java/android/app/VrManager.java | 3 +- core/java/android/app/WallpaperManager.java | 2 +- core/java/android/app/admin/DeviceAdminInfo.java | 2 +- .../android/app/admin/DevicePolicyManager.java | 16 +-- core/java/android/app/admin/SecurityLog.java | 3 +- core/java/android/app/backup/BackupDataOutput.java | 3 +- core/java/android/app/backup/FullBackup.java | 3 +- .../android/app/backup/FullBackupDataOutput.java | 3 +- core/java/android/app/backup/IBackupManager.aidl | 16 +-- .../app/servertransaction/ActivityResultItem.java | 3 +- .../app/servertransaction/NewIntentItem.java | 3 +- .../java/android/app/usage/IUsageStatsManager.aidl | 8 +- .../android/app/usage/NetworkStatsManager.java | 5 +- core/java/android/appwidget/AppWidgetHost.java | 5 +- core/java/android/appwidget/AppWidgetHostView.java | 3 +- core/java/android/appwidget/AppWidgetManager.java | 5 +- core/java/android/bluetooth/BluetoothA2dp.java | 22 ++-- core/java/android/bluetooth/BluetoothA2dpSink.java | 3 +- core/java/android/bluetooth/BluetoothAdapter.java | 7 +- .../android/bluetooth/BluetoothCodecStatus.java | 9 +- core/java/android/bluetooth/BluetoothDevice.java | 25 +++-- core/java/android/bluetooth/BluetoothGatt.java | 6 +- .../android/bluetooth/BluetoothGattService.java | 3 +- core/java/android/bluetooth/BluetoothHeadset.java | 13 ++- .../android/bluetooth/BluetoothHeadsetClient.java | 11 +- .../bluetooth/BluetoothHeadsetClientCall.java | 11 +- .../android/bluetooth/BluetoothHearingAid.java | 7 +- core/java/android/bluetooth/BluetoothMap.java | 3 +- .../java/android/bluetooth/BluetoothMapClient.java | 3 +- core/java/android/bluetooth/BluetoothPan.java | 3 +- core/java/android/bluetooth/BluetoothPbap.java | 3 +- core/java/android/bluetooth/BluetoothProfile.java | 3 +- core/java/android/bluetooth/BluetoothSap.java | 3 +- core/java/android/bluetooth/BluetoothSocket.java | 3 +- core/java/android/bluetooth/le/ScanRecord.java | 3 +- .../java/android/companion/AssociationRequest.java | 5 +- .../android/companion/BluetoothDeviceFilter.java | 3 +- .../companion/BluetoothDeviceFilterUtils.java | 7 +- .../android/companion/BluetoothLeDeviceFilter.java | 3 +- core/java/android/companion/DeviceFilter.java | 5 +- .../android/companion/IFindDeviceCallback.aidl | 2 +- core/java/android/content/ComponentName.java | 5 +- core/java/android/content/ContentProvider.java | 4 +- core/java/android/content/ContentResolver.java | 7 +- core/java/android/content/Context.java | 8 +- core/java/android/content/ContextWrapper.java | 5 +- core/java/android/content/CursorLoader.java | 5 +- core/java/android/content/IContentProvider.java | 2 +- core/java/android/content/IContentService.aidl | 4 +- core/java/android/content/ISyncAdapter.aidl | 2 +- core/java/android/content/Intent.java | 14 +-- core/java/android/content/IntentFilter.java | 10 +- core/java/android/content/SyncAdapterType.java | 6 +- core/java/android/content/UndoManager.java | 35 +++--- core/java/android/content/UndoOperation.java | 5 +- core/java/android/content/om/IOverlayManager.aidl | 4 +- core/java/android/content/om/OverlayInfo.java | 3 +- core/java/android/content/pm/ActivityInfo.java | 7 +- core/java/android/content/pm/ApplicationInfo.java | 4 +- .../android/content/pm/BaseParceledListSlice.java | 5 +- core/java/android/content/pm/ComponentInfo.java | 3 +- .../java/android/content/pm/IPackageInstaller.aidl | 2 +- core/java/android/content/pm/IPackageManager.aidl | 24 ++-- core/java/android/content/pm/PackageInstaller.java | 12 +- core/java/android/content/pm/PackageManager.java | 16 +-- core/java/android/content/pm/PackageParser.java | 10 +- .../java/android/content/pm/ParceledListSlice.java | 2 +- core/java/android/content/pm/PermissionInfo.java | 3 +- core/java/android/content/pm/ResolveInfo.java | 3 +- core/java/android/content/pm/VerifierInfo.java | 3 +- core/java/android/content/res/AssetManager.java | 13 ++- core/java/android/content/res/ColorStateList.java | 5 +- .../android/content/res/CompatibilityInfo.java | 2 +- core/java/android/content/res/Configuration.java | 4 +- core/java/android/content/res/DrawableCache.java | 3 +- core/java/android/content/res/ObbInfo.java | 3 +- core/java/android/content/res/Resources.java | 8 +- core/java/android/content/res/ResourcesImpl.java | 14 +-- core/java/android/content/res/TypedArray.java | 9 +- core/java/android/content/res/XmlBlock.java | 3 +- .../android/database/AbstractWindowedCursor.java | 3 +- core/java/android/database/CursorWindow.java | 3 +- .../database/sqlite/SQLiteCustomFunction.java | 4 +- .../android/database/sqlite/SQLiteDatabase.java | 3 +- core/java/android/database/sqlite/SQLiteDebug.java | 2 +- .../android/database/sqlite/SQLiteProgram.java | 3 +- .../android/database/sqlite/SQLiteStatement.java | 3 +- core/java/android/ddm/DdmHandleAppName.java | 5 +- core/java/android/hardware/Camera.java | 6 +- core/java/android/hardware/HardwareBuffer.java | 2 +- core/java/android/hardware/Sensor.java | 4 +- core/java/android/hardware/SerialManager.java | 5 +- core/java/android/hardware/SerialPort.java | 7 +- .../java/android/hardware/SystemSensorManager.java | 7 +- .../hardware/biometrics/BiometricConstants.java | 3 +- .../biometrics/BiometricFingerprintConstants.java | 3 +- .../hardware/camera2/CameraCharacteristics.java | 5 +- .../android/hardware/camera2/CaptureRequest.java | 5 +- .../android/hardware/camera2/CaptureResult.java | 3 +- .../camera2/impl/CameraMetadataNative.java | 13 ++- .../hardware/camera2/utils/HashCodeHelpers.java | 3 +- .../android/hardware/display/DisplayManager.java | 5 +- .../hardware/display/WifiDisplayStatus.java | 15 +-- .../hardware/fingerprint/FingerprintManager.java | 3 +- core/java/android/hardware/input/InputManager.java | 2 +- .../hardware/location/GeofenceHardware.java | 2 +- .../IActivityRecognitionHardwareClient.aidl | 2 +- .../hardware/soundtrigger/SoundTrigger.java | 17 +-- .../hardware/soundtrigger/SoundTriggerModule.java | 3 +- .../android/hardware/usb/UsbDeviceConnection.java | 2 +- core/java/android/hardware/usb/UsbManager.java | 4 +- core/java/android/hardware/usb/UsbRequest.java | 2 +- .../inputmethodservice/InputMethodService.java | 4 +- core/java/android/net/ConnectivityManager.java | 40 +++---- core/java/android/net/DhcpResults.java | 17 +-- core/java/android/net/EthernetManager.java | 17 +-- core/java/android/net/IConnectivityManager.aidl | 4 +- core/java/android/net/INetworkPolicyManager.aidl | 2 +- core/java/android/net/INetworkStatsService.aidl | 2 +- core/java/android/net/IpConfiguration.java | 3 +- core/java/android/net/LinkProperties.java | 6 +- core/java/android/net/LinkQualityInfo.java | 9 +- core/java/android/net/LocalSocketImpl.java | 3 +- core/java/android/net/MacAddress.java | 3 +- core/java/android/net/MobileLinkQualityInfo.java | 31 +++--- core/java/android/net/Network.java | 3 +- core/java/android/net/NetworkCapabilities.java | 6 +- core/java/android/net/NetworkPolicyManager.java | 6 +- core/java/android/net/NetworkQuotaInfo.java | 7 +- core/java/android/net/NetworkRequest.java | 4 +- core/java/android/net/NetworkStats.java | 33 +++--- core/java/android/net/NetworkStatsHistory.java | 17 +-- core/java/android/net/NetworkTemplate.java | 3 +- core/java/android/net/NetworkUtils.java | 6 +- core/java/android/net/Proxy.java | 3 +- core/java/android/net/RouteInfo.java | 4 +- .../android/net/SSLCertificateSocketFactory.java | 20 ++-- core/java/android/net/StaticIpConfiguration.java | 9 +- core/java/android/net/TrafficStats.java | 4 +- core/java/android/net/WebAddress.java | 4 +- core/java/android/net/metrics/ApfProgramEvent.java | 15 +-- core/java/android/net/metrics/ApfStats.java | 21 ++-- core/java/android/net/metrics/DhcpClientEvent.java | 3 +- core/java/android/net/nsd/INsdManager.aidl | 2 +- core/java/android/nfc/INfcAdapterExtras.aidl | 14 +-- core/java/android/nfc/NdefRecord.java | 3 +- core/java/android/nfc/NfcAdapter.java | 3 +- core/java/android/nfc/Tag.java | 3 +- core/java/android/os/BaseBundle.java | 2 +- core/java/android/os/BatteryManager.java | 6 +- core/java/android/os/BatteryStats.java | 4 +- core/java/android/os/Broadcaster.java | 8 +- core/java/android/os/Bundle.java | 6 +- core/java/android/os/Debug.java | 18 +-- core/java/android/os/Environment.java | 4 +- core/java/android/os/FileObserver.java | 2 +- core/java/android/os/FileUtils.java | 10 +- core/java/android/os/Handler.java | 4 +- core/java/android/os/HwBinder.java | 2 +- core/java/android/os/IBinder.java | 2 +- .../java/android/os/INetworkManagementService.aidl | 12 +- core/java/android/os/IPowerManager.aidl | 2 +- core/java/android/os/LocaleList.java | 2 +- core/java/android/os/MemoryFile.java | 2 +- core/java/android/os/MessageQueue.java | 4 +- core/java/android/os/Parcel.java | 14 +-- core/java/android/os/ParcelableParcel.java | 8 +- core/java/android/os/PerformanceCollector.java | 4 +- core/java/android/os/PowerManager.java | 4 +- core/java/android/os/Process.java | 36 +++--- core/java/android/os/ServiceManager.java | 2 +- core/java/android/os/SharedMemory.java | 2 +- core/java/android/os/ShellCommand.java | 2 +- core/java/android/os/StatFs.java | 2 +- core/java/android/os/StrictMode.java | 4 +- core/java/android/os/SystemClock.java | 2 +- core/java/android/os/SystemProperties.java | 4 +- core/java/android/os/SystemService.java | 2 +- core/java/android/os/Trace.java | 2 +- core/java/android/os/UpdateLock.java | 12 +- core/java/android/os/UserHandle.java | 14 +-- core/java/android/os/UserManager.java | 12 +- core/java/android/os/VibrationEffect.java | 8 +- .../android/os/health/HealthStatsParceler.java | 3 +- .../android/os/health/SystemHealthManager.java | 2 +- .../android/os/storage/StorageEventListener.java | 11 +- core/java/android/os/storage/StorageManager.java | 25 +++-- core/java/android/os/storage/StorageVolume.java | 2 +- core/java/android/os/storage/VolumeInfo.java | 11 +- core/java/android/os/storage/VolumeRecord.java | 5 +- .../android/preference/PreferenceActivity.java | 3 +- .../android/preference/PreferenceFragment.java | 3 +- core/java/android/preference/PreferenceScreen.java | 3 +- .../java/android/preference/SeekBarPreference.java | 3 +- core/java/android/preference/SwitchPreference.java | 3 +- core/java/android/provider/BrowserContract.java | 15 +-- core/java/android/provider/CalendarContract.java | 11 +- core/java/android/provider/ContactsContract.java | 5 +- core/java/android/provider/DocumentsContract.java | 6 +- core/java/android/provider/Downloads.java | 45 ++++---- core/java/android/provider/Settings.java | 121 +++++++++++---------- core/java/android/provider/Telephony.java | 8 +- core/java/android/security/KeystoreArguments.java | 5 +- .../android/security/keymaster/ExportResult.java | 3 +- .../security/keymaster/KeyCharacteristics.java | 5 +- .../security/keymaster/KeymasterArguments.java | 13 ++- .../android/security/keymaster/KeymasterBlob.java | 3 +- .../security/keymaster/KeymasterBlobArgument.java | 7 +- .../keymaster/KeymasterBooleanArgument.java | 3 +- .../security/keymaster/KeymasterDateArgument.java | 3 +- .../security/keymaster/KeymasterIntArgument.java | 7 +- .../security/keymaster/KeymasterLongArgument.java | 7 +- .../security/keymaster/OperationResult.java | 3 +- core/java/android/service/dreams/DreamService.java | 2 +- .../java/android/service/dreams/IDreamManager.aidl | 4 +- .../notification/NotificationListenerService.java | 2 +- .../notification/StatusBarNotification.java | 2 +- .../service/notification/ZenModeConfig.java | 7 +- core/java/android/service/vr/IVrManager.aidl | 2 +- .../java/android/service/vr/VrListenerService.java | 3 +- .../service/wallpaper/WallpaperService.java | 2 +- core/java/android/speech/IRecognitionListener.aidl | 2 +- .../java/android/telephony/PhoneStateListener.java | 4 +- core/java/android/telephony/Rlog.java | 2 +- core/java/android/text/AndroidBidi.java | 3 +- core/java/android/text/DynamicLayout.java | 4 +- core/java/android/text/FontConfig.java | 17 +-- core/java/android/text/Html.java | 3 +- core/java/android/text/Layout.java | 13 ++- core/java/android/text/SpanSet.java | 3 +- core/java/android/text/SpannableStringBuilder.java | 3 +- .../java/android/text/SpannableStringInternal.java | 21 ++-- core/java/android/text/StaticLayout.java | 10 +- core/java/android/text/TextLine.java | 8 +- core/java/android/text/format/DateFormat.java | 2 +- core/java/android/text/format/DateUtils.java | 3 +- core/java/android/text/method/WordIterator.java | 23 ++-- core/java/android/text/style/EasyEditSpan.java | 7 +- core/java/android/text/style/SuggestionSpan.java | 7 +- core/java/android/text/util/Linkify.java | 3 +- core/java/android/transition/Transition.java | 7 +- .../java/android/transition/TransitionManager.java | 3 +- core/java/android/util/EventLog.java | 3 +- core/java/android/util/IconDrawableFactory.java | 3 +- core/java/android/util/LocalLog.java | 5 +- core/java/android/util/LogWriter.java | 3 +- core/java/android/util/LongArray.java | 7 +- core/java/android/util/NtpTrustedTime.java | 11 +- core/java/android/util/PathParser.java | 3 +- core/java/android/util/Rational.java | 5 +- core/java/android/util/RecurrenceRule.java | 5 +- core/java/android/util/Slog.java | 4 +- core/java/android/util/TimeUtils.java | 2 +- core/java/android/util/TrustedTime.java | 3 +- core/java/android/view/AccessibilityIterators.java | 5 +- core/java/android/view/Choreographer.java | 4 +- core/java/android/view/Display.java | 6 +- core/java/android/view/DisplayEventReceiver.java | 3 +- core/java/android/view/DragEvent.java | 7 +- core/java/android/view/FrameMetrics.java | 3 +- .../java/android/view/IRecentsAnimationRunner.aidl | 4 +- core/java/android/view/IRemoteAnimationRunner.aidl | 4 +- core/java/android/view/IWindowManager.aidl | 12 +- core/java/android/view/IWindowSession.aidl | 2 +- core/java/android/view/InputChannel.java | 3 +- core/java/android/view/InputDevice.java | 4 +- core/java/android/view/InputEventReceiver.java | 5 +- core/java/android/view/InputEventSender.java | 3 +- core/java/android/view/InputFilter.java | 5 +- core/java/android/view/InputQueue.java | 3 +- core/java/android/view/KeyCharacterMap.java | 7 +- core/java/android/view/KeyEvent.java | 40 +++---- core/java/android/view/LayoutInflater.java | 4 +- core/java/android/view/MotionEvent.java | 2 +- core/java/android/view/NotificationHeaderView.java | 3 +- core/java/android/view/PointerIcon.java | 10 +- core/java/android/view/RemoteAnimationAdapter.java | 3 +- core/java/android/view/RemoteAnimationTarget.java | 5 +- core/java/android/view/Surface.java | 7 +- core/java/android/view/SurfaceControl.java | 4 +- core/java/android/view/SurfaceSession.java | 3 +- core/java/android/view/TextureView.java | 15 +-- core/java/android/view/VelocityTracker.java | 9 +- core/java/android/view/View.java | 78 ++++++------- core/java/android/view/ViewConfiguration.java | 2 +- core/java/android/view/ViewDebug.java | 5 +- core/java/android/view/ViewGroup.java | 12 +- core/java/android/view/ViewOverlay.java | 5 +- core/java/android/view/ViewRootImpl.java | 28 ++--- core/java/android/view/ViewTreeObserver.java | 6 +- core/java/android/view/Window.java | 6 +- .../android/view/WindowAnimationFrameStats.java | 3 +- .../java/android/view/WindowContentFrameStats.java | 3 +- core/java/android/view/WindowManager.java | 9 +- core/java/android/view/WindowManagerGlobal.java | 4 +- .../AccessibilityInteractionClient.java | 6 +- .../view/accessibility/AccessibilityManager.java | 2 +- .../view/accessibility/AccessibilityNodeInfo.java | 8 +- ...AccessibilityInteractionConnectionCallback.aidl | 6 +- .../view/accessibility/IAccessibilityManager.aidl | 2 +- .../view/inputmethod/InputMethodManager.java | 4 +- .../textclassifier/TextClassificationManager.java | 3 +- .../view/textservice/SpellCheckerSession.java | 3 +- .../view/textservice/TextServicesManager.java | 3 +- .../java/android/webkit/IWebViewUpdateService.aidl | 4 +- core/java/android/webkit/PluginData.java | 9 +- core/java/android/webkit/UrlInterceptRegistry.java | 3 +- core/java/android/webkit/WebResourceResponse.java | 3 +- core/java/android/webkit/WebView.java | 6 +- core/java/android/webkit/WebViewFactory.java | 3 +- core/java/android/widget/AbsListView.java | 16 +-- core/java/android/widget/AbsSeekBar.java | 3 +- core/java/android/widget/ActionMenuPresenter.java | 9 +- core/java/android/widget/ActionMenuView.java | 17 +-- core/java/android/widget/ActivityChooserModel.java | 5 +- core/java/android/widget/AutoCompleteTextView.java | 6 +- .../android/widget/DatePickerSpinnerDelegate.java | 11 +- core/java/android/widget/DateTimeView.java | 3 +- core/java/android/widget/EdgeEffect.java | 2 +- core/java/android/widget/Editor.java | 4 +- core/java/android/widget/FastScroller.java | 2 +- core/java/android/widget/GridLayout.java | 3 +- core/java/android/widget/GridView.java | 2 +- core/java/android/widget/HorizontalScrollView.java | 4 +- core/java/android/widget/ImageView.java | 2 +- core/java/android/widget/LinearLayout.java | 4 +- core/java/android/widget/ListPopupWindow.java | 8 +- core/java/android/widget/ListView.java | 4 +- core/java/android/widget/NumberPicker.java | 14 +-- core/java/android/widget/OverScroller.java | 3 +- core/java/android/widget/PopupMenu.java | 3 +- core/java/android/widget/PopupWindow.java | 2 +- core/java/android/widget/ProgressBar.java | 4 +- core/java/android/widget/RemoteViews.java | 16 +-- core/java/android/widget/RemoteViewsAdapter.java | 15 +-- core/java/android/widget/ScrollView.java | 2 +- core/java/android/widget/SearchView.java | 2 +- core/java/android/widget/SeekBar.java | 3 +- core/java/android/widget/Spinner.java | 4 +- core/java/android/widget/Switch.java | 3 +- core/java/android/widget/TextClock.java | 3 +- core/java/android/widget/TextView.java | 14 +-- core/java/android/widget/ViewAnimator.java | 3 +- core/java/android/widget/ViewFlipper.java | 3 +- .../android/ims/internal/uce/common/CapInfo.java | 89 +++++++-------- .../ims/internal/uce/common/StatusCode.java | 7 +- .../android/ims/internal/uce/common/UceLong.java | 11 +- .../ims/internal/uce/options/IOptionsListener.aidl | 12 +- .../ims/internal/uce/options/IOptionsService.aidl | 16 +-- .../ims/internal/uce/options/OptionsCapInfo.java | 11 +- .../ims/internal/uce/options/OptionsCmdId.java | 5 +- .../ims/internal/uce/options/OptionsCmdStatus.java | 11 +- .../internal/uce/options/OptionsSipResponse.java | 13 ++- .../internal/uce/presence/IPresenceListener.aidl | 18 +-- .../internal/uce/presence/IPresenceService.aidl | 16 +-- .../ims/internal/uce/presence/PresCapInfo.java | 7 +- .../ims/internal/uce/presence/PresCmdId.java | 5 +- .../ims/internal/uce/presence/PresCmdStatus.java | 11 +- .../uce/presence/PresPublishTriggerType.java | 5 +- .../ims/internal/uce/presence/PresResInfo.java | 9 +- .../internal/uce/presence/PresResInstanceInfo.java | 13 ++- .../ims/internal/uce/presence/PresRlmiInfo.java | 19 ++-- .../ims/internal/uce/presence/PresServiceInfo.java | 9 +- .../ims/internal/uce/presence/PresSipResponse.java | 23 ++-- .../uce/presence/PresSubscriptionState.java | 5 +- .../ims/internal/uce/presence/PresTupleInfo.java | 9 +- .../ims/internal/uce/uceservice/IUceListener.aidl | 2 +- .../ims/internal/uce/uceservice/IUceService.aidl | 20 ++-- .../com/android/internal/app/AlertController.java | 3 +- .../com/android/internal/app/IAppOpsService.aidl | 2 +- .../com/android/internal/app/IBatteryStats.aidl | 6 +- .../app/IVoiceInteractionManagerService.aidl | 2 +- .../internal/app/IntentForwarderActivity.java | 3 +- .../com/android/internal/app/LocalePicker.java | 3 +- .../android/internal/app/WindowDecorActionBar.java | 7 +- .../internal/appwidget/IAppWidgetService.aidl | 6 +- .../android/internal/logging/MetricsLogger.java | 2 +- core/java/com/android/internal/net/VpnProfile.java | 2 +- core/java/com/android/internal/os/BaseCommand.java | 5 +- .../com/android/internal/os/BatterySipper.java | 3 +- .../android/internal/os/BatteryStatsHelper.java | 5 +- .../com/android/internal/os/BatteryStatsImpl.java | 4 +- .../android/internal/os/ClassLoaderFactory.java | 3 +- core/java/com/android/internal/os/FuseAppLoop.java | 5 +- .../com/android/internal/os/ProcessCpuTracker.java | 13 ++- core/java/com/android/internal/os/SomeArgs.java | 15 +-- .../internal/telephony/ITelephonyRegistry.aidl | 2 +- .../java/com/android/internal/util/ArrayUtils.java | 9 +- .../com/android/internal/util/AsyncChannel.java | 14 +-- .../android/internal/util/GrowingArrayUtils.java | 5 +- core/java/com/android/internal/util/HexDump.java | 2 +- .../internal/util/IndentingPrintWriter.java | 7 +- .../com/android/internal/util/MemInfoReader.java | 5 +- .../com/android/internal/util/Preconditions.java | 7 +- core/java/com/android/internal/util/State.java | 3 +- .../com/android/internal/util/StateMachine.java | 19 ++-- .../internal/view/IInputConnectionWrapper.java | 2 +- .../com/android/internal/view/menu/ActionMenu.java | 3 +- .../android/internal/view/menu/ActionMenuItem.java | 3 +- .../internal/view/menu/ActionMenuItemView.java | 3 +- .../android/internal/view/menu/MenuBuilder.java | 13 ++- .../android/internal/view/menu/MenuItemImpl.java | 7 +- .../internal/view/menu/MenuPopupHelper.java | 13 ++- .../android/internal/view/menu/MenuPresenter.java | 3 +- .../android/internal/widget/AbsActionBarView.java | 3 +- .../internal/widget/ActionBarContextView.java | 3 +- .../internal/widget/ActionBarOverlayLayout.java | 2 +- .../android/internal/widget/CachingIconView.java | 3 +- .../internal/widget/IRemoteViewsFactory.aidl | 16 +-- .../LinearLayoutWithDefaultTouchRecepient.java | 3 +- .../android/internal/widget/LockPatternUtils.java | 7 +- .../android/internal/widget/NumericTextView.java | 3 +- .../internal/widget/PreferenceImageView.java | 3 +- .../com/android/internal/widget/RecyclerView.java | 2 +- .../android/internal/widget/ScrollBarUtils.java | 3 +- .../internal/widget/ScrollingTabContainerView.java | 7 +- .../com/android/server/net/NetlinkTracker.java | 7 +- core/java/com/google/android/collect/Sets.java | 3 +- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 6 +- graphics/java/android/graphics/Bitmap.java | 4 +- graphics/java/android/graphics/BitmapFactory.java | 3 +- graphics/java/android/graphics/Canvas.java | 4 +- graphics/java/android/graphics/CanvasProperty.java | 5 +- .../android/graphics/ColorMatrixColorFilter.java | 3 +- graphics/java/android/graphics/FontListParser.java | 3 +- graphics/java/android/graphics/GraphicBuffer.java | 5 +- .../java/android/graphics/LightingColorFilter.java | 5 +- graphics/java/android/graphics/LinearGradient.java | 15 +-- graphics/java/android/graphics/Movie.java | 2 +- graphics/java/android/graphics/Paint.java | 2 +- graphics/java/android/graphics/Path.java | 5 +- .../android/graphics/PorterDuffColorFilter.java | 3 +- graphics/java/android/graphics/RadialGradient.java | 17 +-- graphics/java/android/graphics/Region.java | 7 +- graphics/java/android/graphics/SurfaceTexture.java | 11 +- graphics/java/android/graphics/SweepGradient.java | 13 ++- graphics/java/android/graphics/Typeface.java | 2 +- graphics/java/android/graphics/Xfermode.java | 3 +- .../drawable/AnimatedStateListDrawable.java | 4 +- .../graphics/drawable/AnimatedVectorDrawable.java | 4 +- .../android/graphics/drawable/ColorDrawable.java | 3 +- .../java/android/graphics/drawable/Drawable.java | 3 +- .../graphics/drawable/DrawableInflater.java | 3 +- .../android/graphics/drawable/DrawableWrapper.java | 3 +- graphics/java/android/graphics/drawable/Icon.java | 6 +- .../android/graphics/drawable/InsetDrawable.java | 3 +- .../android/graphics/drawable/LayerDrawable.java | 3 +- .../android/graphics/drawable/RippleDrawable.java | 7 +- .../android/graphics/drawable/ScaleDrawable.java | 3 +- .../graphics/drawable/StateListDrawable.java | 5 +- .../android/graphics/drawable/VectorDrawable.java | 3 +- .../android/graphics/fonts/FontVariationAxis.java | 2 +- .../java/android/graphics/pdf/PdfRenderer.java | 5 +- keystore/java/android/security/Credentials.java | 3 +- keystore/java/android/security/KeyStore.java | 14 +-- .../java/android/location/IGeofenceProvider.aidl | 2 +- location/java/android/location/Location.java | 2 +- media/java/android/media/AudioAttributes.java | 4 +- media/java/android/media/AudioDevicePort.java | 3 +- .../java/android/media/AudioDevicePortConfig.java | 3 +- media/java/android/media/AudioFormat.java | 9 +- media/java/android/media/AudioGain.java | 3 +- media/java/android/media/AudioHandle.java | 3 +- media/java/android/media/AudioManager.java | 18 +-- media/java/android/media/AudioMixPort.java | 5 +- media/java/android/media/AudioMixPortConfig.java | 3 +- media/java/android/media/AudioPatch.java | 3 +- media/java/android/media/AudioPort.java | 5 +- media/java/android/media/AudioPortConfig.java | 3 +- .../java/android/media/AudioPortEventHandler.java | 5 +- media/java/android/media/AudioRecord.java | 9 +- .../android/media/AudioRecordingConfiguration.java | 3 +- media/java/android/media/AudioSystem.java | 9 +- media/java/android/media/AudioTrack.java | 7 +- media/java/android/media/CamcorderProfile.java | 2 +- media/java/android/media/EncoderCapabilities.java | 13 ++- media/java/android/media/IAudioService.aidl | 2 +- .../java/android/media/IRemoteDisplayCallback.aidl | 2 +- media/java/android/media/JetPlayer.java | 5 +- media/java/android/media/MediaMetadata.java | 3 +- media/java/android/media/MediaMuxer.java | 17 +-- media/java/android/media/MediaPlayer.java | 9 +- media/java/android/media/MediaRecorder.java | 2 +- media/java/android/media/MediaRouter.java | 4 +- media/java/android/media/MicrophoneInfo.java | 3 +- media/java/android/media/PlaybackParams.java | 14 +-- media/java/android/media/RemoteControlClient.java | 5 +- media/java/android/media/RemoteController.java | 3 +- media/java/android/media/RemoteDisplay.java | 7 +- media/java/android/media/RemoteDisplayState.java | 5 +- media/java/android/media/Ringtone.java | 3 +- media/java/android/media/RingtoneManager.java | 5 +- media/java/android/media/TimedText.java | 3 +- media/java/android/media/ToneGenerator.java | 3 +- media/java/android/media/TtmlRenderer.java | 3 +- media/java/android/media/VolumeShaper.java | 31 +++--- media/java/android/media/audiofx/AudioEffect.java | 4 +- media/java/android/media/audiopolicy/AudioMix.java | 15 +-- .../android/media/audiopolicy/AudioMixingRule.java | 13 ++- media/java/android/media/session/MediaSession.java | 3 +- .../media/soundtrigger/SoundTriggerDetector.java | 5 +- .../media/soundtrigger/SoundTriggerManager.java | 5 +- media/java/android/media/tv/TvInputInfo.java | 3 +- media/java/android/media/tv/TvInputService.java | 3 +- .../android/service/media/MediaBrowserService.java | 3 +- opengl/java/android/opengl/EGL14.java | 3 +- .../java/javax/microedition/khronos/egl/EGL10.java | 3 +- rs/java/android/renderscript/Font.java | 3 +- rs/java/android/renderscript/Mesh.java | 9 +- rs/java/android/renderscript/ProgramStore.java | 3 +- telecomm/java/android/telecom/CallerInfo.java | 9 +- telecomm/java/android/telecom/Log.java | 4 +- .../android/internal/telecom/ITelecomService.aidl | 2 +- .../android/internal/telephony/SmsApplication.java | 13 ++- .../common/com/google/android/mms/ContentType.java | 7 +- .../com/google/android/mms/MmsException.java | 3 +- .../com/google/android/mms/pdu/AcknowledgeInd.java | 3 +- .../com/google/android/mms/pdu/DeliveryInd.java | 3 +- .../google/android/mms/pdu/EncodedStringValue.java | 3 +- .../android/mms/pdu/MultimediaMessagePdu.java | 7 +- .../com/google/android/mms/pdu/NotifyRespInd.java | 3 +- .../common/com/google/android/mms/pdu/PduBody.java | 5 +- .../common/com/google/android/mms/pdu/PduPart.java | 3 +- .../common/com/google/android/mms/pdu/SendReq.java | 3 +- .../com/google/android/mms/util/AbstractCache.java | 3 +- .../google/android/mms/util/DownloadDrmHelper.java | 3 +- .../com/google/android/mms/util/SqliteWrapper.java | 3 +- .../android/service/euicc/EuiccProfileInfo.java | 3 +- ...tDefaultDownloadableSubscriptionListResult.java | 3 +- .../GetDownloadableSubscriptionMetadataResult.java | 3 +- .../service/euicc/IDeleteSubscriptionCallback.aidl | 2 +- .../service/euicc/IEraseSubscriptionsCallback.aidl | 2 +- ...efaultDownloadableSubscriptionListCallback.aidl | 2 +- ...etDownloadableSubscriptionMetadataCallback.aidl | 2 +- .../android/service/euicc/IGetEidCallback.aidl | 2 +- .../service/euicc/IGetEuiccInfoCallback.aidl | 2 +- .../euicc/IGetEuiccProfileInfoListCallback.aidl | 2 +- ...RetainSubscriptionsForFactoryResetCallback.aidl | 2 +- .../euicc/ISwitchToSubscriptionCallback.aidl | 2 +- .../euicc/IUpdateSubscriptionNicknameCallback.aidl | 2 +- .../android/telephony/CarrierConfigManager.java | 3 +- .../java/android/telephony/CellIdentityGsm.java | 3 +- .../java/android/telephony/CellIdentityLte.java | 2 +- telephony/java/android/telephony/CellInfoCdma.java | 2 +- telephony/java/android/telephony/CellInfoGsm.java | 3 +- telephony/java/android/telephony/CellInfoLte.java | 2 +- .../android/telephony/CellSignalStrengthGsm.java | 2 +- .../android/telephony/CellSignalStrengthLte.java | 3 +- .../PhoneNumberFormattingTextWatcher.java | 3 +- .../java/android/telephony/PhoneNumberUtils.java | 7 +- .../telephony/PreciseDataConnectionState.java | 2 +- .../java/android/telephony/RadioAccessFamily.java | 8 +- telephony/java/android/telephony/ServiceState.java | 18 +-- telephony/java/android/telephony/SmsManager.java | 2 +- telephony/java/android/telephony/SmsMessage.java | 5 +- .../java/android/telephony/SubscriptionInfo.java | 7 +- .../android/telephony/SubscriptionManager.java | 16 +-- .../java/android/telephony/TelephonyManager.java | 30 ++--- .../telephony/euicc/DownloadableSubscription.java | 7 +- .../java/android/telephony/euicc/EuiccInfo.java | 3 +- .../android/telephony/ims/ImsCallForwardInfo.java | 15 +-- .../java/android/telephony/ims/ImsCallProfile.java | 11 +- .../java/android/telephony/ims/ImsReasonInfo.java | 2 +- .../java/android/telephony/ims/ImsSsInfo.java | 7 +- .../telephony/ims/ImsStreamMediaProfile.java | 9 +- .../telephony/ims/ImsVideoCallProvider.java | 3 +- .../android/telephony/ims/compat/ImsService.java | 5 +- .../telephony/ims/compat/feature/ImsFeature.java | 5 +- .../telephony/ims/compat/feature/MMTelFeature.java | 3 +- .../ims/compat/stub/ImsCallSessionImplBase.java | 3 +- .../ims/compat/stub/ImsConfigImplBase.java | 5 +- .../ims/compat/stub/ImsUtListenerImplBase.java | 3 +- .../mbms/vendor/IMbmsStreamingService.aidl | 8 +- .../java/com/android/ims/ImsConfigListener.aidl | 2 +- telephony/java/com/android/ims/ImsUtInterface.java | 3 +- .../ims/internal/IImsCallSessionListener.aidl | 44 ++++---- .../ims/internal/IImsRegistrationListener.aidl | 16 +-- .../com/android/ims/internal/IImsUtListener.aidl | 14 +-- .../ims/internal/IImsVideoCallCallback.aidl | 14 +-- .../ims/internal/IImsVideoCallProvider.aidl | 2 +- .../internal/telephony/ICarrierConfigLoader.aidl | 2 +- .../android/internal/telephony/IPhoneSubInfo.aidl | 2 +- .../com/android/internal/telephony/ITelephony.aidl | 10 +- .../android/internal/telephony/OperatorInfo.java | 24 ++-- .../telephony/Sms7BitEncodingTranslator.java | 9 +- .../android/internal/telephony/SmsMessageBase.java | 16 +-- .../internal/telephony/cdma/SmsMessage.java | 4 +- .../internal/telephony/cdma/sms/BearerData.java | 3 +- .../internal/telephony/gsm/SmsCbHeader.java | 15 +-- .../android/internal/telephony/gsm/SmsMessage.java | 14 +-- .../android/internal/telephony/uicc/IccUtils.java | 3 +- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/ScanResult.java | 29 ++--- wifi/java/android/net/wifi/WifiConfiguration.java | 6 +- wifi/java/android/net/wifi/WifiManager.java | 4 +- wifi/java/android/net/wifi/p2p/WifiP2pConfig.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pDevice.java | 3 +- .../android/net/wifi/p2p/WifiP2pDeviceList.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pManager.java | 8 +- .../net/wifi/p2p/nsd/WifiP2pServiceInfo.java | 2 +- .../net/wifi/p2p/nsd/WifiP2pServiceRequest.java | 2 +- 642 files changed, 2403 insertions(+), 2030 deletions(-) (limited to 'telecomm/java') diff --git a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl index 6f624ee672e6..2c51935dc446 100644 --- a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl +++ b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl @@ -29,16 +29,16 @@ import android.os.WorkSource; */ interface IAlarmManager { /** windowLength == 0 means exact; windowLength < 0 means the let the OS decide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) 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 + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean setTime(long millis); void setTimeZone(String zone); void remove(in PendingIntent operation, in IAlarmListener listener); long getNextWakeFromIdleTime(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) AlarmManager.AlarmClockInfo getNextAlarmClock(int userId); long currentNetworkTimeMillis(); } diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index 9f98f8efc774..c2d530d00058 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -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; diff --git a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl index 643d47ca5c6a..7d02d2d6cd29 100644 --- a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl +++ b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl @@ -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); diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index f953da48c217..b1b9f4161ee5 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -888,7 +888,7 @@ public class AccessibilityServiceInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapabilities(int capabilities) { mCapabilities = capabilities; } diff --git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index b960a7f835d8..0d6a07938e95 100644 --- a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java @@ -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(@Nullable Object o) { diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 9bb02cdcce73..007b0a8ab960 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -546,7 +546,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; @@ -831,7 +831,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(), @@ -2122,7 +2122,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 confirmCredentialsAsUser(final Account account, final Bundle options, final Activity activity, diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index 3cdd691fd5dd..eb525d301986 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ConstantState; +import android.os.Build; import java.util.ArrayList; @@ -461,7 +462,7 @@ public abstract class Animator implements Cloneable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void reverse() { throw new IllegalStateException("Reverse is not supported"); } diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8c0b4387c27f..3c55bce4fc06 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -757,7 +757,7 @@ public class Activity extends ContextThemeWrapper */ public static final int FINISH_TASK_WITH_ACTIVITY = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final String FRAGMENTS_TAG = "android:fragments"; private static final String LAST_AUTOFILL_ID = "android:lastAutofillId"; @@ -2941,7 +2941,7 @@ public class Activity extends ContextThemeWrapper * @see View#onMovedToDisplay(int, Configuration) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public void onMovedToDisplay(int displayId, Configuration config) { } @@ -3211,7 +3211,7 @@ public class Activity extends ContextThemeWrapper * @deprecated Use {@link CursorLoader} instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Cursor managedQuery(Uri uri, String[] projection, String selection, String sortOrder) { Cursor c = getContentResolver().query(uri, projection, selection, null, sortOrder); @@ -6019,7 +6019,7 @@ public class Activity extends ContextThemeWrapper * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startActivityForResult( String who, Intent intent, int requestCode, @Nullable Bundle options) { Uri referrer = onProvideReferrer(); @@ -6351,7 +6351,7 @@ public class Activity extends ContextThemeWrapper * Finishes the current activity and specifies whether to remove the task associated with this * activity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void finish(int finishTask) { if (mParent == null) { int resultCode; @@ -7881,7 +7881,7 @@ public class Activity extends ContextThemeWrapper mParent = parent; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final void attach(Context context, ActivityThread aThread, Instrumentation instr, IBinder token, int ident, Application application, Intent intent, ActivityInfo info, @@ -7977,7 +7977,7 @@ public class Activity extends ContextThemeWrapper performCreate(icicle, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final void performCreate(Bundle icicle, PersistableBundle persistentState) { dispatchActivityPreCreated(icicle); mCanEnterPictureInPicture = true; @@ -8292,7 +8292,7 @@ public class Activity extends ContextThemeWrapper } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void dispatchActivityResult(String who, int requestCode, int resultCode, Intent data, String reason) { if (false) Log.v( diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 250f2f0b2dc9..71c6799d0141 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -508,18 +508,18 @@ public class ActivityManager { public static final int PROCESS_STATE_BOUND_TOP = 3; /** @hide Process is hosting a foreground service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; /** @hide Process is hosting a foreground service due to a system binding. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 5; /** @hide Process is important to the user, and something they are aware of. */ public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 6; /** @hide Process is important to the user, but not something they are aware of. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_IMPORTANT_BACKGROUND = 7; /** @hide Process is in the background transient so we will try to keep running. */ @@ -531,14 +531,14 @@ public class ActivityManager { /** @hide Process is in the background running a service. Unlike oom_adj, this level * is used for both the normal running in background state and the executing * operations state. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_SERVICE = 10; /** @hide Process is in the background running a receiver. Note that from the * perspective of oom_adj, receivers run at a higher foreground level, but for our * prioritization here that is not necessary and putting them below services means * many fewer changes in some process states as they receive broadcasts. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_RECEIVER = 11; /** @hide Same as {@link #PROCESS_STATE_TOP} but while device is sleeping. */ @@ -549,14 +549,14 @@ public class ActivityManager { public static final int PROCESS_STATE_HEAVY_WEIGHT = 13; /** @hide Process is in the background but hosts the home activity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_HOME = 14; /** @hide Process is in the background but hosts the last shown activity. */ public static final int PROCESS_STATE_LAST_ACTIVITY = 15; /** @hide Process is being cached for later use and contains activities. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_CACHED_ACTIVITY = 16; /** @hide Process is being cached for later use and is a client of another cached @@ -2198,7 +2198,7 @@ public class ActivityManager { /** * @return The size of the task at the point this snapshot was taken. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Point getTaskSize() { return mTaskSize; } @@ -2740,13 +2740,13 @@ public class ActivityManager { public boolean lowMemory; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long hiddenAppThreshold; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long secondaryServerThreshold; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long visibleAppThreshold; /** @hide */ @UnsupportedAppUsage @@ -3037,7 +3037,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_PERSISTENT = 1<<1; /** @@ -3045,7 +3045,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_HAS_ACTIVITIES = 1<<2; /** @@ -3149,7 +3149,7 @@ public class ActivityManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170; @@ -3209,7 +3209,7 @@ public class ActivityManager { * will be passed to a client, use {@link #procStateToImportanceForClient}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @Importance int procStateToImportance(int procState) { if (procState == PROCESS_STATE_NONEXISTENT) { return IMPORTANCE_GONE; @@ -4168,7 +4168,7 @@ public class ActivityManager { * @param userid the user's id. Zero indicates the default user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean switchUser(int userid) { try { return getService().switchUser(userid); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 87c729b20c71..b68194792db1 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -346,7 +346,7 @@ public final class ActivityThread extends ClientTransactionHandler { @UnsupportedAppUsage AppBindData mBoundApplication; Profiler mProfiler; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCurDefaultDisplayDpi; @UnsupportedAppUsage boolean mDensityCompatMode; @@ -821,7 +821,7 @@ public final class ActivityThread extends ClientTransactionHandler { boolean trackAllocation; @UnsupportedAppUsage boolean restrictedBackupMode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean persistent; Configuration config; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2288,7 +2288,7 @@ public final class ActivityThread extends ClientTransactionHandler { return null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo, int flags) { boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0; @@ -3036,7 +3036,7 @@ public final class ActivityThread extends ClientTransactionHandler { proto.end(asToken); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void registerOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { @@ -3049,7 +3049,7 @@ public final class ActivityThread extends ClientTransactionHandler { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void unregisterOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 3bcb87aa73f2..e20ef7f70954 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -797,7 +797,7 @@ public class AppOpsManager { // - add the op to the appropriate template in AppOpsState.OpsTemplate (settings app) /** @hide No operation specified. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int OP_NONE = AppProtoEnums.APP_OP_NONE; /** @hide Access to coarse location information. */ @UnsupportedAppUsage @@ -1156,7 +1156,7 @@ public class AppOpsManager { public static final int OP_RECORD_AUDIO_HOTWORD = 102; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int _NUM_OP = 104; /** Access to coarse location information. */ @@ -2592,7 +2592,7 @@ public class AppOpsManager { * Retrieve a non-localized name for the operation, for debugging output. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String opToName(int op) { if (op == OP_NONE) return "NONE"; return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")"); @@ -2623,7 +2623,7 @@ public class AppOpsManager { * Retrieve the permission associated with an operation, or null if there is not one. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static String opToPermission(int op) { return sOpPerms[op]; @@ -6837,7 +6837,7 @@ public class AppOpsManager { /** @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resetAllModes() { try { mService.resetAllModes(mContext.getUserId(), null); diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 941467fad736..146d648fe65a 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.autofill.AutofillManager; @@ -352,7 +353,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { mLoadedApk = ContextImpl.getImpl(context).mPackageInfo; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -376,7 +377,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -388,7 +389,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -408,7 +409,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -418,7 +419,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -438,7 +439,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -448,7 +449,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPrePaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -468,7 +469,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostPaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -478,7 +479,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -498,7 +499,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -508,7 +509,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -532,7 +533,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -544,7 +545,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -564,7 +565,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index c6b52c1ea705..7cef93fe7547 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1309,7 +1309,7 @@ public class ApplicationPackageManager extends PackageManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public boolean setInstantAppCookie(@NonNull byte[] cookie) { try { @@ -2422,7 +2422,7 @@ public class ApplicationPackageManager extends PackageManager { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable VolumeInfo getPackageCurrentVolume(ApplicationInfo app) { final StorageManager storage = mContext.getSystemService(StorageManager.class); return getPackageCurrentVolume(app, storage); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index e94fd452b7f8..5c3be316f924 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2700,7 +2700,7 @@ class ContextImpl extends Context { return context; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static ContextImpl createActivityContext(ActivityThread mainThread, LoadedApk packageInfo, ActivityInfo activityInfo, IBinder activityToken, int displayId, Configuration overrideConfiguration) { diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java index e4c84d7e7997..9fea3f75c2c2 100644 --- a/core/java/android/app/DialogFragment.java +++ b/core/java/android/app/DialogFragment.java @@ -19,6 +19,7 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.DialogInterface; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -183,11 +184,11 @@ public class DialogFragment extends Fragment int mTheme = 0; boolean mCancelable = true; boolean mShowsDialog = true; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mBackStackId = -1; Dialog mDialog; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mViewDestroyed; @UnsupportedAppUsage boolean mDismissed; diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 0719422632d1..355092378279 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -351,7 +351,7 @@ public class DownloadManager { * columns to request from DownloadProvider. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String[] UNDERLYING_COLUMNS = new String[] { DownloadManager.COLUMN_ID, DownloadManager.COLUMN_LOCAL_FILENAME, @@ -1646,7 +1646,7 @@ public class DownloadManager { /** * Get a parameterized SQL WHERE clause to select a bunch of IDs. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static String getWhereClauseForIds(long[] ids) { StringBuilder whereClause = new StringBuilder(); whereClause.append("("); @@ -1664,7 +1664,7 @@ public class DownloadManager { /** * Get the selection args for a clause returned by {@link #getWhereClauseForIds(long[])}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static String[] getWhereArgsForIds(long[] ids) { String[] whereArgs = new String[ids.length]; return getWhereArgsForIds(ids, whereArgs); diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index ce4109cd44a3..93381cf82764 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -306,7 +306,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene int mTargetRequestCode; // True if the fragment is in the list of added fragments. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mAdded; // If set this fragment is being removed from its activity. diff --git a/core/java/android/app/FragmentController.java b/core/java/android/app/FragmentController.java index f021f7690283..150b7a56a36d 100644 --- a/core/java/android/app/FragmentController.java +++ b/core/java/android/app/FragmentController.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.ArrayMap; @@ -44,7 +45,7 @@ import java.util.List; */ @Deprecated public class FragmentController { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final FragmentHostCallback mHost; /** diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 904c4735e0ff..5435558b3be5 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1101,7 +1101,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Animator loadAnimator(Fragment fragment, int transit, boolean enter, int transitionStyle) { Animator animObj = fragment.onCreateAnimator(transit, enter, fragment.getNextAnim()); diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 357b26c3083d..fc217b69b95a 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -112,7 +112,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void unhandledBack(); @UnsupportedAppUsage boolean finishActivity(in IBinder token, int code, in Intent data, int finishTask); @@ -171,12 +171,12 @@ interface IActivityManager { @UnsupportedAppUsage boolean unbindService(in IServiceConnection connection); void publishService(in IBinder token, in Intent intent, in IBinder service); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDebugApp(in String packageName, boolean waitForDebugger, boolean persistent); void setAgentApp(in String packageName, @nullable String agent); @UnsupportedAppUsage void setAlwaysFinish(boolean enabled); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startInstrumentation(in ComponentName className, in String profileFile, int flags, in Bundle arguments, in IInstrumentationWatcher watcher, in IUiAutomationConnection connection, int userId, @@ -198,7 +198,7 @@ interface IActivityManager { * @throws RemoteException * @return Returns true if the configuration was updated. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean updateConfiguration(in Configuration values); /** * Updates mcc mnc configuration and applies changes to the entire system. @@ -223,7 +223,7 @@ interface IActivityManager { int mode, int userId); void revokeUriPermission(in IApplicationThread caller, in String targetPkg, in Uri uri, int mode, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setActivityController(in IActivityController watcher, boolean imAMonkey); void showWaitingForDebugger(in IApplicationThread who, boolean waiting); /* @@ -277,7 +277,7 @@ interface IActivityManager { List getRunningAppProcesses(); IBinder peekService(in Intent service, in String resolvedType, in String callingPackage); // Turn on/off profiling in a particular process. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean profileControl(in String process, int userId, boolean start, in ProfilerInfo profilerInfo, int profileType); @UnsupportedAppUsage @@ -309,7 +309,7 @@ interface IActivityManager { // Retrieve info of applications installed on external media that are currently // running. List getRunningExternalApplications(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void finishHeavyWeightApp(); // A StrictMode violation to be handled. @UnsupportedAppUsage @@ -331,7 +331,7 @@ interface IActivityManager { in RemoteCallback finishCallback); @UnsupportedAppUsage boolean isUserRunning(int userid, int flags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setPackageScreenCompatMode(in String packageName, int mode); @UnsupportedAppUsage boolean switchUser(int userid); @@ -349,12 +349,12 @@ interface IActivityManager { @UnsupportedAppUsage long[] getProcessPss(in int[] pids); void showBootMessage(in CharSequence msg, boolean always); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void killAllBackgroundProcesses(); ContentProviderHolder getContentProviderExternal(in String name, int userId, in IBinder token, String tag); /** @deprecated - Use {@link #removeContentProviderExternalAsUser} which takes a user ID. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void removeContentProviderExternal(in String name, in IBinder token); void removeContentProviderExternalAsUser(in String name, in IBinder token, int userId); // Get memory information about the calling process. @@ -382,7 +382,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int stopUser(int userid, boolean force, in IStopUserCallback callback); /** * Check {@link com.android.server.am.ActivityManagerService#stopUserWithDelayedLocking(int, boolean, IStopUserCallback)} @@ -443,20 +443,20 @@ interface IActivityManager { String getLaunchedFromPackage(in IBinder activityToken); void killUid(int appId, int userId, in String reason); void setUserIsMonkey(boolean monkey); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void hang(in IBinder who, boolean allowRestart); List getAllRootTaskInfos(); void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop); void setFocusedRootTask(int taskId); ActivityTaskManager.RootTaskInfo getFocusedRootTaskInfo(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void restart(); void performIdleMaintenance(); void appNotRespondingViaProvider(in IBinder connection); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Rect getTaskBounds(int taskId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean setProcessMemoryTrimLevel(in String process, int userId, int level); @@ -464,13 +464,13 @@ interface IActivityManager { String getTagForIntentSender(in IIntentSender sender, in String prefix); @UnsupportedAppUsage boolean startUserInBackground(int userid); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isInLockTaskMode(); @UnsupportedAppUsage int startActivityFromRecents(int taskId, in Bundle options); @UnsupportedAppUsage void startSystemLockTaskMode(int taskId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isTopOfTask(in IBinder token); void bootAnimationComplete(); int checkPermissionWithToken(in String permission, int pid, int uid, @@ -481,11 +481,11 @@ interface IActivityManager { void notifyCleartextNetwork(int uid, in byte[] firstPacket); @UnsupportedAppUsage void setTaskResizeable(int taskId, int resizeableMode); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void resizeTask(int taskId, in Rect bounds, int resizeMode); @UnsupportedAppUsage int getLockTaskModeState(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDumpHeapDebugLimit(in String processName, int uid, long maxMemSize, in String reportPackage); void dumpHeapFinished(in String path); @@ -498,17 +498,17 @@ interface IActivityManager { // Start of N transactions // Start Binder transaction tracking for all applications. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startBinderTracking(); // Stop Binder transaction tracking for all applications and dump trace data to the given file // descriptor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void suppressResizeConfigChanges(boolean suppress); boolean moveTopActivityToPinnedRootTask(int rootTaskId, in Rect bounds); boolean isAppStartModeDisabled(int uid, in String packageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean unlockUser(int userid, in byte[] token, in byte[] secret, in IProgressListener listener); void killPackageDependents(in String packageName, int userId); @@ -517,7 +517,7 @@ interface IActivityManager { boolean isVrModePackageEnabled(in ComponentName packageName); void notifyLockedProfile(int userId); void startConfirmDeviceCredentialIntent(in Intent intent, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sendIdleJobTrigger(); int sendIntentSender(in IIntentSender target, in IBinder whitelistToken, int code, in Intent intent, in String resolvedType, in IIntentReceiver finishedReceiver, diff --git a/core/java/android/app/IAppTask.aidl b/core/java/android/app/IAppTask.aidl index f41d705e2ba7..d3046c590c4f 100644 --- a/core/java/android/app/IAppTask.aidl +++ b/core/java/android/app/IAppTask.aidl @@ -24,7 +24,7 @@ import android.os.Bundle; /** @hide */ interface IAppTask { void finishAndRemoveTask(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ActivityManager.RecentTaskInfo getTaskInfo(); void moveToFront(in IApplicationThread appThread, in String callingPackage); int startActivity(IBinder whoThread, String callingPackage, String callingFeatureId, diff --git a/core/java/android/app/IAssistDataReceiver.aidl b/core/java/android/app/IAssistDataReceiver.aidl index 0d69838e4329..d67fbff4548b 100644 --- a/core/java/android/app/IAssistDataReceiver.aidl +++ b/core/java/android/app/IAssistDataReceiver.aidl @@ -21,8 +21,8 @@ import android.os.Bundle; /** @hide */ oneway interface IAssistDataReceiver { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onHandleAssistData(in Bundle resultData); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onHandleAssistScreenshot(in Bitmap screenshot); } diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 66a7f4df03bb..c052186bb974 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -126,7 +126,7 @@ interface INotificationManager StatusBarNotification[] getActiveNotifications(String callingPkg); StatusBarNotification[] getActiveNotificationsWithAttribution(String callingPkg, String callingAttributionTag); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count, boolean includeSnoozed); StatusBarNotification[] getHistoricalNotificationsWithAttribution(String callingPkg, String callingAttributionTag, int count, boolean includeSnoozed); diff --git a/core/java/android/app/IStopUserCallback.aidl b/core/java/android/app/IStopUserCallback.aidl index d3c2ff776128..c99734259f57 100644 --- a/core/java/android/app/IStopUserCallback.aidl +++ b/core/java/android/app/IStopUserCallback.aidl @@ -22,7 +22,7 @@ package android.app; */ interface IStopUserCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void userStopped(int userId); void userStopAborted(int userId); } diff --git a/core/java/android/app/ITransientNotification.aidl b/core/java/android/app/ITransientNotification.aidl index 09a3ba045fc2..537a8f2acdc5 100644 --- a/core/java/android/app/ITransientNotification.aidl +++ b/core/java/android/app/ITransientNotification.aidl @@ -19,7 +19,7 @@ package android.app; /** @hide */ oneway interface ITransientNotification { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void show(IBinder windowToken); void hide(); } diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index 4cb8d936aa9c..101917bc2e07 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -83,7 +83,7 @@ interface IWallpaperManager { * information about that wallpaper. Otherwise, if it is a static image, * simply return null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) WallpaperInfo getWallpaperInfo(int userId); /** diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index f2a9daafb4ce..9e967958c9cb 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1416,7 +1416,7 @@ public class Instrumentation { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void callActivityOnNewIntent(Activity activity, ReferrerIntent intent) { final String oldReferrer = activity.mReferrer; try { @@ -1762,7 +1762,7 @@ public class Instrumentation { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int execStartActivitiesAsUser(Context who, IBinder contextThread, IBinder token, Activity target, Intent[] intents, Bundle options, int userId) { @@ -1945,7 +1945,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActivityResult execStartActivityAsCaller( Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options, IBinder permissionToken, @@ -1993,7 +1993,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void execStartActivityFromAppTask( Context who, IBinder contextThread, IAppTask appTask, Intent intent, Bundle options) { diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 2122e92ba5b5..545c3f70d466 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -531,7 +531,7 @@ public class KeyguardManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDeviceSecure(int userId) { try { return mTrustManager.isDeviceSecure(userId); diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 202b6152d2ea..b6094627d1f6 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -117,7 +117,7 @@ public final class LoadedApk { private String[] mOverlayDirs; @UnsupportedAppUsage private String mDataDir; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mLibDir; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private File mDataDirFile; @@ -286,7 +286,7 @@ public final class LoadedApk { return mSecurityViolation; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CompatibilityInfo getCompatibilityInfo() { return mDisplayAdjustments.getCompatibilityInfo(); } @@ -1739,7 +1739,7 @@ public final class LoadedApk { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IServiceConnection lookupServiceDispatcher(ServiceConnection c, Context context) { synchronized (mServices) { @@ -1805,7 +1805,7 @@ public final class LoadedApk { static final class ServiceDispatcher { private final ServiceDispatcher.InnerConnection mIServiceConnection; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ServiceConnection mConnection; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Context mContext; @@ -1824,7 +1824,7 @@ public final class LoadedApk { } private static class InnerConnection extends IServiceConnection.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final WeakReference mDispatcher; InnerConnection(LoadedApk.ServiceDispatcher sd) { @@ -1843,7 +1843,7 @@ public final class LoadedApk { private final ArrayMap mActiveConnections = new ArrayMap(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ServiceDispatcher(ServiceConnection conn, Context context, Handler activityThread, int flags) { mIServiceConnection = new InnerConnection(this); @@ -1908,7 +1908,7 @@ public final class LoadedApk { return mConnection; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) IServiceConnection getIServiceConnection() { return mIServiceConnection; } diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index 74bc9e215106..12d16049d1c3 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -71,7 +71,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private NativeContentView mNativeContentView; private InputMethodManager mIMM; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeHandle; private InputQueue mCurInputQueue; @@ -87,7 +87,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private boolean mDestroyed; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native long loadNativeCode(String path, String funcname, MessageQueue queue, String internalDataPath, String obbPath, String externalDataPath, int sdkVersion, AssetManager assetMgr, byte[] savedState, ClassLoader classLoader, String libraryPath); @@ -315,22 +315,22 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setWindowFlags(int flags, int mask) { getWindow().setFlags(flags, mask); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setWindowFormat(int format) { getWindow().setFormat(format); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void showIme(int mode) { mIMM.showSoftInput(mNativeContentView, mode); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void hideIme(int mode) { mIMM.hideSoftInputFromWindow(mNativeContentView.getWindowToken(), mode); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 5e50b96a23d5..a1abe3d8190b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5266,7 +5266,7 @@ public class Notification implements Parcelable /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String loadHeaderAppName() { CharSequence name = null; final PackageManager pm = mContext.getPackageManager(); diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index f3bd04cd132e..27cd78acb35f 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1112,7 +1112,7 @@ public class NotificationManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ZenModeConfig getZenModeConfig() { INotificationManager service = getService(); try { diff --git a/core/java/android/app/PackageDeleteObserver.java b/core/java/android/app/PackageDeleteObserver.java index d8803aa13e42..4ff6f2a5133b 100644 --- a/core/java/android/app/PackageDeleteObserver.java +++ b/core/java/android/app/PackageDeleteObserver.java @@ -19,11 +19,12 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.pm.IPackageDeleteObserver2; +import android.os.Build; /** {@hide} */ public class PackageDeleteObserver { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PackageDeleteObserver() { } diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 1f81c44e54cb..40dee52c557e 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -311,7 +311,7 @@ public final class PendingIntent implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setOnMarshaledListener(OnMarshaledListener listener) { sOnMarshaledListener.set(listener); } diff --git a/core/java/android/app/QueuedWork.java b/core/java/android/app/QueuedWork.java index a1fcf53a2c37..edf0a46b1433 100644 --- a/core/java/android/app/QueuedWork.java +++ b/core/java/android/app/QueuedWork.java @@ -17,6 +17,7 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -217,7 +218,7 @@ public class QueuedWork { * @param work The new runnable to process * @param shouldDelay If the message should be delayed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void queue(Runnable work, boolean shouldDelay) { Handler handler = getHandler(); diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index dcb53505227a..7dd7c901ff84 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -31,6 +31,7 @@ import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Rect; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -778,7 +779,7 @@ public class SearchManager * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVisible() { return mSearchDialog == null? false : mSearchDialog.isShowing(); } diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java index 3df164822f32..bc1bcbc4f80e 100644 --- a/core/java/android/app/SharedPreferencesImpl.java +++ b/core/java/android/app/SharedPreferencesImpl.java @@ -130,7 +130,7 @@ final class SharedPreferencesImpl implements SharedPreferences { startLoadFromDisk(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void startLoadFromDisk() { synchronized (mLock) { mLoaded = false; diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 864db2722d53..b8fae6755bfd 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -26,6 +26,7 @@ import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -54,7 +55,7 @@ public class StatusBarManager { /** @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISABLE_NOTIFICATION_TICKER = View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER; /** @hide */ @@ -313,7 +314,7 @@ public class StatusBarManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void expandSettingsPanel(@Nullable String subPanel) { try { final IStatusBarService svc = getService(); @@ -326,7 +327,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIcon(String slot, int iconId, int iconLevel, String contentDescription) { try { final IStatusBarService svc = getService(); @@ -340,7 +341,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeIcon(String slot) { try { final IStatusBarService svc = getService(); @@ -353,7 +354,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIconVisibility(String slot, boolean visible) { try { final IStatusBarService svc = getService(); diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index 5caf3057c840..8a3ae04a3589 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -26,6 +26,7 @@ import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; @@ -45,7 +46,7 @@ public class TaskInfo { * running user of the system otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int userId; /** diff --git a/core/java/android/app/TaskStackListener.java b/core/java/android/app/TaskStackListener.java index e77d7ac6a4ad..70ad9af8a037 100644 --- a/core/java/android/app/TaskStackListener.java +++ b/core/java/android/app/TaskStackListener.java @@ -21,6 +21,7 @@ import android.app.ActivityManager.TaskSnapshot; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -37,35 +38,35 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskStackChanged() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityPinned(String packageName, int userId, int taskId, int stackId) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityUnpinned() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityForcedResizable(String packageName, int taskId, int reason) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityDismissingDockedStack() throws RemoteException { } @@ -80,12 +81,12 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * #onActivityLaunchOnSecondaryDisplayFailed(RunningTaskInfo, int)} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityLaunchOnSecondaryDisplayFailed() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityLaunchOnSecondaryDisplayRerouted(RunningTaskInfo taskInfo, int requestedDisplayId) throws RemoteException { } @@ -95,7 +96,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskRemoved(int taskId) throws RemoteException { } @@ -109,7 +110,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * @deprecated see {@link #onTaskMovedToFront(RunningTaskInfo)} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskMovedToFront(int taskId) throws RemoteException { } @@ -141,18 +142,18 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskProfileLocked(int taskId, int userId) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) throws RemoteException { if (Binder.getCallingPid() != android.os.Process.myPid() && snapshot != null && snapshot.getHardwareBuffer() != null) { @@ -162,7 +163,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken) throws RemoteException { } diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index 255b93f79811..290e12191de8 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -25,6 +25,7 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.hardware.input.InputManager; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.Process; @@ -88,7 +89,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { private int mOwningUid; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UiAutomationConnection() { } diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 08a210b069b9..42b4c5c389bb 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -9,6 +9,7 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; +import android.os.Build; import android.os.RemoteException; import android.service.vr.IPersistentVrStateCallbacks; import android.service.vr.IVrManager; @@ -51,7 +52,7 @@ public class VrManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final IVrManager mService; private Map mCallbackMap = new ArrayMap<>(); diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 54f3209e17be..ab0901da632f 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1977,7 +1977,7 @@ public class WallpaperManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static InputStream openDefaultWallpaper(Context context, @SetWallpaperFlags int which) { final String whichProp; final int defaultResId; diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 4c541b3f6b76..1ee8e4fce58b 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -459,7 +459,7 @@ public final class DeviceAdminInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getUsedPolicies() { ArrayList res = new ArrayList(); for (int i=0; i exclusionList ) { throwIfParentInstance("setGlobalProxy"); @@ -6308,7 +6308,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setActiveAdmin(@NonNull ComponentName policyReceiver, boolean refreshing, int userHandle) { if (mService != null) { @@ -7022,7 +7022,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable ComponentName getProfileOwnerAsUser(final int userId) { if (mService != null) { try { @@ -7437,7 +7437,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN) public @Nullable List getTrustAgentConfiguration( @Nullable ComponentName admin, @NonNull ComponentName agent, int userHandle) { @@ -10623,7 +10623,7 @@ public class DevicePolicyManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void throwIfParentInstance(String functionName) { if (mParentInstance) { throw new SecurityException(functionName + " cannot be called on the parent instance"); diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 5a4ab48f3823..86f91d79ad2b 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemProperties; @@ -524,7 +525,7 @@ public class SecurityLog { * Constructor used by native classes to generate SecurityEvent instances. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ SecurityEvent(byte[] data) { this(0, data); } diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index fb161d41acd2..50d7cec0bc71 100644 --- a/core/java/android/app/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -18,6 +18,7 @@ package android.app.backup; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -68,7 +69,7 @@ public class BackupDataOutput { private final long mQuota; private final int mTransportFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) long mBackupWriter; /** diff --git a/core/java/android/app/backup/FullBackup.java b/core/java/android/app/backup/FullBackup.java index 587e883edaf2..c854abac291e 100644 --- a/core/java/android/app/backup/FullBackup.java +++ b/core/java/android/app/backup/FullBackup.java @@ -20,6 +20,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.XmlResourceParser; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.Process; import android.os.storage.StorageManager; @@ -91,7 +92,7 @@ public class FullBackup { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static public native int backupToTar(String packageName, String domain, String linkdomain, String rootpath, String path, FullBackupDataOutput output); diff --git a/core/java/android/app/backup/FullBackupDataOutput.java b/core/java/android/app/backup/FullBackupDataOutput.java index d8fa0f586b7a..a47478cc66a7 100644 --- a/core/java/android/app/backup/FullBackupDataOutput.java +++ b/core/java/android/app/backup/FullBackupDataOutput.java @@ -1,6 +1,7 @@ package android.app.backup; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -77,7 +78,7 @@ public class FullBackupDataOutput { public BackupDataOutput getData() { return mData; } /** @hide - used for measurement pass */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addSize(long size) { if (size > 0) { mSize += size; diff --git a/core/java/android/app/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl index e177a74915ee..e1bbc08e72f3 100644 --- a/core/java/android/app/backup/IBackupManager.aidl +++ b/core/java/android/app/backup/IBackupManager.aidl @@ -74,7 +74,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.clearBackupDataForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void clearBackupData(String transportName, String packageName); /** @@ -157,7 +157,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setBackupEnabled(boolean isEnabled); /** @@ -181,7 +181,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setAutoRestoreForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAutoRestore(boolean doAutoRestore); /** @@ -198,7 +198,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.isBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBackupEnabled(); /** @@ -327,7 +327,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.acknowledgeFullBackupOrRestoreForUser} for the * calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void acknowledgeFullBackupOrRestore(int token, boolean allow, in String curPassword, in String encryptionPassword, IFullBackupRestoreObserver observer); @@ -404,7 +404,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.listAllTransportsForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String[] listAllTransports(); /** @@ -442,7 +442,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.selectBackupTransportForUser} for the calling user * id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String selectBackupTransport(String transport); /** @@ -595,7 +595,7 @@ interface IBackupManager { * @param whichUser User handle of the defined user whose backup active state * is being queried. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBackupServiceActive(int whichUser); /** diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index 8320f49f132f..e059f177e344 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -24,6 +24,7 @@ import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.app.ResultInfo; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -37,7 +38,7 @@ import java.util.Objects; */ public class ActivityResultItem extends ActivityTransactionItem { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private List mResultInfoList; /* TODO(b/78294732) diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index ac57f2bf80e0..723fa012c902 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -39,7 +40,7 @@ import java.util.Objects; */ public class NewIntentItem extends ActivityTransactionItem { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private List mIntents; private boolean mResume; diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl index ed6ba0c5efa4..2c1e951b6128 100644 --- a/core/java/android/app/usage/IUsageStatsManager.aidl +++ b/core/java/android/app/usage/IUsageStatsManager.aidl @@ -28,10 +28,10 @@ import java.util.Map; * {@hide} */ interface IUsageStatsManager { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryUsageStats(int bucketType, long beginTime, long endTime, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryConfigurationStats(int bucketType, long beginTime, long endTime, String callingPackage); ParceledListSlice queryEventStats(int bucketType, long beginTime, long endTime, @@ -40,9 +40,9 @@ interface IUsageStatsManager { UsageEvents queryEventsForPackage(long beginTime, long endTime, String callingPackage); UsageEvents queryEventsForUser(long beginTime, long endTime, int userId, String callingPackage); UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAppInactive(String packageName, boolean inactive, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isAppInactive(String packageName, int userId, String callingPackage); void onCarrierPrivilegedAppsChanged(); void reportChooserSelection(String packageName, int userId, String contentType, diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java index fc8248e1012a..1ddfe0d2479a 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/core/java/android/app/usage/NetworkStatsManager.java @@ -34,6 +34,7 @@ import android.net.NetworkTemplate; import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.NetworkStatsProvider; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -129,7 +130,7 @@ public class NetworkStatsManager { /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStatsManager(Context context) throws ServiceNotFoundException { this(context, INetworkStatsService.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE))); @@ -153,7 +154,7 @@ public class NetworkStatsManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public void setPollForce(boolean pollForce) { if (pollForce) { diff --git a/core/java/android/appwidget/AppWidgetHost.java b/core/java/android/appwidget/AppWidgetHost.java index 467b2fba1102..565e4cd7fea0 100644 --- a/core/java/android/appwidget/AppWidgetHost.java +++ b/core/java/android/appwidget/AppWidgetHost.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.IntentSender; import android.content.pm.PackageManager; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -54,7 +55,7 @@ public class AppWidgetHost { static final int HANDLE_UPDATE = 1; static final int HANDLE_PROVIDER_CHANGED = 2; static final int HANDLE_PROVIDERS_CHANGED = 3; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final int HANDLE_VIEW_DATA_CHANGED = 4; static final int HANDLE_APP_WIDGET_REMOVED = 5; @@ -173,7 +174,7 @@ public class AppWidgetHost { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AppWidgetHost(Context context, int hostId, OnClickHandler handler, Looper looper) { mContextOpPackageName = context.getOpPackageName(); mHostId = hostId; diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 3fef92b203b6..a3c3a0e106a3 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -30,6 +30,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; +import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; import android.os.Parcelable; @@ -286,7 +287,7 @@ public class AppWidgetHostView extends FrameLayout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth, int maxHeight, boolean ignorePadding) { if (newOptions == null) { diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 009ec522e436..37093a10b2f0 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -34,6 +34,7 @@ import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.pm.ShortcutInfo; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -943,7 +944,7 @@ public class AppWidgetManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void bindAppWidgetId(int appWidgetId, ComponentName provider, Bundle options) { if (mService == null) { return; @@ -1114,7 +1115,7 @@ public class AppWidgetManager { * @see Context#getServiceDispatcher(ServiceConnection, Handler, int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean bindRemoteViewsService(Context context, int appWidgetId, Intent intent, IServiceConnection connection, @Context.BindServiceFlags int flags) { if (mService == null) { diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index 5374d6d55ee3..c0cb32346821 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -118,7 +118,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -139,7 +139,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_CODEC_CONFIG_CHANGED = "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED"; @@ -409,7 +409,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); try { @@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * is active * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { @@ -651,7 +651,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @return the current codec status * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) { @@ -680,7 +680,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @param codecConfig the codec configuration preference * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void setCodecConfigPreference(@NonNull BluetoothDevice device, @NonNull BluetoothCodecConfig codecConfig) { @@ -710,7 +710,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void enableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")"); @@ -725,7 +725,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void disableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")"); @@ -766,7 +766,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_SUPPORTED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsSupportStatus public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) { @@ -792,7 +792,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsPreferenceStatus public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) { @@ -819,7 +819,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device, @OptionalCodecsPreferenceStatus int value) { diff --git a/core/java/android/bluetooth/BluetoothA2dpSink.java b/core/java/android/bluetooth/BluetoothA2dpSink.java index 53f87e6bc05b..67f3d7b5d717 100755 --- a/core/java/android/bluetooth/BluetoothA2dpSink.java +++ b/core/java/android/bluetooth/BluetoothA2dpSink.java @@ -24,6 +24,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -158,7 +159,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 573892bcf014..475be121b735 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -40,6 +40,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.BatteryStats; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.ParcelUuid; import android.os.RemoteException; @@ -1170,7 +1171,7 @@ public final class BluetoothAdapter { * @return true to indicate adapter shutdown has begun, or false on immediate error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disable(boolean persist) { try { @@ -1219,7 +1220,7 @@ public final class BluetoothAdapter { * @return true to indicate that the config file was successfully cleared * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset() { try { @@ -2625,7 +2626,7 @@ public final class BluetoothAdapter { * permissions, or channel in use. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(String name, UUID uuid) throws IOException { return createNewRfcommSocketAndRecord(name, uuid, false, true); diff --git a/core/java/android/bluetooth/BluetoothCodecStatus.java b/core/java/android/bluetooth/BluetoothCodecStatus.java index 7764ebeb2e33..3a65aaa0d16c 100644 --- a/core/java/android/bluetooth/BluetoothCodecStatus.java +++ b/core/java/android/bluetooth/BluetoothCodecStatus.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +40,7 @@ public final class BluetoothCodecStatus implements Parcelable { * This extra represents the current codec status of the A2DP * profile. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_CODEC_STATUS = "android.bluetooth.extra.CODEC_STATUS"; @@ -198,7 +199,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return the current codec configuration */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig getCodecConfig() { return mCodecConfig; } @@ -208,7 +209,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs local capabilities */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() { return mCodecsLocalCapabilities; } @@ -218,7 +219,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs selectable capabilities */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() { return mCodecsSelectableCapabilities; } diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 1b0fe9dc2d78..3b8dec7bf955 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -28,6 +28,7 @@ import android.annotation.SystemApi; import android.app.PropertyInvalidatedCache; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Parcel; import android.os.ParcelUuid; @@ -369,7 +370,7 @@ public final class BluetoothDevice implements Parcelable { /** @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_SDP_RECORD = "android.bluetooth.device.action.SDP_RECORD"; @@ -665,7 +666,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_FAILED = 1; /** @@ -674,7 +675,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_REJECTED = 2; /** @@ -689,7 +690,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REMOTE_DEVICE_DOWN = 4; /** @@ -697,7 +698,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5; /** @@ -705,7 +706,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_TIMEOUT = 6; /** @@ -713,7 +714,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7; /** @@ -722,7 +723,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8; /** @@ -801,7 +802,7 @@ public final class BluetoothDevice implements Parcelable { "android.bluetooth.device.extra.SDP_RECORD"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_SDP_SEARCH_STATUS = "android.bluetooth.device.extra.SDP_SEARCH_STATUS"; @@ -1134,7 +1135,7 @@ public final class BluetoothDevice implements Parcelable { * @return true on success, false on error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public boolean setAlias(@NonNull String alias) { final IBluetooth service = sService; @@ -1573,7 +1574,7 @@ public final class BluetoothDevice implements Parcelable { * @return true pin has been set false for error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean setPin(@NonNull String pin) { byte[] pinBytes = convertPinToBytes(pin); @@ -2187,7 +2188,7 @@ public final class BluetoothDevice implements Parcelable { * operations. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BluetoothGatt connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport, boolean opportunistic, int phy, Handler handler) { diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index 6d22eb93fd02..7a6ff79623af 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -58,9 +58,9 @@ public final class BluetoothGatt implements BluetoothProfile { private int mConnState; private final Object mStateLock = new Object(); private final Object mDeviceBusyLock = new Object(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Boolean mDeviceBusy = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mTransport; private int mPhy; private boolean mOpportunistic; @@ -881,7 +881,7 @@ public final class BluetoothGatt implements BluetoothProfile { * automatically connect as soon as the remote device becomes available (true). * @return true, if the connection attempt was initiated successfully */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ boolean connect(Boolean autoConnect, BluetoothGattCallback callback, Handler handler) { if (DBG) { diff --git a/core/java/android/bluetooth/BluetoothGattService.java b/core/java/android/bluetooth/BluetoothGattService.java index e7809aeb1bb5..23dc7c830855 100644 --- a/core/java/android/bluetooth/BluetoothGattService.java +++ b/core/java/android/bluetooth/BluetoothGattService.java @@ -16,6 +16,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -385,7 +386,7 @@ public class BluetoothGattService implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAdvertisePreferred(boolean advertisePreferred) { mAdvertisePreferred = advertisePreferred; } diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index e6d6e7ac5dda..57d1411aa68a 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -27,6 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -112,7 +113,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -635,7 +636,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @return priority of the device * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public int getPriority(BluetoothDevice device) { if (VDBG) log("getPriority(" + device + ")"); @@ -782,7 +783,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadset service = mService; @@ -1030,7 +1031,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type, String name) { final IBluetoothHeadset service = mService; @@ -1129,7 +1130,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) { Log.d(TAG, "setActiveDevice: " + device); @@ -1155,7 +1156,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * is active. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { diff --git a/core/java/android/bluetooth/BluetoothHeadsetClient.java b/core/java/android/bluetooth/BluetoothHeadsetClient.java index 28363250ebda..e5b2a1e23cc1 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClient.java @@ -22,6 +22,7 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; @@ -445,7 +446,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -471,7 +472,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -780,7 +781,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * @return true if command has been issued successfully; false * otherwise; upon completion HFP sends {@link #ACTION_CALL_CHANGED} intent. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean acceptCall(BluetoothDevice device, int flag) { if (DBG) log("acceptCall()"); final IBluetoothHeadsetClient service = @@ -829,7 +830,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * #EXTRA_AG_FEATURE_REJECT_CALL}. This method invocation will fail silently when feature is not * supported.

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean rejectCall(BluetoothDevice device) { if (DBG) log("rejectCall()"); final IBluetoothHeadsetClient service = @@ -1014,7 +1015,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * Note: This is an internal function and shouldn't be exposed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadsetClient service = diff --git a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java index d1a096e605dd..219d1596fbf3 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java @@ -17,6 +17,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -144,7 +145,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return call id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getId() { return mId; } @@ -164,7 +165,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return state of this particular phone call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getState() { return mState; } @@ -174,7 +175,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return string representing phone number. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getNumber() { return mNumber; } @@ -193,7 +194,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if call is a multi party call, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isMultiParty() { return mMultiParty; } @@ -203,7 +204,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if its outgoing call, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOutgoing() { return mOutgoing; } diff --git a/core/java/android/bluetooth/BluetoothHearingAid.java b/core/java/android/bluetooth/BluetoothHearingAid.java index fa62a02499e0..ff78825e0f96 100644 --- a/core/java/android/bluetooth/BluetoothHearingAid.java +++ b/core/java/android/bluetooth/BluetoothHearingAid.java @@ -26,6 +26,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -85,7 +86,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -302,7 +303,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); final IBluetoothHearingAid service = getService(); @@ -328,7 +329,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * is not active, it will be null on that position. Returns empty list on error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public @NonNull List getActiveDevices() { if (VDBG) log("getActiveDevices()"); diff --git a/core/java/android/bluetooth/BluetoothMap.java b/core/java/android/bluetooth/BluetoothMap.java index 14a71c44673b..35549954007e 100644 --- a/core/java/android/bluetooth/BluetoothMap.java +++ b/core/java/android/bluetooth/BluetoothMap.java @@ -24,6 +24,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.CloseGuard; @@ -209,7 +210,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothMap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothMapClient.java b/core/java/android/bluetooth/BluetoothMapClient.java index df11d3adac01..ff6cffb272a5 100644 --- a/core/java/android/bluetooth/BluetoothMapClient.java +++ b/core/java/android/bluetooth/BluetoothMapClient.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -388,7 +389,7 @@ public final class BluetoothMapClient implements BluetoothProfile { * @param deliveredIntent intent issued when message is delivered * @return true if the message is enqueued, false on error */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean sendMessage(BluetoothDevice device, Uri[] contacts, String message, PendingIntent sentIntent, PendingIntent deliveredIntent) { if (DBG) Log.d(TAG, "sendMessage(" + device + ", " + contacts + ", " + message); diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java index ce3c7d25a108..ecd718cec32b 100644 --- a/core/java/android/bluetooth/BluetoothPan.java +++ b/core/java/android/bluetooth/BluetoothPan.java @@ -27,6 +27,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -234,7 +235,7 @@ public final class BluetoothPan implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothPan service = getService(); diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java index d58a89350195..6e5c45f3d129 100644 --- a/core/java/android/bluetooth/BluetoothPbap.java +++ b/core/java/android/bluetooth/BluetoothPbap.java @@ -27,6 +27,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; @@ -322,7 +323,7 @@ public class BluetoothPbap implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { log("disconnect()"); final IBluetoothPbap service = mService; diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index 7538df8bbe5f..db851c4f33b9 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -23,6 +23,7 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -219,7 +220,7 @@ public interface BluetoothProfile { * * @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int PRIORITY_AUTO_CONNECT = 1000; /** diff --git a/core/java/android/bluetooth/BluetoothSap.java b/core/java/android/bluetooth/BluetoothSap.java index 48e8c1ada255..0d70dbdd8427 100644 --- a/core/java/android/bluetooth/BluetoothSap.java +++ b/core/java/android/bluetooth/BluetoothSap.java @@ -21,6 +21,7 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -219,7 +220,7 @@ public final class BluetoothSap implements BluetoothProfile { * @return false on error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothSap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index d41a6d064d1f..65381dbb2372 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; import android.net.LocalSocket; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.ParcelUuid; import android.os.RemoteException; @@ -111,7 +112,7 @@ public final class BluetoothSocket implements Closeable { public static final int TYPE_L2CAP_LE = 4; /*package*/ static final int EBADFD = 77; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ static final int EADDRINUSE = 98; /*package*/ static final int SEC_FLAG_ENCRYPT = 1; diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index c0c1aa1634ff..d9ea7d237e51 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.bluetooth.BluetoothUuid; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelUuid; import android.util.ArrayMap; import android.util.Log; @@ -195,7 +196,7 @@ public final class ScanRecord { * @param scanRecord The scan record of Bluetooth LE advertisement and/or scan response. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ScanRecord parseFromBytes(byte[] scanRecord) { if (scanRecord == null) { return null; diff --git a/core/java/android/companion/AssociationRequest.java b/core/java/android/companion/AssociationRequest.java index c55f0ff7da93..223005bbf30c 100644 --- a/core/java/android/companion/AssociationRequest.java +++ b/core/java/android/companion/AssociationRequest.java @@ -19,6 +19,7 @@ package android.companion; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.provider.OneTimeUseBuilder; @@ -60,14 +61,14 @@ public final class AssociationRequest implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSingleDevice() { return mSingleDevice; } /** @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List> getDeviceFilters() { return mDeviceFilters; } diff --git a/core/java/android/companion/BluetoothDeviceFilter.java b/core/java/android/companion/BluetoothDeviceFilter.java index 48dab3b264fd..be663f7bdc1d 100644 --- a/core/java/android/companion/BluetoothDeviceFilter.java +++ b/core/java/android/companion/BluetoothDeviceFilter.java @@ -27,6 +27,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.provider.OneTimeUseBuilder; @@ -100,7 +101,7 @@ public final class BluetoothDeviceFilter implements DeviceFilter { /** @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ScanFilter getScanFilter() { return mScanFilter; } diff --git a/core/java/android/companion/DeviceFilter.java b/core/java/android/companion/DeviceFilter.java index c9cb072904b4..37191a246f00 100644 --- a/core/java/android/companion/DeviceFilter.java +++ b/core/java/android/companion/DeviceFilter.java @@ -20,6 +20,7 @@ package android.companion; import android.annotation.IntDef; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcelable; import java.lang.annotation.Retention; @@ -45,11 +46,11 @@ public interface DeviceFilter extends Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean matches(D device); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) String getDeviceDisplayName(D device); /** @hide */ diff --git a/core/java/android/companion/IFindDeviceCallback.aidl b/core/java/android/companion/IFindDeviceCallback.aidl index 405277b50f5b..a3a47a9fc857 100644 --- a/core/java/android/companion/IFindDeviceCallback.aidl +++ b/core/java/android/companion/IFindDeviceCallback.aidl @@ -20,7 +20,7 @@ import android.app.PendingIntent; /** @hide */ interface IFindDeviceCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) oneway void onSuccess(in PendingIntent launcher); oneway void onFailure(in CharSequence reason); } diff --git a/core/java/android/content/ComponentName.java b/core/java/android/content/ComponentName.java index b1cee0cb00e0..5f859846a5c1 100644 --- a/core/java/android/content/ComponentName.java +++ b/core/java/android/content/ComponentName.java @@ -19,6 +19,7 @@ package android.content; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -241,14 +242,14 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final ForceLoadContentObserver mObserver; Uri mUri; @@ -55,7 +56,7 @@ public class CursorLoader extends AsyncTaskLoader { String mSortOrder; Cursor mCursor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CancellationSignal mCancellationSignal; /* Runs on a worker thread */ diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java index 84b0f0e80bab..becba67a0198 100644 --- a/core/java/android/content/IContentProvider.java +++ b/core/java/android/content/IContentProvider.java @@ -152,7 +152,7 @@ public interface IContentProvider extends IInterface { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) static final String descriptor = "android.content.IContentProvider"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final int QUERY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION; static final int GET_TYPE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 1; static final int INSERT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 2; diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl index 03c99e1a2344..2044fc02a7e5 100644 --- a/core/java/android/content/IContentService.aidl +++ b/core/java/android/content/IContentService.aidl @@ -61,7 +61,7 @@ interface IContentService { */ void sync(in SyncRequest request, String callingPackage); void syncAsUser(in SyncRequest request, int userId, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cancelSync(in Account account, String authority, in ComponentName cname); void cancelSyncAsUser(in Account account, String authority, in ComponentName cname, int userId); @@ -159,7 +159,7 @@ interface IContentService { * @param cname component to identify sync service, must be null if account/providerName are * non-null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isSyncActive(in Account account, String authority, in ComponentName cname); /** diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl index 9242d0289cfa..55210d4aa119 100644 --- a/core/java/android/content/ISyncAdapter.aidl +++ b/core/java/android/content/ISyncAdapter.aidl @@ -32,7 +32,7 @@ oneway interface ISyncAdapter { * * @param cb If called back with {@code false} accounts are not synced. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb); /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 9216a0871870..06ac5dbed702 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2338,7 +2338,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ALARM_CHANGED = "android.intent.action.ALARM_CHANGED"; /** @@ -3724,7 +3724,7 @@ public class Intent implements Parcelable, Cloneable { * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED"; @@ -7444,7 +7444,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("AndroidFrameworkEfficientCollections") public static Intent parseCommandArgs(ShellCommand cmd, CommandOptionHandler optionHandler) throws URISyntaxException { @@ -7836,7 +7836,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void printIntentArgsHelp(PrintWriter pw, String prefix) { final String[] lines = new String[] { " specifications include these flags and arguments:", @@ -8126,7 +8126,7 @@ public class Intent implements Parcelable, Cloneable { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAllowFds(boolean allowFds) { if (mExtras != null) { mExtras.setAllowFds(allowFds); @@ -10473,7 +10473,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String toInsecureString() { StringBuilder b = new StringBuilder(128); @@ -11156,7 +11156,7 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void prepareToLeaveProcess(Context context) { final boolean leavingPackage = (mComponent == null) || !Objects.equals(mComponent.getPackageName(), context.getPackageName()); diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 5240ab4e476f..f0633591f16c 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -570,7 +570,7 @@ public class IntentFilter implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void setAutoVerify(boolean autoVerify) { mVerifyState &= ~STATE_VERIFY_AUTO; if (autoVerify) mVerifyState |= STATE_VERIFY_AUTO; @@ -950,7 +950,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasExactDataType(String type) { return mDataTypes != null && mDataTypes.contains(type); } @@ -1295,7 +1295,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataSchemeSpecificPart(PatternMatcher ssp) { if (mDataSchemeSpecificParts == null) { return false; @@ -1379,7 +1379,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataAuthority(AuthorityEntry auth) { if (mDataAuthorities == null) { return false; @@ -1488,7 +1488,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataPath(PatternMatcher path) { if (mDataPaths == null) { return false; diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java index ffcdf53ca84d..1c21b2aa73a5 100644 --- a/core/java/android/content/SyncAdapterType.java +++ b/core/java/android/content/SyncAdapterType.java @@ -35,11 +35,11 @@ public class SyncAdapterType implements Parcelable { private final boolean userVisible; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean supportsUploading; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean isAlwaysSyncable; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean allowParallelSyncs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final String settingsActivity; private final String packageName; diff --git a/core/java/android/content/UndoManager.java b/core/java/android/content/UndoManager.java index ed9cd86927ae..87afbf874b37 100644 --- a/core/java/android/content/UndoManager.java +++ b/core/java/android/content/UndoManager.java @@ -17,6 +17,7 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.text.TextUtils; import android.util.ArrayMap; @@ -85,11 +86,11 @@ public class UndoManager { */ public static final int MERGE_MODE_ANY = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoManager() { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoOwner getOwner(String tag, Object data) { if (tag == null) { throw new NullPointerException("tag can't be null"); @@ -126,7 +127,7 @@ public class UndoManager { * Flatten the current undo state into a Parcel object, which can later be restored * with {@link #restoreInstanceState(android.os.Parcel, java.lang.ClassLoader)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void saveInstanceState(Parcel p) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -175,7 +176,7 @@ public class UndoManager { * associated with each {@link UndoOwner}, which requires separate calls to * {@link #getOwner(String, Object)} to re-associate the owner with its data. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void restoreInstanceState(Parcel p, ClassLoader loader) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -236,7 +237,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually popped. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int undo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -274,7 +275,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually redone. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int redo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -303,12 +304,12 @@ public class UndoManager { * useful for editors to know whether they should be generating new undo state * when they see edit operations happening. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isInUndo() { return mInUndo; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int forgetUndos(UndoOwner[] owners, int count) { if (count < 0) { count = mUndos.size(); @@ -330,7 +331,7 @@ public class UndoManager { return removed; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int forgetRedos(UndoOwner[] owners, int count) { if (count < 0) { count = mRedos.size(); @@ -357,7 +358,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int countUndos(UndoOwner[] owners) { if (owners == null) { return mUndos.size(); @@ -377,7 +378,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int countRedos(UndoOwner[] owners) { if (owners == null) { return mRedos.size(); @@ -417,7 +418,7 @@ public class UndoManager { * they are all matched by a later call to {@link #endUpdate}. * @param label Optional user-visible label for this new undo state. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void beginUpdate(CharSequence label) { if (mInUndo) { throw new IllegalStateException("Can't being update while performing undo/redo"); @@ -450,7 +451,7 @@ public class UndoManager { * Forcibly set a new for the new undo state being built within a {@link #beginUpdate}. * Any existing label will be replaced with this one. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUndoLabel(CharSequence label) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -525,7 +526,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public T getLastOperation(Class clazz, UndoOwner owner, int mergeMode) { if (mWorking == null) { @@ -555,7 +556,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addOperation(UndoOperation op, int mergeMode) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -582,7 +583,7 @@ public class UndoManager { * Finish the creation of an undo state, matching a previous call to * {@link #beginUpdate}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void endUpdate() { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -631,7 +632,7 @@ public class UndoManager { * @return Returns an integer identifier for the committed undo state, which * can later be used to try to uncommit the state to perform further edits on it. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int commitState(UndoOwner owner) { if (mWorking != null && mWorking.hasData()) { if (owner == null || mWorking.hasOperation(owner)) { diff --git a/core/java/android/content/UndoOperation.java b/core/java/android/content/UndoOperation.java index 235d72123ff6..25aeca3290f3 100644 --- a/core/java/android/content/UndoOperation.java +++ b/core/java/android/content/UndoOperation.java @@ -17,6 +17,7 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +36,7 @@ public abstract class UndoOperation implements Parcelable { * @param owner Who owns the data being modified by this undo state; must be * returned by {@link UndoManager#getOwner(String, Object) UndoManager.getOwner}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoOperation(UndoOwner owner) { mOwner = owner; } @@ -43,7 +44,7 @@ public abstract class UndoOperation implements Parcelable { /** * Construct from a Parcel. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected UndoOperation(Parcel src, ClassLoader loader) { } diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl index 3d7e3befd9f1..44b5c4482599 100644 --- a/core/java/android/content/om/IOverlayManager.aidl +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -37,7 +37,7 @@ interface IOverlayManager { * mapped to lists of overlays; if no overlays exist for the * requested user, an empty map is returned. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Map getAllOverlays(in int userId); /** @@ -61,7 +61,7 @@ interface IOverlayManager { * @return The OverlayInfo for the overlay package; or null if no such * overlay package exists. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) OverlayInfo getOverlayInfo(in String packageName, in int userId); /** diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index 62815ddcfc19..517e4bda68d7 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -174,7 +175,7 @@ public final class OverlayInfo implements Parcelable { * The state of this OverlayInfo as defined by the STATE_* constants in this class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final @State int state; /** diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index b371141ca9c1..9c4e6aa3e17f 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.res.Configuration; import android.content.res.Configuration.NativeConfig; import android.content.res.TypedArray; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Printer; @@ -373,7 +374,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * {@link android.R.attr#showForAllUsers} attribute. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_SHOW_FOR_ALL_USERS = 0x0400; /** * Bit in {@link #flags} corresponding to an immersive activity @@ -502,7 +503,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * this activity is launched into such a container a SecurityException will be * thrown. Set from the {@link android.R.attr#allowEmbedded} attribute. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_ALLOW_EMBEDDED = 0x80000000; /** @@ -869,7 +870,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NativeConfig int activityInfoConfigJavaToNative(@Config int input) { int output = 0; for (int i = 0; i < CONFIG_NATIVE_BITS.length; i++) { diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 8f4fc261df37..1cca53f369fa 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -128,7 +128,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int fullBackupContent = 0; /** @@ -2236,7 +2236,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** {@hide} */ public void setGwpAsanMode(@GwpAsanMode int value) { gwpAsanMode = value; } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getCodePath() { return scanSourceDir; } /** {@hide} */ public String getBaseCodePath() { return sourceDir; } /** {@hide} */ public String[] getSplitCodePaths() { return splitSourceDirs; } diff --git a/core/java/android/content/pm/BaseParceledListSlice.java b/core/java/android/content/pm/BaseParceledListSlice.java index bd847bfdb719..5c7a5488076b 100644 --- a/core/java/android/content/pm/BaseParceledListSlice.java +++ b/core/java/android/content/pm/BaseParceledListSlice.java @@ -18,6 +18,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -133,7 +134,7 @@ abstract class BaseParceledListSlice implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List getList() { return mList; } @@ -207,7 +208,7 @@ abstract class BaseParceledListSlice implements Parcelable { protected abstract void writeElement(T parcelable, Parcel reply, int callFlags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void writeParcelableCreator(T parcelable, Parcel dest); protected abstract Parcelable.Creator readParcelableCreator(Parcel from, ClassLoader loader); diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java index 628bcd70cdf6..c67d00e88707 100644 --- a/core/java/android/content/pm/ComponentInfo.java +++ b/core/java/android/content/pm/ComponentInfo.java @@ -19,6 +19,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.util.Printer; @@ -158,7 +159,7 @@ public class ComponentInfo extends PackageItemInfo { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentName getComponentName() { return new ComponentName(packageName, name); } diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl index 2147c397725b..d7c257affd43 100644 --- a/core/java/android/content/pm/IPackageInstaller.aidl +++ b/core/java/android/content/pm/IPackageInstaller.aidl @@ -48,7 +48,7 @@ interface IPackageInstaller { void registerCallback(IPackageInstallerCallback callback, int userId); void unregisterCallback(IPackageInstallerCallback callback); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void uninstall(in VersionedPackage versionedPackage, String callerPackageName, int flags, in IntentSender statusReceiver, int userId); diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index c32d34457889..aaedf92905a8 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -64,7 +64,7 @@ import android.content.IntentSender; */ interface IPackageManager { void checkPackageStartable(String packageName, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isPackageAvailable(String packageName, int userId); @UnsupportedAppUsage PackageInfo getPackageInfo(String packageName, int flags, int userId); @@ -137,7 +137,7 @@ interface IPackageManager { boolean canForwardTo(in Intent intent, String resolvedType, int sourceUserId, int targetUserId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryIntentActivities(in Intent intent, String resolvedType, int flags, int userId); @@ -182,7 +182,7 @@ interface IPackageManager { * limit that kicks in when flags are included that bloat up the data * returned. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice getInstalledApplications(int flags, int userId); /** @@ -203,7 +203,7 @@ interface IPackageManager { * @param outInfo Filled in with a list of the ProviderInfo for each * name in 'outNames'. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void querySyncProviders(inout List outNames, inout List outInfo); @@ -214,7 +214,7 @@ interface IPackageManager { InstrumentationInfo getInstrumentationInfo( in ComponentName className, int flags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryInstrumentation( String targetPackage, int flags); @@ -649,7 +649,7 @@ interface IPackageManager { void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden); boolean setSystemAppInstallState(String packageName, boolean installed, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IPackageInstaller getPackageInstaller(); boolean setBlockUninstallForUser(String packageName, boolean blockUninstall, int userId); @@ -661,7 +661,7 @@ interface IPackageManager { boolean isPackageSignedByKeySet(String packageName, in KeySet ks); boolean isPackageSignedByKeySetExactly(String packageName, in KeySet ks); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getPermissionControllerPackageName(); ParceledListSlice getInstantApps(int userId); @@ -678,9 +678,9 @@ interface IPackageManager { */ void setUpdateAvailable(String packageName, boolean updateAvaialble); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getServicesSystemSharedLibraryPackageName(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getSharedSystemSharedLibraryPackageName(); ChangedPackages getChangedPackages(int sequenceNumber, int userId); @@ -758,7 +758,7 @@ interface IPackageManager { //------------------------------------------------------------------------ // We need to keep these in IPackageManager for app compatibility //------------------------------------------------------------------------ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String[] getAppOpPermissionPackages(String permissionName); @UnsupportedAppUsage @@ -773,10 +773,10 @@ interface IPackageManager { @UnsupportedAppUsage void removePermission(String name); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int checkPermission(String permName, String pkgName, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void grantRuntimePermission(String packageName, String permissionName, int userId); //------------------------------------------------------------------------ diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index e2f85282948a..596d39b50848 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1497,13 +1497,13 @@ public class PackageInstaller { /** {@hide} */ public @InstallReason int installReason = PackageManager.INSTALL_REASON_UNKNOWN; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long sizeBytes = -1; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String appPackageName; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bitmap appIcon; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -1513,7 +1513,7 @@ public class PackageInstaller { /** {@hide} */ public Uri originatingUri; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int originatingUid = UID_UNKNOWN; /** {@hide} */ public Uri referrerUri; @@ -2148,13 +2148,13 @@ public class PackageInstaller { /** {@hide} */ public String installerAttributionTag; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String resolvedBaseCodePath; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public float progress; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean sealed; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2227,7 +2227,7 @@ public class PackageInstaller { public int rollbackDataPolicy; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SessionInfo() { } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 3fb9a9e924e7..5bc97ed99d8c 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1791,7 +1791,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MOVE_INTERNAL = 0x00000001; /** @@ -1800,7 +1800,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MOVE_EXTERNAL_MEDIA = 0x00000002; /** {@hide} */ @@ -3660,7 +3660,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services"; @@ -3673,7 +3673,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared"; @@ -7483,14 +7483,14 @@ public abstract class PackageManager { public abstract void unregisterMoveCallback(@NonNull MoveCallback callback); /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract int movePackage(@NonNull String packageName, @NonNull VolumeInfo vol); /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract @Nullable VolumeInfo getPackageCurrentVolume(@NonNull ApplicationInfo app); /** {@hide} */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract List getPackageCandidateVolumes( @NonNull ApplicationInfo app); @@ -7581,7 +7581,7 @@ public abstract class PackageManager { /** {@hide} */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String installStatusToString(int status, @Nullable String msg) { final String str = installStatusToString(status); if (msg != null) { diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 177f691a97c1..118524d494de 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -288,7 +288,7 @@ public class PackageParser { public String[] mSeparateProcesses; private boolean mOnlyCoreApps; private DisplayMetrics mMetrics; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Callback mCallback; private File mCacheDir; @@ -1364,7 +1364,7 @@ public class PackageParser { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void collectCertificates(Package pkg, File apkFile, boolean skipVerify) throws PackageParserException { final String apkPath = apkFile.getAbsolutePath(); @@ -6539,7 +6539,7 @@ public class PackageParser { } /** set the signing certificates by which the APK proved it can be authenticated */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Builder setPastSigningCertificates(Signature[] pastSigningCertificates) { mPastSigningCertificates = pastSigningCertificates; return this; @@ -6753,9 +6753,9 @@ public class PackageParser { /** * Data used to feed the KeySetManagerService */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArraySet mUpgradeKeySets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayMap> mKeySetMapping; /** diff --git a/core/java/android/content/pm/ParceledListSlice.java b/core/java/android/content/pm/ParceledListSlice.java index 73119e05095b..b54bc5daf31f 100644 --- a/core/java/android/content/pm/ParceledListSlice.java +++ b/core/java/android/content/pm/ParceledListSlice.java @@ -62,7 +62,7 @@ public class ParceledListSlice extends BaseParceledListSli } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void writeParcelableCreator(T parcelable, Parcel dest) { dest.writeParcelableCreator((Parcelable) parcelable); } diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 0f9e8e59ec94..c6450ffdf91c 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -23,6 +23,7 @@ import android.annotation.StringRes; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -451,7 +452,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NonNull String protectionToString(int level) { final StringBuilder protLevel = new StringBuilder(); switch (level & PROTECTION_MASK_BASE) { diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java index 4f2bf65adfca..fe8e4d7b1bb2 100644 --- a/core/java/android/content/pm/ResolveInfo.java +++ b/core/java/android/content/pm/ResolveInfo.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.IntentFilter; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -183,7 +184,7 @@ public class ResolveInfo implements Parcelable { public boolean handleAllWebDataURI; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentInfo getComponentInfo() { if (activityInfo != null) return activityInfo; if (serviceInfo != null) return serviceInfo; diff --git a/core/java/android/content/pm/VerifierInfo.java b/core/java/android/content/pm/VerifierInfo.java index 5f8855572ef0..3e69ff555946 100644 --- a/core/java/android/content/pm/VerifierInfo.java +++ b/core/java/android/content/pm/VerifierInfo.java @@ -17,6 +17,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +45,7 @@ public class VerifierInfo implements Parcelable { * not be {@code null} or empty. * @throws IllegalArgumentException if either argument is null or empty. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VerifierInfo(String packageName, PublicKey publicKey) { if (packageName == null || packageName.length() == 0) { throw new IllegalArgumentException("packageName must not be null or empty"); diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 69dd25fa41d7..13433dc7979f 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -28,6 +28,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; import android.content.res.Configuration.NativeConfig; import android.content.res.loader.ResourcesLoader; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.util.ArraySet; import android.util.Log; @@ -955,7 +956,7 @@ public final class AssetManager implements AutoCloseable { * @see #open(String, int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull InputStream openNonAsset(@NonNull String fileName, int accessMode) throws IOException { return openNonAsset(0, fileName, accessMode); @@ -968,7 +969,7 @@ public final class AssetManager implements AutoCloseable { * @param fileName Name of the asset to retrieve. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull InputStream openNonAsset(int cookie, @NonNull String fileName) throws IOException { return openNonAsset(cookie, fileName, ACCESS_STREAMING); @@ -1105,7 +1106,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void applyStyle(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable XmlBlock.Parser parser, @NonNull int[] inAttrs, long outValuesAddress, long outIndicesAddress) { @@ -1128,7 +1129,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean resolveAttrs(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable int[] inValues, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { @@ -1144,7 +1145,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean retrieveAttributes(@NonNull XmlBlock.Parser parser, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { Objects.requireNonNull(parser, "parser"); @@ -1186,7 +1187,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setThemeTo(long dstThemePtr, @NonNull AssetManager srcAssetManager, long srcThemePtr) { synchronized (this) { ensureValidLocked(); diff --git a/core/java/android/content/res/ColorStateList.java b/core/java/android/content/res/ColorStateList.java index f23c802d98e2..921c63025a57 100644 --- a/core/java/android/content/res/ColorStateList.java +++ b/core/java/android/content/res/ColorStateList.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.Resources.Theme; import android.graphics.Color; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -480,7 +481,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { * @hide only for resource preloading */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ColorStateList obtainForTheme(Theme t) { if (t == null || !canApplyTheme()) { return this; @@ -643,7 +644,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { /** * Updates the default color and opacity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void onColorsChanged() { int defaultColor = DEFAULT_COLOR; boolean isOpaque = true; diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index f8ed27a6646b..f6edb2edc5ff 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -514,7 +514,7 @@ public class CompatibilityInfo implements Parcelable { * @param outDm If non-null the width and height will be set to their scaled values. * @return Returns the scaling factor for the window. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static float computeCompatibleScaling(DisplayMetrics dm, DisplayMetrics outDm) { final int width = dm.noncompatWidthPixels; final int height = dm.noncompatHeightPixels; diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 9f3634443d62..ce4ed8edec11 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -839,7 +839,7 @@ public final class Configuration implements Parcelable, Comparable { * @return a new instance of the resource, or {@code null} if not in * the cache */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Drawable getInstance(long key, Resources resources, Resources.Theme theme) { final Drawable.ConstantState entry = get(key, theme); if (entry != null) { diff --git a/core/java/android/content/res/ObbInfo.java b/core/java/android/content/res/ObbInfo.java index c477abcea8ba..6cafb3196735 100644 --- a/core/java/android/content/res/ObbInfo.java +++ b/core/java/android/content/res/ObbInfo.java @@ -17,6 +17,7 @@ package android.content.res; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -54,7 +55,7 @@ public class ObbInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] salt; // Only allow things in this package to instantiate. diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index c1f0a5f778b9..260f03bab7e4 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -317,7 +317,7 @@ public class Resources { * class loader * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Resources(@Nullable ClassLoader classLoader) { mClassLoader = classLoader == null ? ClassLoader.getSystemClassLoader() : classLoader; } @@ -394,7 +394,7 @@ public class Resources { * @return the inflater used to create drawable objects * @hide Pending API finalization. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final DrawableInflater getDrawableInflater() { if (mDrawableInflater == null) { mDrawableInflater = new DrawableInflater(this, mClassLoader); @@ -987,7 +987,7 @@ public class Resources { } @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Drawable loadDrawable(@NonNull TypedValue value, int id, int density, @Nullable Theme theme) throws NotFoundException { return mResourcesImpl.loadDrawable(this, value, id, density, theme); @@ -2057,7 +2057,7 @@ public class Resources { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public DisplayAdjustments getDisplayAdjustments() { final DisplayAdjustments overrideDisplayAdjustments = mOverrideDisplayAdjustments; if (overrideDisplayAdjustments != null) { diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index bbcacefb02c9..78cea15ea33e 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -78,9 +78,9 @@ public class ResourcesImpl { private static final boolean DEBUG_LOAD = false; private static final boolean DEBUG_CONFIG = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean TRACE_FOR_PRELOAD = false; // Do we still need it? - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean TRACE_FOR_MISS_PRELOAD = false; // Do we still need it? private static final int ID_OTHER = 0x01000004; @@ -88,7 +88,7 @@ public class ResourcesImpl { private static final Object sSync = new Object(); private static boolean sPreloaded; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mPreloading; // Information about preloaded resources. Note that they are not @@ -146,7 +146,7 @@ public class ResourcesImpl { private PluralRules mPluralRule; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Configuration mConfiguration = new Configuration(); static { @@ -166,7 +166,7 @@ public class ResourcesImpl { * @param displayAdjustments this resource's Display override and compatibility info. * Must not be null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ResourcesImpl(@NonNull AssetManager assets, @Nullable DisplayMetrics metrics, @Nullable Configuration config, @NonNull DisplayAdjustments displayAdjustments) { mAssets = assets; @@ -185,7 +185,7 @@ public class ResourcesImpl { return mAssets; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) DisplayMetrics getDisplayMetrics() { if (DEBUG_CONFIG) Slog.v(TAG, "Returning DisplayMetrics: " + mMetrics.widthPixels + "x" + mMetrics.heightPixels + " " + mMetrics.density); @@ -213,7 +213,7 @@ public class ResourcesImpl { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void getValue(@AnyRes int id, TypedValue outValue, boolean resolveRefs) throws NotFoundException { boolean found = mAssets.getResourceValue(id, 0, outValue, resolveRefs); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 29c5c935c1bf..5eaa7662b250 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -25,6 +25,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo.Config; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.StrictMode; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -75,17 +76,17 @@ public class TypedArray { @UnsupportedAppUsage private final Resources mResources; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DisplayMetrics mMetrics; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AssetManager mAssets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mRecycled; @UnsupportedAppUsage /*package*/ XmlBlock.Parser mXml; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ Resources.Theme mTheme; /** * mData is used to hold the value/id and other metadata about each attribute. diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java index fcbe36246273..b0291ce6d842 100644 --- a/core/java/android/content/res/XmlBlock.java +++ b/core/java/android/content/res/XmlBlock.java @@ -21,6 +21,7 @@ import static android.content.res.Resources.ID_NULL; import android.annotation.AnyRes; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.TypedValue; import com.android.internal.annotations.VisibleForTesting; @@ -480,7 +481,7 @@ public final class XmlBlock implements AutoCloseable { return mStrings.get(id); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ long mParseState; @UnsupportedAppUsage private final XmlBlock mBlock; diff --git a/core/java/android/database/AbstractWindowedCursor.java b/core/java/android/database/AbstractWindowedCursor.java index daf7d2b1e908..18562034e38c 100644 --- a/core/java/android/database/AbstractWindowedCursor.java +++ b/core/java/android/database/AbstractWindowedCursor.java @@ -17,6 +17,7 @@ package android.database; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A base class for Cursors that store their data in {@link CursorWindow}s. @@ -181,7 +182,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { * Closes the cursor window and sets {@link #mWindow} to null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void closeWindow() { if (mWindow != null) { mWindow.close(); diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java index edb7b715e944..1db948aba7c6 100644 --- a/core/java/android/database/CursorWindow.java +++ b/core/java/android/database/CursorWindow.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.database.sqlite.SQLiteClosable; import android.database.sqlite.SQLiteException; import android.os.Binder; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Process; @@ -767,7 +768,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String printStats() { StringBuilder buff = new StringBuilder(); int myPid = Process.myPid(); diff --git a/core/java/android/database/sqlite/SQLiteCustomFunction.java b/core/java/android/database/sqlite/SQLiteCustomFunction.java index 1ace40d7e913..4a15f7010d54 100644 --- a/core/java/android/database/sqlite/SQLiteCustomFunction.java +++ b/core/java/android/database/sqlite/SQLiteCustomFunction.java @@ -27,7 +27,7 @@ import android.os.Build; public final class SQLiteCustomFunction { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final String name; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int numArgs; public final SQLiteDatabase.CustomFunction callback; @@ -52,7 +52,7 @@ public final class SQLiteCustomFunction { // Called from native. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchCallback(String[] args) { callback.callback(args); } diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index a2cbdd3829ff..9684ece5d9c1 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -31,6 +31,7 @@ import android.database.DatabaseUtils; import android.database.DefaultDatabaseErrorHandler; import android.database.SQLException; import android.database.sqlite.SQLiteDebug.DbStats; +import android.os.Build; import android.os.CancellationSignal; import android.os.Looper; import android.os.OperationCanceledException; @@ -103,7 +104,7 @@ public final class SQLiteDatabase extends SQLiteClosable { // Thread-local for database sessions that belong to this database. // Each thread has its own database session. // INVARIANT: Immutable. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ThreadLocal mThreadSession = ThreadLocal .withInitial(this::createSession); diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 165f863ccde7..1afa0f8d7090 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -135,7 +135,7 @@ public final class SQLiteDebug { * that overflowed because no space was left in the page cache. * documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int pageCacheOverflow; /** records the largest memory allocation request handed to sqlite3. diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java index de1c54321985..cd4131ce2abb 100644 --- a/core/java/android/database/sqlite/SQLiteProgram.java +++ b/core/java/android/database/sqlite/SQLiteProgram.java @@ -18,6 +18,7 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; import android.database.DatabaseUtils; +import android.os.Build; import android.os.CancellationSignal; import java.util.Arrays; @@ -37,7 +38,7 @@ public abstract class SQLiteProgram extends SQLiteClosable { private final boolean mReadOnly; private final String[] mColumnNames; private final int mNumParameters; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Object[] mBindArgs; SQLiteProgram(SQLiteDatabase db, String sql, Object[] bindArgs, diff --git a/core/java/android/database/sqlite/SQLiteStatement.java b/core/java/android/database/sqlite/SQLiteStatement.java index 9fda8b011e52..d33eadcfd11b 100644 --- a/core/java/android/database/sqlite/SQLiteStatement.java +++ b/core/java/android/database/sqlite/SQLiteStatement.java @@ -17,6 +17,7 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -28,7 +29,7 @@ import android.os.ParcelFileDescriptor; *

*/ public final class SQLiteStatement extends SQLiteProgram { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SQLiteStatement(SQLiteDatabase db, String sql, Object[] bindArgs) { super(db, sql, bindArgs, null); } diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java index 4f55921b0488..35da062329b3 100644 --- a/core/java/android/ddm/DdmHandleAppName.java +++ b/core/java/android/ddm/DdmHandleAppName.java @@ -17,6 +17,7 @@ package android.ddm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import org.apache.harmony.dalvik.ddmc.Chunk; @@ -80,7 +81,7 @@ public class DdmHandleAppName extends ChunkHandler { * before or after DDMS connects. For the latter we need to send up * an APNM message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setAppName(String appName, String pkgName, int userId) { if (appName == null || appName.isEmpty() || pkgName == null || pkgName.isEmpty()) return; @@ -90,7 +91,7 @@ public class DdmHandleAppName extends ChunkHandler { sendAPNM(appName, pkgName, userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Names getNames() { return sNames; } diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 86031dd918f5..3bdd39f5d7d7 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -245,7 +245,7 @@ public class Camera { * Camera HAL device API version 1.0 * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CAMERA_HAL_API_VERSION_1_0 = 0x100; /** @@ -1221,7 +1221,7 @@ public class Camera { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object camera_ref, int what, int arg1, int arg2, Object obj) { @@ -4415,7 +4415,7 @@ public class Camera { // Splits a comma delimited string to an ArrayList of Area objects. // Example string: "(-10,-10,0,0,300),(0,0,10,10,700)". Return null if // the passing string is null or the size is 0 or (0,0,0,0,0). - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ArrayList splitArea(String str) { if (str == null || str.charAt(0) != '(' || str.charAt(str.length() - 1) != ')') { diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index a9b613228070..cad30dda9034 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -97,7 +97,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { public static final int S_UI8 = 0x35; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeObject; // Invoked on destruction diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 0f3cdfca70f5..e913986ae792 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -509,7 +509,7 @@ public final class Sensor { * * @hide Expected to be used internally for always on display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_PICK_UP_GESTURE = 25; /** @@ -549,7 +549,7 @@ public final class Sensor { * @hide Expected to be used internally for auto-rotate and speaker rotation. * */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_DEVICE_ORIENTATION = 27; /** diff --git a/core/java/android/hardware/SerialManager.java b/core/java/android/hardware/SerialManager.java index b51382e01ccd..26e5129b1fb3 100644 --- a/core/java/android/hardware/SerialManager.java +++ b/core/java/android/hardware/SerialManager.java @@ -19,6 +19,7 @@ package android.hardware; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -47,7 +48,7 @@ public class SerialManager { * * @return names of available serial ports */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String[] getSerialPorts() { try { return mService.getSerialPorts(); @@ -67,7 +68,7 @@ public class SerialManager { * @param speed at which to open the serial port * @return the serial port */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SerialPort openSerialPort(String name, int speed) throws IOException { try { ParcelFileDescriptor pfd = mService.openSerialPort(name); diff --git a/core/java/android/hardware/SerialPort.java b/core/java/android/hardware/SerialPort.java index 0fcaa4989210..2578dd67746e 100644 --- a/core/java/android/hardware/SerialPort.java +++ b/core/java/android/hardware/SerialPort.java @@ -17,6 +17,7 @@ package android.hardware; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -31,7 +32,7 @@ public class SerialPort { private static final String TAG = "SerialPort"; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mNativeContext; private final String mName; private ParcelFileDescriptor mFileDescriptor; @@ -60,7 +61,7 @@ public class SerialPort { /** * Closes the serial port */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void close() throws IOException { if (mFileDescriptor != null) { mFileDescriptor.close(); @@ -104,7 +105,7 @@ public class SerialPort { * @param buffer to write * @param length number of bytes to write */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void write(ByteBuffer buffer, int length) throws IOException { if (buffer.isDirect()) { native_write_direct(buffer, length); diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 974913b290b1..376503e79cfc 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -21,6 +21,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.MemoryFile; @@ -759,13 +760,13 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) throw new NullPointerException(); return nativeDisableSensor(mNativeSensorEventQueue, sensor.getHandle()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void dispatchSensorEvent(int handle, float[] values, int accuracy, long timestamp); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void dispatchFlushCompleteEvent(int handle); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void dispatchAdditionalInfoEvent( int handle, int type, int serial, float[] floatValues, int[] intValues) { // default implementation is do nothing diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java index bed9a0640693..76d50bdf414c 100644 --- a/core/java/android/hardware/biometrics/BiometricConstants.java +++ b/core/java/android/hardware/biometrics/BiometricConstants.java @@ -20,6 +20,7 @@ import static android.hardware.biometrics.BiometricManager.Authenticators; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -153,7 +154,7 @@ public interface BiometricConstants { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int BIOMETRIC_ERROR_VENDOR_BASE = 1000; @IntDef({BIOMETRIC_SUCCESS, diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index c7b554b3aafc..01f0e71a7c33 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -21,6 +21,7 @@ import android.app.KeyguardManager; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.biometrics.BiometricManager.Authenticators; import android.hardware.fingerprint.FingerprintManager; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -167,7 +168,7 @@ public interface BiometricFingerprintConstants { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int FINGERPRINT_ERROR_VENDOR_BASE = 1000; // diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 2efec3fa2ec1..1f6cbc590774 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -26,6 +26,7 @@ import android.hardware.camera2.params.RecommendedStreamConfigurationMap; import android.hardware.camera2.params.SessionConfiguration; import android.hardware.camera2.utils.ArrayUtils; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.util.Rational; import java.util.ArrayList; @@ -79,7 +80,7 @@ public final class CameraCharacteristics extends CameraMetadata type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -193,7 +194,7 @@ public final class CameraCharacteristics extends CameraMetadata> mKeys; private List> mKeysNeedingPermission; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 47dafa0c61a8..d931789a7005 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -26,6 +26,7 @@ import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.utils.HashCodeHelpers; import android.hardware.camera2.utils.SurfaceUtils; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.ArraySet; @@ -108,7 +109,7 @@ public final class CaptureRequest extends CameraMetadata> * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -229,7 +230,7 @@ public final class CaptureRequest extends CameraMetadata> private static final ArraySet mEmptySurfaceSet = new ArraySet(); private String mLogicalCameraId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CameraMetadataNative mLogicalCameraSettings; private final HashMap mPhysicalCameraSettings = new HashMap(); diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 228617c74388..cd69788f1924 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -24,6 +24,7 @@ import android.hardware.camera2.impl.CaptureResultExtras; import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.SyntheticKey; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.util.Log; import android.util.Rational; @@ -79,7 +80,7 @@ public class CaptureResult extends CameraMetadata> { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 9d4ab0b08e92..19f4cd6e991a 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -64,6 +64,7 @@ import android.hardware.camera2.params.TonemapCurve; import android.hardware.camera2.utils.TypeReference; import android.location.Location; import android.location.LocationManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.ServiceSpecificException; @@ -261,7 +262,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasTag() { return mHasTag; } @@ -271,7 +272,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void cacheTag(int tag) { mHasTag = true; mTag = tag; @@ -1709,7 +1710,7 @@ public class CameraMetadataNative implements Parcelable { mDisplaySize = displaySize; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mMetadataPtr; // native std::shared_ptr* @FastNative @@ -1734,7 +1735,7 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native long nativeGetBufferSize(long ptr); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native byte[] nativeReadValues(int tag, long ptr); @FastNative @@ -1743,11 +1744,11 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName) throws IllegalArgumentException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag) throws IllegalArgumentException; diff --git a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java index 16f3f2ab2023..064d4b31363b 100644 --- a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java +++ b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java @@ -17,6 +17,7 @@ package android.hardware.camera2.utils; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Provide hashing functions using the Modified Bernstein hash @@ -32,7 +33,7 @@ public final class HashCodeHelpers { * * @return the numeric hash code */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int hashCode(int... array) { if (array == null) { return 0; diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 68b9d5227746..0f868655f692 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.media.projection.MediaProjection; +import android.os.Build; import android.os.Handler; import android.util.Pair; import android.util.SparseArray; @@ -66,7 +67,7 @@ public final class DisplayManager { *

* @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_WIFI_DISPLAY_STATUS_CHANGED = "android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED"; @@ -74,7 +75,7 @@ public final class DisplayManager { * Contains a {@link WifiDisplayStatus} object. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_WIFI_DISPLAY_STATUS = "android.hardware.display.extra.WIFI_DISPLAY_STATUS"; diff --git a/core/java/android/hardware/display/WifiDisplayStatus.java b/core/java/android/hardware/display/WifiDisplayStatus.java index e2a825fd990a..0004b39e54e8 100644 --- a/core/java/android/hardware/display/WifiDisplayStatus.java +++ b/core/java/android/hardware/display/WifiDisplayStatus.java @@ -17,6 +17,7 @@ package android.hardware.display; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,9 +36,9 @@ public final class WifiDisplayStatus implements Parcelable { private final int mFeatureState; private final int mScanState; private final int mActiveDisplayState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WifiDisplay mActiveDisplay; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WifiDisplay[] mDisplays; /** Session info needed for Miracast Certification */ @@ -50,23 +51,23 @@ public final class WifiDisplayStatus implements Parcelable { /** Feature state: Wifi display is turned off in settings. */ public static final int FEATURE_STATE_OFF = 2; /** Feature state: Wifi display is turned on in settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FEATURE_STATE_ON = 3; /** Scan state: Not currently scanning. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int SCAN_STATE_NOT_SCANNING = 0; /** Scan state: Currently scanning. */ public static final int SCAN_STATE_SCANNING = 1; /** Display state: Not connected. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_NOT_CONNECTED = 0; /** Display state: Connecting to active display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_CONNECTING = 1; /** Display state: Connected to active display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_CONNECTED = 2; public static final @android.annotation.NonNull Creator CREATOR = new Creator() { diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 2aefb1da4783..63397c05edc2 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -41,6 +41,7 @@ import android.hardware.biometrics.BiometricTestSession; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.biometrics.SensorProperties; import android.os.Binder; +import android.os.Build; import android.os.CancellationSignal; import android.os.CancellationSignal.OnCancelListener; import android.os.Handler; @@ -761,7 +762,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * @hide */ @RequiresPermission(USE_FINGERPRINT) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List getEnrolledFingerprints(int userId) { if (mService != null) try { return mService.getEnrolledFingerprints(userId, mContext.getOpPackageName()); diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index e9b685754db4..f75b88f8e24d 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -231,7 +231,7 @@ public final class InputManager { * Waits for the event to be delivered to the application and handled. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = InputEventInjectionSync.WAIT_FOR_FINISHED; diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java index a1866af43706..313d8efc19be 100644 --- a/core/java/android/hardware/location/GeofenceHardware.java +++ b/core/java/android/hardware/location/GeofenceHardware.java @@ -169,7 +169,7 @@ public final class GeofenceHardware { GeofenceHardwareMonitorCallbackWrapper>(); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public GeofenceHardware(IGeofenceHardware service) { mService = service; } diff --git a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl index 2dfaf601c6f5..b32b7e555622 100644 --- a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl +++ b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl @@ -32,6 +32,6 @@ oneway interface IActivityRecognitionHardwareClient { * @param isSupported whether the platform has hardware support for the feature * @param instance the available instance to provide access to the feature */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAvailabilityChanged(in boolean isSupported, in IActivityRecognitionHardware instance); } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index e58403fe387d..11f3e4582ac2 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -45,6 +45,7 @@ import android.media.soundtrigger_middleware.ISoundTriggerMiddlewareService; import android.media.soundtrigger_middleware.SoundTriggerModuleDescriptor; import android.media.soundtrigger_middleware.Status; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -1174,7 +1175,7 @@ public class SoundTrigger { /** @hide */ @TestApi - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data) { @@ -1380,7 +1381,7 @@ public class SoundTrigger { public static class RecognitionConfig implements Parcelable { /** True if the DSP should capture the trigger sound and make it available for further * capture. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean captureRequested; /** * True if the service should restart listening after the DSP triggers. @@ -1389,12 +1390,12 @@ public class SoundTrigger { public final boolean allowMultipleTriggers; /** List of all keyphrases in the sound model for which recognition should be performed with * options for each keyphrase. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final KeyphraseRecognitionExtra keyphrases[]; /** Opaque data for use by system applications who know about voice engine internals, * typically during enrollment. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final byte[] data; @@ -1560,7 +1561,7 @@ public class SoundTrigger { public final int id; /** Recognition modes matched for this event */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int recognitionModes; /** Confidence level for mode RECOGNITION_MODE_VOICE_TRIGGER when user identification @@ -1667,7 +1668,7 @@ public class SoundTrigger { @NonNull public final KeyphraseRecognitionExtra[] keyphraseExtras; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeyphraseRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data, @@ -1789,7 +1790,7 @@ public class SoundTrigger { * @hide */ public static class GenericRecognitionEvent extends RecognitionEvent implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public GenericRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @@ -1860,7 +1861,7 @@ public class SoundTrigger { @NonNull public final byte[] data; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SoundModelEvent(int status, int soundModelHandle, @Nullable byte[] data) { this.status = status; this.soundModelHandle = soundModelHandle; diff --git a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java index 05823bf14b63..431c99dbdc1f 100644 --- a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java +++ b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java @@ -29,6 +29,7 @@ import android.media.soundtrigger_middleware.PhraseRecognitionEvent; import android.media.soundtrigger_middleware.PhraseSoundModel; import android.media.soundtrigger_middleware.RecognitionEvent; import android.media.soundtrigger_middleware.SoundModel; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -48,7 +49,7 @@ public class SoundTriggerModule { private static final int EVENT_RECOGNITION = 1; private static final int EVENT_SERVICE_DIED = 2; private static final int EVENT_SERVICE_STATE_CHANGE = 3; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mId; private EventHandlerDelegate mEventHandlerDelegate; private ISoundTriggerModule mService; diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 53a5785f7c76..21634cc544e7 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -47,7 +47,7 @@ public class UsbDeviceConnection { private Context mContext; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; private final CloseGuard mCloseGuard = CloseGuard.get(); diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index ef305e2c1867..62a5782cb55d 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -209,7 +209,7 @@ public class UsbManager { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String USB_DATA_UNLOCKED = "unlocked"; /** @@ -771,7 +771,7 @@ public class UsbManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFunctionEnabled(String function) { try { return mService.isFunctionEnabled(function); diff --git a/core/java/android/hardware/usb/UsbRequest.java b/core/java/android/hardware/usb/UsbRequest.java index 473df712e3f9..d1c6465d62c8 100644 --- a/core/java/android/hardware/usb/UsbRequest.java +++ b/core/java/android/hardware/usb/UsbRequest.java @@ -49,7 +49,7 @@ public class UsbRequest { static final int MAX_USBFS_BUFFER_SIZE = 16384; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; private UsbEndpoint mEndpoint; diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 78cc71a782a5..070bec11b93a 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1139,7 +1139,7 @@ public class InputMethodService extends AbstractInputMethodService { mService.getContentResolver().unregisterContentObserver(this); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean shouldShowImeWithHardKeyboard() { // Lazily initialize as needed. if (mShowImeWithHardKeyboard == ShowImeWithHardKeyboardType.UNKNOWN) { @@ -1179,7 +1179,7 @@ public class InputMethodService extends AbstractInputMethodService { return "SettingsObserver{mShowImeWithHardKeyboard=" + mShowImeWithHardKeyboard + "}"; } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private SettingsObserver mSettingsObserver; /** diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1012f47f8c0a..224113fc29cb 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -354,7 +354,7 @@ public class ConnectivityManager { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_TETHER_STATE_CHANGED = TetheringManager.ACTION_TETHER_STATE_CHANGED; @@ -363,7 +363,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces configured for * tethering and currently available for tethering. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_AVAILABLE_TETHER = TetheringManager.EXTRA_AVAILABLE_TETHER; /** @@ -378,7 +378,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces currently tethered * (ie, has DHCPv4 support and packets potentially forwarded/NATed) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_ACTIVE_TETHER = TetheringManager.EXTRA_ACTIVE_TETHER; /** @@ -387,7 +387,7 @@ public class ConnectivityManager { * failed. Use {@link #getLastTetherError} to find the error code * for any interfaces listed here. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_ERRORED_TETHER = TetheringManager.EXTRA_ERRORED_TETHER; /** @@ -850,7 +850,7 @@ public class ConnectivityManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getNetworkTypeName(int type) { switch (type) { case TYPE_NONE: @@ -1173,7 +1173,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.NETWORK_STACK) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkInfo getActiveNetworkInfoForUid(int uid) { return getActiveNetworkInfoForUid(uid, false); } @@ -1520,7 +1520,7 @@ public class ConnectivityManager { return 1; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { if (networkType == TYPE_MOBILE) { switch (feature) { @@ -1606,7 +1606,7 @@ public class ConnectivityManager { }; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashMap sLegacyRequests = new HashMap<>(); @@ -1635,7 +1635,7 @@ public class ConnectivityManager { Log.d(TAG, "expireRequest with " + ourSeqNum + ", " + sequenceNum); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NetworkRequest requestNetworkForFeatureLocked(NetworkCapabilities netCap) { int delay = -1; int type = legacyTypeForNetworkCapabilities(netCap); @@ -1665,7 +1665,7 @@ public class ConnectivityManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean removeRequestForFeature(NetworkCapabilities netCap) { final LegacyRequest l; synchronized (sLegacyRequests) { @@ -1732,17 +1732,17 @@ public class ConnectivityManager { /** @hide */ public static class PacketKeepaliveCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PacketKeepaliveCallback() { } /** The requested keepalive was successfully started. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onStarted() {} /** The keepalive was successfully stopped. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onStopped() {} /** An error occurred. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onError(int error) {} } @@ -1806,7 +1806,7 @@ public class ConnectivityManager { private volatile Integer mSlot; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void stop() { try { mExecutor.execute(() -> { @@ -1875,7 +1875,7 @@ public class ConnectivityManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PacketKeepalive startNattKeepalive( Network network, int intervalSeconds, PacketKeepaliveCallback callback, InetAddress srcAddr, int srcPort, InetAddress dstAddr) { @@ -2110,7 +2110,7 @@ public class ConnectivityManager { /** {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkQuotaInfo getActiveNetworkQuotaInfo() { try { return mService.getActiveNetworkQuotaInfo(); @@ -2408,7 +2408,7 @@ public class ConnectivityManager { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public int tether(String iface) { return mTetheringManager.tether(iface); @@ -2849,7 +2849,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public int getLastTetherError(String iface) { int error = mTetheringManager.getLastTetherError(iface); @@ -4659,7 +4659,7 @@ public class ConnectivityManager { * @deprecated This is strictly for legacy usage to support {@link #startUsingNetworkFeature}. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean setProcessDefaultNetworkForHostResolution(Network network) { return NetworkUtils.bindProcessToNetworkForHostResolution( (network == null) ? NETID_UNSET : network.getNetIdForResolv()); diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java index 6819c349d20a..82ba156b08d0 100644 --- a/core/java/android/net/DhcpResults.java +++ b/core/java/android/net/DhcpResults.java @@ -18,6 +18,7 @@ package android.net; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -40,30 +41,30 @@ import java.util.Objects; public final class DhcpResults implements Parcelable { private static final String TAG = "DhcpResults"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LinkAddress ipAddress; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InetAddress gateway; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ArrayList dnsServers = new ArrayList<>(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String domains; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Inet4Address serverAddress; /** Vendor specific information (from RFC 2132). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String vendorInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int leaseDuration; /** Link MTU option. 0 means unset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mtu; public String serverHostName; diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index 5860e20ad3b4..84a8e1c3dcc1 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -23,6 +23,7 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.RemoteException; @@ -76,7 +77,7 @@ public class EthernetManager { * @param isAvailable {@code true} if Ethernet port exists. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void onAvailabilityChanged(String iface, boolean isAvailable); } @@ -97,7 +98,7 @@ public class EthernetManager { * @return the Ethernet Configuration, contained in {@link IpConfiguration}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IpConfiguration getConfiguration(String iface) { try { return mService.getConfiguration(iface); @@ -110,7 +111,7 @@ public class EthernetManager { * Set Ethernet configuration. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setConfiguration(String iface, IpConfiguration config) { try { mService.setConfiguration(iface, config); @@ -123,7 +124,7 @@ public class EthernetManager { * Indicates whether the system currently has one or more Ethernet interfaces. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAvailable() { return getAvailableInterfaces().length > 0; } @@ -134,7 +135,7 @@ public class EthernetManager { * @param iface Ethernet interface name * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAvailable(String iface) { try { return mService.isAvailable(iface); @@ -149,7 +150,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); @@ -168,7 +169,7 @@ public class EthernetManager { * Returns an array of available Ethernet interface names. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String[] getAvailableInterfaces() { try { return mService.getAvailableInterfaces(); @@ -183,7 +184,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 059ec28298f9..41732008b4ee 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -73,7 +73,7 @@ interface IConnectivityManager NetworkCapabilities getNetworkCapabilities(in Network network, String callingPackageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) NetworkState[] getAllNetworkState(); NetworkQuotaInfo getActiveNetworkQuotaInfo(); @@ -134,7 +134,7 @@ interface IConnectivityManager VpnConfig getVpnConfig(int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void startLegacyVpn(in VpnProfile profile); LegacyVpnInfo getLegacyVpnInfo(int userId); diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl index 72a6b397a30c..e486052e0e53 100644 --- a/core/java/android/net/INetworkPolicyManager.aidl +++ b/core/java/android/net/INetworkPolicyManager.aidl @@ -67,7 +67,7 @@ interface INetworkPolicyManager { void setDeviceIdleMode(boolean enabled); void setWifiMeteredOverride(String networkId, int meteredOverride); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state); SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage); diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl index 5fa515a14343..1a3dc974480c 100644 --- a/core/java/android/net/INetworkStatsService.aidl +++ b/core/java/android/net/INetworkStatsService.aidl @@ -42,7 +42,7 @@ interface INetworkStatsService { * PACKAGE_USAGE_STATS permission is always checked. If PACKAGE_USAGE_STATS is not granted * READ_NETWORK_USAGE_STATS is checked for. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) INetworkStatsSession openSessionForUsageStats(int flags, String callingPackage); /** Return data layer snapshot of UID network usage. */ diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java index fa31b806ba9f..d5f8b2edb6bb 100644 --- a/core/java/android/net/IpConfiguration.java +++ b/core/java/android/net/IpConfiguration.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -98,7 +99,7 @@ public final class IpConfiguration implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IpConfiguration(IpAssignment ipAssignment, ProxySettings proxySettings, StaticIpConfiguration staticIpConfiguration, diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 25a76f43553a..209a3fa839c0 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -111,7 +111,7 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ProvisioningChange compareProvisioning( LinkProperties before, LinkProperties after) { if (before.isProvisioned() && after.isProvisioned()) { @@ -849,7 +849,7 @@ public final class LinkProperties implements Parcelable { * Returns all the links stacked on top of this link. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull List getStackedLinks() { if (mStackedLinks.isEmpty()) { return Collections.emptyList(); @@ -1448,7 +1448,7 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if both are identical, {@code false} otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIdenticalStackedLinks(@NonNull LinkProperties target) { if (!mStackedLinks.keySet().equals(target.mStackedLinks.keySet())) { return false; diff --git a/core/java/android/net/LinkQualityInfo.java b/core/java/android/net/LinkQualityInfo.java index aa56cff50f63..2bf1fbc848f7 100644 --- a/core/java/android/net/LinkQualityInfo.java +++ b/core/java/android/net/LinkQualityInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -190,7 +191,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPacketCount(long packetCount) { mPacketCount = packetCount; } @@ -206,7 +207,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPacketErrorCount(long packetErrorCount) { mPacketErrorCount = packetErrorCount; } @@ -268,7 +269,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLastDataSampleTime(long lastDataSampleTime) { mLastDataSampleTime = lastDataSampleTime; } @@ -284,7 +285,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataSampleDuration(int dataSampleDuration) { mDataSampleDuration = dataSampleDuration; } diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index e80e3a6f93ec..e01e5aecc7e6 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.system.ErrnoException; import android.system.Int32Ref; import android.system.Os; @@ -51,7 +52,7 @@ class LocalSocketImpl @UnsupportedAppUsage FileDescriptor[] inboundFileDescriptors; /** file descriptor array that should be written during next write */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) FileDescriptor[] outboundFileDescriptors; /** diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 6949bf2a7807..049e9bcc2509 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.util.MacAddressUtils; import android.net.wifi.WifiInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -58,7 +59,7 @@ public final class MacAddress implements Parcelable { *

Not publicly exposed or treated specially since the OUI 00:00:00 is registered. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final MacAddress ALL_ZEROS_ADDRESS = new MacAddress(0); /** @hide */ diff --git a/core/java/android/net/MobileLinkQualityInfo.java b/core/java/android/net/MobileLinkQualityInfo.java index a65de6bb2908..f51c4df2d6b5 100644 --- a/core/java/android/net/MobileLinkQualityInfo.java +++ b/core/java/android/net/MobileLinkQualityInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** @@ -40,7 +41,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { private int mLteRssnr = UNKNOWN_INT; private int mLteCqi = UNKNOWN_INT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MobileLinkQualityInfo() { } @@ -98,7 +99,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { * returns mobile network type as defined by {@link android.telephony.TelephonyManager} * @return network type or {@link android.net.LinkQualityInfo#UNKNOWN_INT} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getMobileNetworkType() { return mMobileNetworkType; } @@ -106,7 +107,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setMobileNetworkType(int mobileNetworkType) { mMobileNetworkType = mobileNetworkType; } @@ -122,7 +123,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRssi(int Rssi) { mRssi = Rssi; } @@ -138,7 +139,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGsmErrorRate(int gsmErrorRate) { mGsmErrorRate = gsmErrorRate; } @@ -154,7 +155,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdmaDbm(int cdmaDbm) { mCdmaDbm = cdmaDbm; } @@ -170,7 +171,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdmaEcio(int cdmaEcio) { mCdmaEcio = cdmaEcio; } @@ -186,7 +187,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoDbm(int evdoDbm) { mEvdoDbm = evdoDbm; } @@ -202,7 +203,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoEcio(int evdoEcio) { mEvdoEcio = evdoEcio; } @@ -218,7 +219,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoSnr(int evdoSnr) { mEvdoSnr = evdoSnr; } @@ -234,7 +235,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteSignalStrength(int lteSignalStrength) { mLteSignalStrength = lteSignalStrength; } @@ -250,7 +251,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRsrp(int lteRsrp) { mLteRsrp = lteRsrp; } @@ -266,7 +267,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRsrq(int lteRsrq) { mLteRsrq = lteRsrq; } @@ -282,7 +283,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRssnr(int lteRssnr) { mLteRssnr = lteRssnr; } @@ -298,7 +299,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteCqi(int lteCqi) { mLteCqi = lteCqi; } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 3e4f73555e58..53996a5fc503 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.system.ErrnoException; @@ -110,7 +111,7 @@ public class Network implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Network(int netId) { this(netId, false); } diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index be33f4edb5d1..a50f03a28c10 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -133,7 +133,7 @@ public final class NetworkCapabilities implements Parcelable { * Represents the network's capabilities. If any are specified they will be satisfied * by any Network that matches all of them. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNetworkCapabilities; /** @@ -1279,7 +1279,7 @@ public final class NetworkCapabilities implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasSignalStrength() { return mSignalStrength > SIGNAL_STRENGTH_UNSPECIFIED; } @@ -1917,7 +1917,7 @@ public final class NetworkCapabilities implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NonNull String transportNamesOf(@Nullable @Transport int[] types) { StringJoiner joiner = new StringJoiner("|"); if (types != null) { diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index e9e242e2b08a..a643d09eef49 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -253,7 +253,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getUidPolicy(int uid) { try { return mService.getUidPolicy(uid); @@ -339,7 +339,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRestrictBackground(boolean restrictBackground) { try { mService.setRestrictBackground(restrictBackground); @@ -349,7 +349,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean getRestrictBackground() { try { return mService.getRestrictBackground(); diff --git a/core/java/android/net/NetworkQuotaInfo.java b/core/java/android/net/NetworkQuotaInfo.java index 2e52d9cd19ab..d39bf29a4ef1 100644 --- a/core/java/android/net/NetworkQuotaInfo.java +++ b/core/java/android/net/NetworkQuotaInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -37,17 +38,17 @@ public class NetworkQuotaInfo implements Parcelable { public NetworkQuotaInfo(Parcel in) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getEstimatedBytes() { return 0; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getSoftLimitBytes() { return NO_LIMIT; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getHardLimitBytes() { return NO_LIMIT; } diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 1d6e50710df1..6209718e8788 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -43,7 +43,7 @@ public class NetworkRequest implements Parcelable { * The {@link NetworkCapabilities} that define this request. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final @NonNull NetworkCapabilities networkCapabilities; /** @@ -52,7 +52,7 @@ public class NetworkRequest implements Parcelable { * the request. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int requestId; /** diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index cbee01024622..d42beae601ed 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -219,11 +220,11 @@ public final class NetworkStats implements Parcelable { * generated. */ private long elapsedRealtime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int size; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int capacity; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String[] iface; @UnsupportedAppUsage private int[] uid; @@ -231,21 +232,21 @@ public final class NetworkStats implements Parcelable { private int[] set; @UnsupportedAppUsage private int[] tag; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] metered; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] roaming; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] defaultNetwork; @UnsupportedAppUsage private long[] rxBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] rxPackets; @UnsupportedAppUsage private long[] txBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] txPackets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] operations; /** @@ -258,7 +259,7 @@ public final class NetworkStats implements Parcelable { @SystemApi public static class Entry { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String iface; /** @hide */ @UnsupportedAppUsage @@ -267,7 +268,7 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public int set; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int tag; /** * Note that this is only populated w/ the default value when read from /proc or written @@ -294,20 +295,20 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public long rxBytes; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rxPackets; /** @hide */ @UnsupportedAppUsage public long txBytes; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long txPackets; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long operations; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Entry() { this(IFACE_ALL, UID_ALL, SET_DEFAULT, TAG_NONE, 0L, 0L, 0L, 0L, 0L); } @@ -454,7 +455,7 @@ public final class NetworkStats implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStats(Parcel parcel) { elapsedRealtime = parcel.readLong(); size = parcel.readInt(); diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java index 51f09a0103ff..fba75614342d 100644 --- a/core/java/android/net/NetworkStatsHistory.java +++ b/core/java/android/net/NetworkStatsHistory.java @@ -32,6 +32,7 @@ import static android.text.format.DateUtils.SECOND_IN_MILLIS; import static com.android.internal.util.ArrayUtils.total; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.NetworkStatsHistoryBucketProto; @@ -91,18 +92,18 @@ public class NetworkStatsHistory implements Parcelable { public static class Entry { public static final long UNKNOWN = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long bucketDuration; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long bucketStart; public long activeTime; @UnsupportedAppUsage public long rxBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rxPackets; @UnsupportedAppUsage public long txBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long txPackets; public long operations; } @@ -134,7 +135,7 @@ public class NetworkStatsHistory implements Parcelable { recordEntireHistory(existing); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStatsHistory(Parcel in) { bucketDuration = in.readLong(); bucketStart = readLongArray(in); @@ -220,7 +221,7 @@ public class NetworkStatsHistory implements Parcelable { return 0; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int size() { return bucketCount; } @@ -258,7 +259,7 @@ public class NetworkStatsHistory implements Parcelable { * Return index of bucket that contains or is immediately before the * requested time. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getIndexBefore(long time) { int index = Arrays.binarySearch(bucketStart, 0, bucketCount, time); if (index < 0) { @@ -286,7 +287,7 @@ public class NetworkStatsHistory implements Parcelable { /** * Return specific stats entry. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Entry getValues(int i, Entry recycle) { final Entry entry = recycle != null ? recycle : new Entry(); entry.bucketStart = bucketStart[i]; diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index a95ba12f6544..dc33cc7b614d 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -37,6 +37,7 @@ import static android.net.wifi.WifiInfo.sanitizeSsid; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Annotation.NetworkType; @@ -159,7 +160,7 @@ public class NetworkTemplate implements Parcelable { * Template to match metered {@link ConnectivityManager#TYPE_MOBILE} networks, * regardless of IMSI. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static NetworkTemplate buildTemplateMobileWildcard() { return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null); } diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 1e5b6d5ab5c0..a0faafa779a8 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -98,7 +98,7 @@ public class NetworkUtils { * this socket will go directly to the underlying network, so its traffic will not be * forwarded through the VPN. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean protectFromVpn(FileDescriptor fd) { return protectFromVpn(fd.getInt$()); } @@ -223,7 +223,7 @@ public class NetworkUtils { * @hide * @deprecated use {@link Inet4AddressUtils#netmaskToPrefixLength(Inet4Address)} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static int netmaskToPrefixLength(Inet4Address netmask) { // This is only here because some apps seem to be using it (@UnsupportedAppUsage). @@ -290,7 +290,7 @@ public class NetworkUtils { /** * Returns the implicit netmask of an IPv4 address, as was the custom before 1993. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getImplicitNetmask(Inet4Address address) { // Only here because it seems to be used by apps return Inet4AddressUtils.getImplicitNetmask(address); diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 4ba7394a4bb2..f1d9669a8309 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -20,6 +20,7 @@ import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.text.TextUtils; import android.util.Log; @@ -241,7 +242,7 @@ public final class Proxy { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final void setHttpProxySystemProperty(ProxyInfo p) { String host = null; String port = null; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 93ad41f7c524..2543aa3ab48a 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -232,7 +232,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RouteInfo(@Nullable IpPrefix destination, @Nullable InetAddress gateway, @Nullable String iface) { this(destination, gateway, iface, RTN_UNICAST); @@ -501,7 +501,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public static RouteInfo selectBestRoute(Collection routes, InetAddress dest) { return NetUtils.selectBestRoute(routes, dest); diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index e51145800cc7..f3d3c6560fc2 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -115,20 +115,20 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private SSLSocketFactory mInsecureFactory = null; @UnsupportedAppUsage private SSLSocketFactory mSecureFactory = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TrustManager[] mTrustManagers = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private KeyManager[] mKeyManagers = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] mNpnProtocols = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] mAlpnProtocols = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PrivateKey mChannelIdPrivateKey = null; @UnsupportedAppUsage private final int mHandshakeTimeoutMillis; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SSLClientSessionCache mSessionCache; @UnsupportedAppUsage private final boolean mSecure; @@ -249,7 +249,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private SSLSocketFactory makeSocketFactory( KeyManager[] keyManagers, TrustManager[] trustManagers) { try { @@ -343,7 +343,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * must be non-empty and of length less than 256. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAlpnProtocols(byte[][] protocols) { this.mAlpnProtocols = toLengthPrefixedList(protocols); } @@ -464,13 +464,13 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds) throws SocketException { castToOpenSSLSocket(socket).setSoWriteTimeout(writeTimeoutMilliseconds); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static OpenSSLSocketImpl castToOpenSSLSocket(Socket socket) { if (!(socket instanceof OpenSSLSocketImpl)) { throw new IllegalArgumentException("Socket not created by this factory: " diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index f56d656f07ed..ce545974f5cb 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -53,19 +54,19 @@ import java.util.Objects; @SystemApi public final class StaticIpConfiguration implements Parcelable { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public LinkAddress ipAddress; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public InetAddress gateway; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final ArrayList dnsServers; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public String domains; diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index e7bba69dbb84..a985e934ed3c 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -565,7 +565,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getMobileTcpRxPackets() { long total = 0; for (String iface : getMobileIfaces()) { @@ -581,7 +581,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getMobileTcpTxPackets() { long total = 0; for (String iface : getMobileIfaces()) { diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index aa3777d55342..77fb18411546 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -161,7 +161,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setHost(String host) { mHost = host; } @@ -201,7 +201,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getAuthInfo() { return mAuthInfo; } diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java index c50bae90488b..ab12cdd22685 100644 --- a/core/java/android/net/metrics/ApfProgramEvent.java +++ b/core/java/android/net/metrics/ApfProgramEvent.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -55,22 +56,22 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { public @interface Flags {} /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long lifetime; // Maximum computed lifetime of the program in seconds /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long actualLifetime; // Effective program lifetime in seconds /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int filteredRas; // Number of RAs filtered by the APF program /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int currentRas; // Total number of current RAs at generation time /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programLength; // Length of the APF program in bytes /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int flags; // Bitfield compound of FLAG_* constants private ApfProgramEvent(long lifetime, long actualLifetime, int filteredRas, int currentRas, @@ -217,7 +218,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { }; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @Flags int flagsFor(boolean hasIPv4, boolean multicastFilterOn) { int bitfield = 0; if (hasIPv4) { diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java index 2a601b273ef4..fcafb7ebd676 100644 --- a/core/java/android/net/metrics/ApfStats.java +++ b/core/java/android/net/metrics/ApfStats.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -34,61 +35,61 @@ public final class ApfStats implements IpConnectivityLog.Event { * time interval in milliseconds these stastistics covers. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long durationMs; /** * number of received RAs. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int receivedRas; /** * number of received RAs matching a known RA. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int matchingRas; /** * number of received RAs ignored due to the MAX_RAS limit. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int droppedRas; /** * number of received RAs with a minimum lifetime of 0. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int zeroLifetimeRas; /** * number of received RAs that could not be parsed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int parseErrors; /** * number of APF program updates from receiving RAs. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdates; /** * total number of APF program updates. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdatesAll; /** * number of APF program updates from allowing multicast traffic. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdatesAllowingMulticast; /** * maximum APF program size advertised by hardware. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int maxProgramSize; private ApfStats(Parcel in) { diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index e0a93dd1c18f..8de427de1dab 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -38,7 +39,7 @@ public final class DhcpClientEvent implements IpConnectivityLog.Event { /** @hide */ public final int durationMs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DhcpClientEvent(String msg, int durationMs) { this.msg = msg; this.durationMs = durationMs; diff --git a/core/java/android/net/nsd/INsdManager.aidl b/core/java/android/net/nsd/INsdManager.aidl index 9484c74bcb23..e9e8935a19b2 100644 --- a/core/java/android/net/nsd/INsdManager.aidl +++ b/core/java/android/net/nsd/INsdManager.aidl @@ -25,7 +25,7 @@ import android.os.Messenger; */ interface INsdManager { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Messenger getMessenger(); void setEnabled(boolean enable); } diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl index dd260bc6f2f6..cde57c58ca1f 100644 --- a/core/java/android/nfc/INfcAdapterExtras.aidl +++ b/core/java/android/nfc/INfcAdapterExtras.aidl @@ -23,18 +23,18 @@ import android.os.Bundle; * {@hide} */ interface INfcAdapterExtras { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle open(in String pkg, IBinder b); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle close(in String pkg, IBinder b); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle transceive(in String pkg, in byte[] data_in); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCardEmulationRoute(in String pkg); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setCardEmulationRoute(in String pkg, int route); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void authenticate(in String pkg, in byte[] token); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getDriverName(in String pkg); } diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 421eb33392db..7bf4355d5b35 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -282,7 +283,7 @@ public final class NdefRecord implements Parcelable { private final short mTnf; private final byte[] mType; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final byte[] mId; private final byte[] mPayload; diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index c61f10f50c93..90e01ebe6205 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -35,6 +35,7 @@ import android.nfc.tech.MifareClassic; import android.nfc.tech.Ndef; import android.nfc.tech.NfcA; import android.nfc.tech.NfcF; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -2077,7 +2078,7 @@ public final class NfcAdapter { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public INfcAdapterExtras getNfcAdapterExtrasInterface() { if (mContext == null) { throw new UnsupportedOperationException("You need a context on NfcAdapter to use the " diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index b9e6ff4a5a9e..398ec63a931b 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -29,6 +29,7 @@ import android.nfc.tech.NfcBarcode; import android.nfc.tech.NfcF; import android.nfc.tech.NfcV; import android.nfc.tech.TagTechnology; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -111,7 +112,7 @@ import java.util.HashMap; *

*/ public final class Tag implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final byte[] mId; final int[] mTechList; final String[] mTechStringList; diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index 1d28489d2ac8..1692921f4a8f 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -315,7 +315,7 @@ public class BaseBundle { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isParcelled() { return mParcelledData != null; } diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 9a16d3fee600..6d4593a2ce87 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -120,7 +120,7 @@ public class BatteryManager { * Int value set to the maximum charging current supported by the charger in micro amperes. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_MAX_CHARGING_CURRENT = "max_charging_current"; /** @@ -128,7 +128,7 @@ public class BatteryManager { * Int value set to the maximum charging voltage supported by the charger in micro volts. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_MAX_CHARGING_VOLTAGE = "max_charging_voltage"; /** @@ -136,7 +136,7 @@ public class BatteryManager { * integer containing the charge counter present in the battery. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_CHARGE_COUNTER = "charge_counter"; /** diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b550c7d4ba81..00023a5caf75 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -87,7 +87,7 @@ public abstract class BatteryStats implements Parcelable { /** * A constant indicating a partial wake lock timer. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int WAKE_TYPE_PARTIAL = 0; /** @@ -790,7 +790,7 @@ public abstract class BatteryStats implements Parcelable { * Returns the timer keeping track of background wifi scans. */ public abstract Timer getWifiScanBackgroundTimer(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which); public abstract int getWifiBatchedScanCount(int csphBin, int which); @UnsupportedAppUsage diff --git a/core/java/android/os/Broadcaster.java b/core/java/android/os/Broadcaster.java index d1a953f23f7f..88760b0b6828 100644 --- a/core/java/android/os/Broadcaster.java +++ b/core/java/android/os/Broadcaster.java @@ -21,7 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; /** @hide */ public class Broadcaster { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Broadcaster() { } @@ -32,7 +32,7 @@ public class Broadcaster * When this broadcaster pushes a message with senderWhat in the what field, * target will be sent a copy of that message with targetWhat in the what field. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void request(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -100,7 +100,7 @@ public class Broadcaster /** * Unregister for notifications for this senderWhat/target/targetWhat tuple. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void cancelRequest(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -173,7 +173,7 @@ public class Broadcaster * Send out msg. Anyone who has registered via the request() method will be * sent the message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void broadcast(Message msg) { synchronized (this) { diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index f8f8bf746afd..1c1f5c034cd9 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -174,7 +174,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Bundle forPair(String key, String value) { Bundle b = new Bundle(1); b.putString(key, value); @@ -306,7 +306,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSize() { if (mParcelledData != null) { return mParcelledData.dataSize(); @@ -389,7 +389,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * Filter values in Bundle to only basic types. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle filterValues() { unparcel(); Bundle bundle = this; diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 4fed93204f59..a4af0dbed0bd 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -88,7 +88,7 @@ public final class Debug // set/cleared by waitForDebugger() private static volatile boolean mWaiting = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Debug() {} /* @@ -120,7 +120,7 @@ public final class Debug @UnsupportedAppUsage public int dalvikSwappablePss; /** @hide The resident set size for dalvik heap. (Without other Dalvik overhead.) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int dalvikRss; /** The private dirty pages used by dalvik heap. */ public int dalvikPrivateDirty; @@ -140,7 +140,7 @@ public final class Debug public int dalvikSwappedOut; /** The dirty dalvik pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int dalvikSwappedOutPss; /** The proportional set size for the native heap. */ @@ -150,7 +150,7 @@ public final class Debug @UnsupportedAppUsage public int nativeSwappablePss; /** @hide The resident set size for the native heap. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nativeRss; /** The private dirty pages used by the native heap. */ public int nativePrivateDirty; @@ -170,7 +170,7 @@ public final class Debug public int nativeSwappedOut; /** The dirty native pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nativeSwappedOutPss; /** The proportional set size for everything else. */ @@ -180,7 +180,7 @@ public final class Debug @UnsupportedAppUsage public int otherSwappablePss; /** @hide The resident set size for everything else. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int otherRss; /** The private dirty pages used by everything else. */ public int otherPrivateDirty; @@ -200,12 +200,12 @@ public final class Debug public int otherSwappedOut; /** The dirty pages used by anyting else that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int otherSwappedOutPss; /** Whether the kernel reports proportional swap usage */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasSwappedOutPss; /** @hide */ @@ -2042,7 +2042,7 @@ public final class Debug * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native void dumpNativeHeap(FileDescriptor fd); /** diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 5745187fcbb9..518e29d51091 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -719,7 +719,7 @@ public class Environment { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static File getLegacyExternalStorageObbDirectory() { return buildPath(getLegacyExternalStorageDirectory(), DIR_ANDROID, DIR_OBB); } @@ -1040,7 +1040,7 @@ public class Environment { * Generates the raw path to an application's OBB files * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static File[] buildExternalStorageAppObbDirs(String packageName) { throwIfUserRequired(); return sCurrentUser.buildExternalStorageAppObbDirs(packageName); diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java index 25bffbc9e8d5..6f44b20a0ff4 100644 --- a/core/java/android/os/FileObserver.java +++ b/core/java/android/os/FileObserver.java @@ -145,7 +145,7 @@ public abstract class FileObserver { stopWatching(m_fd, descriptors); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onEvent(int wfd, @NotifyEventType int mask, String path) { // look up our observer, fixing up the map if necessary... FileObserver observer = null; diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index bbafc7b0875a..d151c16061d9 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -189,7 +189,7 @@ public final class FileUtils { * @return 0 on success, otherwise errno. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int setPermissions(FileDescriptor fd, int mode, int uid, int gid) { try { Os.fchmod(fd, mode); @@ -672,7 +672,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void stringToFile(File file, String string) throws IOException { stringToFile(file.getAbsolutePath(), string); } @@ -721,7 +721,7 @@ public final class FileUtils { * to its potential for collision. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static long checksumCrc32(File file) throws FileNotFoundException, IOException { CRC32 checkSummer = new CRC32(); @@ -808,7 +808,7 @@ public final class FileUtils { * @return if any files were deleted. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean deleteOlderFiles(File dir, int minCount, long minAgeMs) { if (minCount < 0 || minAgeMs < 0) { throw new IllegalArgumentException("Constraints must be positive or 0"); @@ -917,7 +917,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean deleteContents(File dir) { File[] files = dir.listFiles(); boolean success = true; diff --git a/core/java/android/os/Handler.java b/core/java/android/os/Handler.java index 24aaa583f542..d310d6e7530d 100644 --- a/core/java/android/os/Handler.java +++ b/core/java/android/os/Handler.java @@ -189,7 +189,7 @@ public class Handler { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Handler(boolean async) { this(null, async); } @@ -297,7 +297,7 @@ public class Handler { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public static Handler getMain() { if (MAIN_THREAD_HANDLER == null) { diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index 0d2bfdf04905..feed20800fd4 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -159,7 +159,7 @@ public abstract class HwBinder implements IHwBinder { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) public static void reportSyspropChanged() { native_report_sysprop_change(); } diff --git a/core/java/android/os/IBinder.java b/core/java/android/os/IBinder.java index 8a8a6af09e5f..d91c458a474b 100644 --- a/core/java/android/os/IBinder.java +++ b/core/java/android/os/IBinder.java @@ -150,7 +150,7 @@ public interface IBinder { int LIKE_TRANSACTION = ('_'<<24)|('L'<<16)|('I'<<8)|'K'; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int SYSPROPS_TRANSACTION = ('_'<<24)|('S'<<16)|('P'<<8)|'R'; /** diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 8f8d451bbe8e..e738cb276d00 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -68,7 +68,7 @@ interface INetworkManagementService /** * Clear all IP addresses on the specified interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void clearInterfaceAddresses(String iface); /** @@ -84,26 +84,26 @@ interface INetworkManagementService /** * Set interface IPv6 privacy extensions */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setInterfaceIpv6PrivacyExtensions(String iface, boolean enable); /** * Disable IPv6 on an interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void disableIpv6(String iface); /** * Enable IPv6 on an interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void enableIpv6(String iface); /** * Set IPv6 autoconf address generation mode. * This is a no-op if an unsupported mode is requested. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setIPv6AddrGenMode(String iface, int mode); /** @@ -296,7 +296,7 @@ interface INetworkManagementService /** * Return status of bandwidth control module. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBandwidthControlEnabled(); /** diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index e996809f1299..90cbac50b391 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -45,7 +45,7 @@ interface IPowerManager @UnsupportedAppUsage void userActivity(long time, int event, int flags); void wakeUp(long time, int reason, String details, String opPackageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void goToSleep(long time, int reason, int flags); @UnsupportedAppUsage(maxTargetSdk = 28) void nap(long time); diff --git a/core/java/android/os/LocaleList.java b/core/java/android/os/LocaleList.java index ee64551df226..cfa823cffe86 100644 --- a/core/java/android/os/LocaleList.java +++ b/core/java/android/os/LocaleList.java @@ -546,7 +546,7 @@ public final class LocaleList implements Parcelable { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setDefault(@NonNull @Size(min=1) LocaleList locales, int localeIndex) { if (locales == null) { throw new NullPointerException("locales is null"); diff --git a/core/java/android/os/MemoryFile.java b/core/java/android/os/MemoryFile.java index f84f9f05b13e..95337f6a1b1e 100644 --- a/core/java/android/os/MemoryFile.java +++ b/core/java/android/os/MemoryFile.java @@ -41,7 +41,7 @@ public class MemoryFile { private static String TAG = "MemoryFile"; // Returns 'true' if purged, 'false' otherwise - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native boolean native_pin(FileDescriptor fd, boolean pin) throws IOException; @UnsupportedAppUsage private static native int native_get_size(FileDescriptor fd) throws IOException; diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index 7213b067a691..87c4f331e93f 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -266,7 +266,7 @@ public final class MessageQueue { } // Called from native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int dispatchEvents(int fd, int events) { // Get the file descriptor record and any state that might change. final FileDescriptorRecord record; @@ -635,7 +635,7 @@ public final class MessageQueue { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean hasMessages(Handler h, Runnable r, Object object) { if (h == null) { return false; diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 765ef48308ae..a04fcb580e63 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -514,11 +514,11 @@ public final class Parcel { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native long getGlobalAllocSize(); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native long getGlobalAllocCount(); /** @@ -742,7 +742,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void writeBlob(@Nullable byte[] b) { writeBlob(b, 0, (b != null) ? b.length : 0); } @@ -1014,7 +1014,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArrayMap(@Nullable ArrayMap val) { writeArrayMapInternal(val); } @@ -1053,7 +1053,7 @@ public final class Parcel { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArraySet(@Nullable ArraySet val) { final int size = (val != null) ? val.size() : -1; writeInt(size); @@ -2719,7 +2719,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public final byte[] readBlob() { return nativeReadBlob(mNativePtr); @@ -3633,7 +3633,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readArrayMap(@NonNull ArrayMap outVal, @Nullable ClassLoader loader) { final int N = readInt(); if (N < 0) { diff --git a/core/java/android/os/ParcelableParcel.java b/core/java/android/os/ParcelableParcel.java index 38d980ecb0f1..3be630f2b382 100644 --- a/core/java/android/os/ParcelableParcel.java +++ b/core/java/android/os/ParcelableParcel.java @@ -27,7 +27,7 @@ public class ParcelableParcel implements Parcelable { final Parcel mParcel; final ClassLoader mClassLoader; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ParcelableParcel(ClassLoader loader) { mParcel = Parcel.obtain(); mClassLoader = loader; @@ -46,13 +46,13 @@ public class ParcelableParcel implements Parcelable { mParcel.appendFrom(src, pos, size); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Parcel getParcel() { mParcel.setDataPosition(0); return mParcel; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ClassLoader getClassLoader() { return mClassLoader; } @@ -68,7 +68,7 @@ public class ParcelableParcel implements Parcelable { dest.appendFrom(mParcel, 0, mParcel.dataSize()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Parcelable.ClassLoaderCreator CREATOR = new Parcelable.ClassLoaderCreator() { public ParcelableParcel createFromParcel(Parcel in) { diff --git a/core/java/android/os/PerformanceCollector.java b/core/java/android/os/PerformanceCollector.java index 27de48d40188..e6471ae1c00a 100644 --- a/core/java/android/os/PerformanceCollector.java +++ b/core/java/android/os/PerformanceCollector.java @@ -364,7 +364,7 @@ public class PerformanceCollector { * @param label description of code block between startTiming and * stopTiming, used to label output */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startTiming(String label) { if (mPerfWriter != null) mPerfWriter.writeStartTiming(label); @@ -414,7 +414,7 @@ public class PerformanceCollector { * between calls to startTiming and stopTiming. List of iterations * is keyed by {@link #METRIC_KEY_ITERATIONS iterations}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle stopTiming(String label) { addIteration(label); if (mPerfWriter != null) diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index e736e30b51e5..d130bc5d37e7 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1014,7 +1014,7 @@ public final class PowerManager { * Gets a float screen brightness setting. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getBrightnessConstraint(int constraint) { try { return mService.getBrightnessConstraint(constraint); @@ -2304,7 +2304,7 @@ public final class PowerManager { * This broadcast is only sent to registered receivers. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED"; diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index e62ad1fa9052..aa2ad115a48f 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -71,7 +71,7 @@ public class Process { * Defines the UID/GID for the log group. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int LOG_UID = 1007; /** @@ -84,14 +84,14 @@ public class Process { * Defines the UID/GID for the mediaserver process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_UID = 1013; /** * Defines the UID/GID for the DRM process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DRM_UID = 1019; /** @@ -104,7 +104,7 @@ public class Process { * Defines the UID/GID for the group that controls VPN services. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int VPN_UID = 1016; /** @@ -123,7 +123,7 @@ public class Process { * Defines the UID/GID for the NFC service process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NFC_UID = 1027; /** @@ -277,7 +277,7 @@ public class Process { * First uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int FIRST_ISOLATED_UID = 99000; @@ -285,7 +285,7 @@ public class Process { * Last uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int LAST_ISOLATED_UID = 99999; @@ -725,7 +725,7 @@ public class Process { * Returns the identifier of this process' parent. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int myPpid() { return Os.getppid(); } @@ -1165,38 +1165,38 @@ public class Process { public static final native int[] getPids(String path, int[] lastArray); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_TERM_MASK = 0xff; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_ZERO_TERM = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_SPACE_TERM = (int)' '; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_TAB_TERM = (int)'\t'; /** @hide */ public static final int PROC_NEWLINE_TERM = (int) '\n'; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_COMBINE = 0x100; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_PARENS = 0x200; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_QUOTES = 0x400; /** @hide */ public static final int PROC_CHAR = 0x800; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_STRING = 0x1000; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_LONG = 0x2000; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_FLOAT = 0x4000; /** diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 35e7bad83736..71344f90de75 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -190,7 +190,7 @@ public final class ServiceManager { * @param dumpPriority supported dump priority levels as a bitmask * to access this service */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void addService(String name, IBinder service, boolean allowIsolated, int dumpPriority) { try { diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java index 75123528a6b8..1cd9c1a457a9 100644 --- a/core/java/android/os/SharedMemory.java +++ b/core/java/android/os/SharedMemory.java @@ -158,7 +158,7 @@ public final class SharedMemory implements Parcelable, Closeable { * * @hide Exposed for native ASharedMemory_dupFromJava() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getFd() { return mFileDescriptor.getInt$(); } diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java index 0be3d681c80a..3358ce13ed52 100644 --- a/core/java/android/os/ShellCommand.java +++ b/core/java/android/os/ShellCommand.java @@ -98,7 +98,7 @@ public abstract class ShellCommand extends BasicShellCommandHandler { return super.handleDefaultCommands(cmd); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String peekNextArg() { return super.peekNextArg(); } diff --git a/core/java/android/os/StatFs.java b/core/java/android/os/StatFs.java index 6d1a1164abb4..eb8e71761294 100644 --- a/core/java/android/os/StatFs.java +++ b/core/java/android/os/StatFs.java @@ -26,7 +26,7 @@ import android.system.StructStatVfs; * wrapper for Unix statvfs(). */ public class StatFs { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private StructStatVfs mStat; /** diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 0fba8950cf15..c89adadfbf2d 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2381,7 +2381,7 @@ public final class StrictMode { * Binder for its current (native) thread-local policy value and synchronize it to libcore's * (Java) thread-local policy value. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void onBinderStrictModePolicyChange(@ThreadPolicyMask int newPolicy) { setBlockGuardPolicy(newPolicy); } @@ -2621,7 +2621,7 @@ public final class StrictMode { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void incrementExpectedActivityCount(Class klass) { if (klass == null) { return; diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index 26f3af0c68bb..e29d75611856 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -247,7 +247,7 @@ public final class SystemClock { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @CriticalNative public static native long currentThreadTimeMicro(); diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index a16452705efc..ded9be5eb74a 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -60,7 +60,7 @@ public class SystemProperties { * uses reflection to read this whenever text is selected (http://b/36095274). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROP_NAME_MAX = Integer.MAX_VALUE; /** @hide */ @@ -256,7 +256,7 @@ public class SystemProperties { * @param callback The {@link Runnable} that should be removed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void removeChangeCallback(@NonNull Runnable callback) { synchronized (sChangeCallbacks) { if (sChangeCallbacks.contains(callback)) { diff --git a/core/java/android/os/SystemService.java b/core/java/android/os/SystemService.java index 5871d2d9b58f..9b0ac8fdeb7a 100644 --- a/core/java/android/os/SystemService.java +++ b/core/java/android/os/SystemService.java @@ -66,7 +66,7 @@ public class SystemService { } /** Request that the init daemon stop a named service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void stop(String name) { SystemProperties.set("ctl.stop", name); } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 58c8efa3a972..9c9e4995d673 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -52,7 +52,7 @@ public final class Trace { /** @hide */ public static final long TRACE_TAG_INPUT = 1L << 2; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final long TRACE_TAG_VIEW = 1L << 3; /** @hide */ public static final long TRACE_TAG_WEBVIEW = 1L << 4; diff --git a/core/java/android/os/UpdateLock.java b/core/java/android/os/UpdateLock.java index 036d0951c19a..5aa9401ddb27 100644 --- a/core/java/android/os/UpdateLock.java +++ b/core/java/android/os/UpdateLock.java @@ -51,7 +51,7 @@ public class UpdateLock { * locker releases theirs. The broadcast is sticky but is sent only to * registered receivers. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String UPDATE_LOCK_CHANGED = "android.os.UpdateLock.UPDATE_LOCK_CHANGED"; /** @@ -60,7 +60,7 @@ public class UpdateLock { * update operation. True means that updates are okay right now; false indicates * that perhaps later would be a better time. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NOW_IS_CONVENIENT = "nowisconvenient"; /** @@ -69,7 +69,7 @@ public class UpdateLock { * in the System.currentTimeMillis() time base, which may be non-monotonic especially * around reboots. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String TIMESTAMP = "timestamp"; /** @@ -94,7 +94,7 @@ public class UpdateLock { /** * Is this lock currently held? */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isHeld() { synchronized (mToken) { return mHeld; @@ -104,7 +104,7 @@ public class UpdateLock { /** * Acquire an update lock. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void acquire() { if (DEBUG) { Log.v(TAG, "acquire() : " + this, new RuntimeException("here")); @@ -131,7 +131,7 @@ public class UpdateLock { /** * Release this update lock. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void release() { if (DEBUG) Log.v(TAG, "release() : " + this, new RuntimeException("here")); checkService(); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index d39c5328e330..d6720248720a 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -100,7 +100,7 @@ public final class UserHandle implements Parcelable { public static final @UserIdInt int USER_SYSTEM = 0; /** @hide A user serial constant to indicate the "system" user of the device */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int USER_SERIAL_SYSTEM = 0; /** @hide A user handle to indicate the "system" user of the device */ @@ -136,22 +136,22 @@ public final class UserHandle implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ERR_GID = -1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_ROOT = android.os.Process.ROOT_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_APP_START = android.os.Process.FIRST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_APP_END = android.os.Process.LAST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_SHARED_GID_START = android.os.Process.FIRST_SHARED_APPLICATION_GID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_CACHE_GID_START = android.os.Process.FIRST_APPLICATION_CACHE_GID; /** The userId represented by this UserHandle. */ diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index b0e76e3ea851..af86a24caff4 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -1020,7 +1020,7 @@ public class UserManager { * @see #getUserRestrictions() * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** @@ -1704,7 +1704,7 @@ public class UserManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean canSwitchUsers() { boolean allowUserSwitchingWhenSystemUserLocked = Settings.Global.getInt( mContext.getContentResolver(), @@ -2066,7 +2066,7 @@ public class UserManager { * @return whether user is a guest user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}) public boolean isGuestUser(@UserIdInt int userId) { @@ -2397,7 +2397,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUserStartRealtime() { try { return mService.getUserStartRealtime(); @@ -2412,7 +2412,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUserUnlockRealtime() { try { return mService.getUserUnlockRealtime(); @@ -4220,7 +4220,7 @@ public class UserManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isDeviceInDemoMode(Context context) { return Settings.Global.getInt(context.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0) > 0; diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 21ad38b0e371..f82cc22bd764 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -85,7 +85,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int EFFECT_THUD = Effect.THUD; @@ -94,7 +94,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int EFFECT_POP = Effect.POP; @@ -135,7 +135,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(Uri, Context) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int[] RINGTONES = { Effect.RINGTONE_1, @@ -567,7 +567,7 @@ public abstract class VibrationEffect implements Parcelable { out.writeInt(mAmplitude); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/os/health/HealthStatsParceler.java b/core/java/android/os/health/HealthStatsParceler.java index f28a9747bc44..eb864a4c3d3f 100644 --- a/core/java/android/os/health/HealthStatsParceler.java +++ b/core/java/android/os/health/HealthStatsParceler.java @@ -18,6 +18,7 @@ package android.os.health; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -38,7 +39,7 @@ public class HealthStatsParceler implements Parcelable { private HealthStatsWriter mWriter; private HealthStats mHealthStats; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public HealthStatsParceler createFromParcel(Parcel in) { diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index 6e259ea2642c..8181911ec783 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -52,7 +52,7 @@ public class SystemHealthManager { * Construct a new SystemHealthManager object. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SystemHealthManager() { this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME))); } diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 9fd9e4e4067d..694ff19f7dad 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -17,6 +17,7 @@ package android.os.storage; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Used for receiving notifications from the StorageManager @@ -47,23 +48,23 @@ public class StorageEventListener { public void onStorageStateChanged(String path, String oldState, String newState) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeRecordChanged(VolumeRecord rec) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeForgotten(String fsUuid) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDiskScanned(DiskInfo disk, int volumeCount) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDiskDestroyed(DiskInfo disk) { } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 270115beb09b..5d3c66cc3f34 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -60,6 +60,7 @@ import android.content.res.ObbScanner; import android.database.Cursor; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.Handler; @@ -287,7 +288,7 @@ public class StorageManager { public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM; /** @hide The volume is not encrypted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ENCRYPTION_STATE_NONE = IVold.ENCRYPTION_STATE_NONE; @@ -627,7 +628,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void enableUsbMassStorage() { } @@ -637,7 +638,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void disableUsbMassStorage() { } @@ -648,7 +649,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isUsbMassStorageConnected() { return false; } @@ -804,7 +805,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable VolumeInfo findVolumeById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -1025,7 +1026,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void format(String volId) { try { mStorageManager.format(volId); @@ -1067,7 +1068,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void partitionPublic(String diskId) { try { mStorageManager.partitionPublic(diskId); @@ -1229,7 +1230,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) { if (file == null) { return null; @@ -1477,7 +1478,7 @@ public class StorageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getStorageFullBytes(File path) { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); @@ -1594,7 +1595,7 @@ public class StorageManager { * @return true for file encrypted. (Implies isEncrypted() == true) * false not encrypted or block encrypted */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isFileEncryptedNativeOnly() { if (!isEncrypted()) { return false; @@ -2676,10 +2677,10 @@ public class StorageManager { /// Consts to match the password types in cryptfs.h /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; /** @hide */ public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index eed36d714653..a52eeccaca64 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -327,7 +327,7 @@ public final class StorageVolume implements Parcelable { * parse or UUID is unknown. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getFatVolumeId() { if (mFsUuid == null || mFsUuid.length() != 9) { return -1; diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 74c0ecb2ecc3..901494b845b0 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.net.Uri; +import android.os.Build; import android.os.Environment; import android.os.IVold; import android.os.Parcel; @@ -179,7 +180,7 @@ public class VolumeInfo implements Parcelable { this.partGuid = partGuid; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VolumeInfo(Parcel parcel) { id = parcel.readString8(); type = parcel.readInt(); @@ -312,7 +313,7 @@ public class VolumeInfo implements Parcelable { * Returns {@code true} if this volume is the primary emulated volume for {@code userId}, * {@code false} otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isPrimaryEmulatedForUser(int userId) { return id.equals(ID_EMULATED_INTERNAL + ";" + userId); } @@ -321,7 +322,7 @@ public class VolumeInfo implements Parcelable { return isVisibleForUser(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVisibleForWrite(int userId) { return isVisibleForUser(userId); } @@ -331,7 +332,7 @@ public class VolumeInfo implements Parcelable { return (path != null) ? new File(path) : null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public File getInternalPath() { return (internalPath != null) ? new File(internalPath) : null; } @@ -533,7 +534,7 @@ public class VolumeInfo implements Parcelable { return id.hashCode(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java index 0f58a714749b..ee67ca6b7cd0 100644 --- a/core/java/android/os/storage/VolumeRecord.java +++ b/core/java/android/os/storage/VolumeRecord.java @@ -19,6 +19,7 @@ package android.os.storage; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; @@ -60,7 +61,7 @@ public class VolumeRecord implements Parcelable { this.fsUuid = Preconditions.checkNotNull(fsUuid); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VolumeRecord(Parcel parcel) { type = parcel.readInt(); fsUuid = parcel.readString(); @@ -163,7 +164,7 @@ public class VolumeRecord implements Parcelable { return fsUuid.hashCode(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeRecord createFromParcel(Parcel in) { diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index ae4a626cdd5d..53b1dab9f760 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -31,6 +31,7 @@ import android.content.Intent; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -728,7 +729,7 @@ public abstract class PreferenceActivity extends ListActivity implements * Returns the Header list * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List

getHeaders() { return mHeaders; } diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 3f6e5051a3f8..22399f517908 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.TypedArray; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -103,7 +104,7 @@ public abstract class PreferenceFragment extends Fragment implements private static final String PREFERENCES_TAG = "android:preferences"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PreferenceManager mPreferenceManager; private ListView mList; private boolean mHavePrefs; diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index 01fe2f3f6b3a..6b813b0c04f6 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -102,7 +103,7 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi private Dialog mDialog; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ListView mListView; private int mLayoutResId = com.android.internal.R.layout.preference_list_fragment; diff --git a/core/java/android/preference/SeekBarPreference.java b/core/java/android/preference/SeekBarPreference.java index a2852bc2cce3..e31165e6adcc 100644 --- a/core/java/android/preference/SeekBarPreference.java +++ b/core/java/android/preference/SeekBarPreference.java @@ -19,6 +19,7 @@ package android.preference; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -73,7 +74,7 @@ public class SeekBarPreference extends Preference this(context, attrs, com.android.internal.R.attr.seekBarPreferenceStyle); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SeekBarPreference(Context context) { this(context, null); } diff --git a/core/java/android/preference/SwitchPreference.java b/core/java/android/preference/SwitchPreference.java index baa023e41aad..57fefda35de3 100644 --- a/core/java/android/preference/SwitchPreference.java +++ b/core/java/android/preference/SwitchPreference.java @@ -20,6 +20,7 @@ import android.annotation.StringRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.widget.Checkable; @@ -45,7 +46,7 @@ import android.widget.Switch; */ @Deprecated public class SwitchPreference extends TwoStatePreference { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Listener mListener = new Listener(); // Switch text for on and off states diff --git a/core/java/android/provider/BrowserContract.java b/core/java/android/provider/BrowserContract.java index 5083b8b254ab..7d77d37e117b 100644 --- a/core/java/android/provider/BrowserContract.java +++ b/core/java/android/provider/BrowserContract.java @@ -27,6 +27,7 @@ import android.content.Context; import android.database.Cursor; import android.graphics.BitmapFactory; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.util.Pair; @@ -47,7 +48,7 @@ public class BrowserContract { public static final String AUTHORITY = "com.android.browser"; /** A content:// style uri to the authority for the browser provider */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY); /** @@ -303,7 +304,7 @@ public class BrowserContract { * The content:// style URI for the default folder * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI_DEFAULT_FOLDER = Uri.withAppendedPath(CONTENT_URI, "folder"); @@ -324,7 +325,7 @@ public class BrowserContract { * @param folderId the ID of the folder to point to * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri buildFolderUri(long folderId) { return ContentUris.withAppendedId(CONTENT_URI_DEFAULT_FOLDER, folderId); } @@ -412,7 +413,7 @@ public class BrowserContract { /** * Directory under {@link Bookmarks#CONTENT_URI} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = AUTHORITY_URI.buildUpon().appendPath("accounts").build(); @@ -450,7 +451,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "history"); /** @@ -580,7 +581,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "images"); /** @@ -681,7 +682,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "combined"); /** diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 8ac1d84e04e4..1ee2f19038db 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -38,6 +38,7 @@ import android.content.Intent; import android.database.Cursor; import android.database.DatabaseUtils; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.text.format.DateUtils; import android.text.format.TimeMigrationUtils; @@ -1825,7 +1826,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String[] PROVIDER_WRITABLE_COLUMNS = new String[] { ACCOUNT_NAME, ACCOUNT_TYPE, @@ -1860,7 +1861,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String[] SYNC_WRITABLE_COLUMNS = new String[] { _SYNC_ID, @@ -2512,7 +2513,7 @@ public final class CalendarContract { * if no such alarm exists. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final long findNextAlarmTime(ContentResolver cr, long millis) { String selection = ALARM_TIME + ">=" + millis; // TODO: construct an explicit SQL query so that we can add @@ -2546,7 +2547,7 @@ public final class CalendarContract { * @param manager the AlarmManager * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final void rescheduleMissedAlarms(ContentResolver cr, Context context, AlarmManager manager) { // Get all the alerts that have been scheduled but have not fired @@ -2603,7 +2604,7 @@ public final class CalendarContract { * epoch * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void scheduleAlarm(Context context, AlarmManager manager, long alarmTime) { if (DEBUG) { String schedTime = TimeMigrationUtils.formatMillisWithFixedFormat(alarmTime); diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 24cde0667444..bbd838db68c3 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -46,6 +46,7 @@ import android.database.CursorWrapper; import android.database.DatabaseUtils; import android.graphics.Rect; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.telecom.PhoneAccountHandle; import android.text.TextUtils; @@ -129,7 +130,7 @@ public final class ContactsContract { * Prefix for column names that are not visible to client apps. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String HIDDEN_COLUMN_PREFIX = "x_"; @@ -6140,7 +6141,7 @@ public final class ContactsContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final Uri ENTERPRISE_CONTENT_URI = Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones"); diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 062d92900643..0fea48442941 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -842,7 +842,7 @@ public final class DocumentsContract { public static final String EXTRA_RESULT = "result"; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String METHOD_CREATE_DOCUMENT = "android:createDocument"; /** {@hide} */ public static final String METHOD_RENAME_DOCUMENT = "android:renameDocument"; @@ -877,11 +877,11 @@ public final class DocumentsContract { private static final String PATH_ROOT = "root"; private static final String PATH_RECENT = "recent"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String PATH_DOCUMENT = "document"; private static final String PATH_CHILDREN = "children"; private static final String PATH_SEARCH = "search"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String PATH_TREE = "tree"; private static final String PARAM_QUERY = "query"; diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 48410a748766..0829d85801ac 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.NetworkPolicyManager; import android.net.Uri; +import android.os.Build; /** * The Download Manager @@ -138,7 +139,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_URI = "uri"; /** @@ -168,7 +169,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_FILE_NAME_HINT = "hint"; /** @@ -184,7 +185,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_MIME_TYPE = "mimetype"; /** @@ -193,7 +194,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DESTINATION = "destination"; /** @@ -203,7 +204,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_VISIBILITY = "visibility"; /** @@ -240,7 +241,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_PACKAGE = "notificationpackage"; /** @@ -251,7 +252,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_CLASS = "notificationclass"; /** @@ -260,7 +261,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_EXTRAS = "notificationextras"; /** @@ -270,7 +271,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_COOKIE_DATA = "cookiedata"; /** @@ -287,7 +288,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_REFERER = "referer"; /** @@ -325,7 +326,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_TITLE = "title"; /** @@ -335,7 +336,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DESCRIPTION = "description"; /** @@ -344,7 +345,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_IS_PUBLIC_API = "is_public_api"; /** @@ -353,7 +354,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; /** @@ -362,7 +363,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_ALLOW_ROAMING = "allow_roaming"; /** @@ -379,7 +380,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI = "is_visible_in_downloads_ui"; /** @@ -396,7 +397,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DELETED = "deleted"; /** @@ -425,7 +426,7 @@ public final class Downloads { * *

Type: TEXT

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_MEDIA_SCANNED = "scanned"; /** Possible values for column {@link #COLUMN_MEDIA_SCANNED} */ @@ -504,7 +505,7 @@ public final class Downloads { * immediately after they are used, and are kept around by the download * manager as long as space is available. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DESTINATION_CACHE_PARTITION_PURGEABLE = 2; /** @@ -518,7 +519,7 @@ public final class Downloads { * This download will be saved to the location given by the file URI in * {@link #COLUMN_FILE_NAME_HINT}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DESTINATION_FILE_URI = 4; /** @@ -599,7 +600,7 @@ public final class Downloads { * @param visibility the value of {@link #COLUMN_VISIBILITY}. * @return true if the notification should be displayed. false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isNotificationToBeDisplayed(int visibility) { return visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED || visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION; @@ -840,7 +841,7 @@ public final class Downloads { * Prefix for ContentValues keys that contain HTTP header lines, to be passed to * DownloadProvider.insert(). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String INSERT_KEY_PREFIX = "http_header_"; } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 60d1d477db53..e30b4c75d3d3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -60,6 +60,7 @@ import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pManager; import android.os.BatteryManager; import android.os.Binder; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.DropBoxManager; @@ -942,7 +943,7 @@ public final class Settings { * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_USER_DICTIONARY_INSERT = "com.android.settings.USER_DICTIONARY_INSERT"; @@ -1893,7 +1894,7 @@ public final class Settings { = "android.settings.ACTION_APP_NOTIFICATION_REDACTION"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_APP_UID = "app_uid"; /** @@ -2421,7 +2422,7 @@ public final class Settings { * This is the only type of reset available to non-system clients. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; @@ -3066,7 +3067,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/system"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -3115,9 +3116,9 @@ public final class Settings { MOVED_TO_SECURE.add(Secure.INSTALL_NON_MARKET_APPS); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashSet MOVED_TO_GLOBAL; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashSet MOVED_TO_SECURE_THEN_GLOBAL; static { MOVED_TO_GLOBAL = new HashSet<>(); @@ -4274,7 +4275,7 @@ public final class Settings { * Kept for use by legacy database upgrade code in DatabaseHelper. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String VIBRATE_IN_SILENT = "vibrate_in_silent"; /** @@ -4569,7 +4570,7 @@ public final class Settings { * 3 = HCO * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String TTY_MODE = "tty_mode"; /** @@ -4596,7 +4597,7 @@ public final class Settings { * pending. The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse"; /** @@ -4605,7 +4606,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String POINTER_LOCATION = "pointer_location"; /** @@ -4614,7 +4615,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String SHOW_TOUCHES = "show_touches"; /** @@ -4642,14 +4643,14 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DOCK_SOUNDS_ENABLED = Global.DOCK_SOUNDS_ENABLED; /** * Whether to play sounds when the keyguard is shown and dismissed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCKSCREEN_SOUNDS_ENABLED = "lockscreen_sounds_enabled"; /** @@ -4672,7 +4673,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DESK_DOCK_SOUND = Global.DESK_DOCK_SOUND; /** @@ -4681,7 +4682,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DESK_UNDOCK_SOUND = Global.DESK_UNDOCK_SOUND; /** @@ -4690,7 +4691,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String CAR_DOCK_SOUND = Global.CAR_DOCK_SOUND; /** @@ -4699,7 +4700,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String CAR_UNDOCK_SOUND = Global.CAR_UNDOCK_SOUND; /** @@ -4708,7 +4709,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SOUND = Global.LOCK_SOUND; /** @@ -4717,7 +4718,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String UNLOCK_SOUND = Global.UNLOCK_SOUND; /** @@ -4766,7 +4767,7 @@ public final class Settings { * +7 = fastest * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String POINTER_SPEED = "pointer_speed"; /** @@ -4824,7 +4825,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Set PUBLIC_SETTINGS = new ArraySet<>(); static { PUBLIC_SETTINGS.add(END_BUTTON_BEHAVIOR); @@ -4883,7 +4884,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Set PRIVATE_SETTINGS = new ArraySet<>(); static { PRIVATE_SETTINGS.add(WIFI_USE_STATIC_IP); @@ -4932,7 +4933,7 @@ public final class Settings { * These entries are considered common between the personal and the managed profile, * since the managed profile doesn't get to change them. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final Set CLONE_TO_MANAGED_PROFILE = new ArraySet<>(); static { CLONE_TO_MANAGED_PROFILE.add(DATE_FORMAT); @@ -5259,7 +5260,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/secure"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -5499,7 +5500,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putStringForUser(@NonNull ContentResolver resolver, @NonNull String name, @Nullable String value, @Nullable String tag, boolean makeDefault, @UserIdInt int userHandle, boolean overrideableByRestore) { @@ -5739,7 +5740,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getLongForUser(ContentResolver cr, String name, long def, int userHandle) { String valString = getStringForUser(cr, name, userHandle); @@ -5803,7 +5804,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putLongForUser(ContentResolver cr, String name, long value, int userHandle) { return putStringForUser(cr, name, Long.toString(value), userHandle); @@ -6486,7 +6487,7 @@ public final class Settings { * subject to current DeviceAdmin policy limits. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout"; @@ -6528,7 +6529,7 @@ public final class Settings { * @deprecated */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SCREEN_OWNER_INFO_ENABLED = "lock_screen_owner_info_enabled"; @@ -6659,7 +6660,7 @@ public final class Settings { * accessibility feature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service"; @@ -7026,7 +7027,7 @@ public final class Settings { * @see android.graphics.Typeface * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACCESSIBILITY_CAPTIONING_TYPEFACE = "accessibility_captioning_typeface"; @@ -7066,7 +7067,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACCESSIBILITY_DISPLAY_DALTONIZER = "accessibility_display_daltonizer"; @@ -7480,7 +7481,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_ENABLED = "backup_enabled"; /** @@ -7489,7 +7490,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_AUTO_RESTORE = "backup_auto_restore"; /** @@ -7497,14 +7498,14 @@ public final class Settings { * Type: int ( 0 = unprovisioned, 1 = fully provisioned ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_PROVISIONED = "backup_provisioned"; /** * Component of the transport to use for backup/restore. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_TRANSPORT = "backup_transport"; /** @@ -7676,7 +7677,7 @@ public final class Settings { * Also prevents ANRs and crash dialogs from being suppressed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; @@ -7697,7 +7698,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service"; /** @@ -7706,7 +7707,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker"; @@ -7718,7 +7719,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER_SUBTYPE = @@ -8053,7 +8054,7 @@ public final class Settings { * The default NFC payment component * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component"; @@ -8067,14 +8068,14 @@ public final class Settings { * Specifies the package name currently configured to be the primary sms application * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String SMS_DEFAULT_APPLICATION = "sms_default_application"; /** * Specifies the package name currently configured to be the default dialer application * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application"; /** @@ -8212,7 +8213,7 @@ public final class Settings { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations"; @@ -8622,7 +8623,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners"; @@ -8791,7 +8792,7 @@ public final class Settings { * The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String NOTIFICATION_BADGING = "notification_badging"; @@ -10095,7 +10096,7 @@ public final class Settings { * scorer app, external network scores will neither be requested nor accepted. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NETWORK_SCORER_APP = "network_scorer_app"; /** @@ -10439,7 +10440,7 @@ public final class Settings { * by the system). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String WEBVIEW_PROVIDER = "webview_provider"; /** @@ -10831,7 +10832,7 @@ public final class Settings { * the setting needs to be set to 0 to disable it. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED = "wifi_watchdog_poor_network_test_enabled"; @@ -11009,7 +11010,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; @@ -11651,7 +11652,7 @@ public final class Settings { * @hide * @see com.android.server.power.batterysaver.BatterySaverPolicy */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants"; @@ -12308,7 +12309,7 @@ public final class Settings { * See RIL_PreferredNetworkType in ril.h * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String PREFERRED_NETWORK_MODE = "preferred_network_mode"; @@ -12915,7 +12916,7 @@ public final class Settings { @UnsupportedAppUsage public static final int ZEN_MODE_NO_INTERRUPTIONS = 2; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ZEN_MODE_ALARMS = 3; /** @hide */ public static String zenModeToString(int mode) { @@ -12978,15 +12979,15 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String HEADS_UP_NOTIFICATIONS_ENABLED = "heads_up_notifications_enabled"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HEADS_UP_OFF = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HEADS_UP_ON = 1; /** @@ -13460,7 +13461,7 @@ public final class Settings { public static final String[] LEGACY_RESTORE_SETTINGS = { }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -13510,7 +13511,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getStringForUser(ContentResolver resolver, String name, int userHandle) { if (MOVED_TO_SECURE.contains(name)) { @@ -13660,7 +13661,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putStringForUser(ContentResolver resolver, String name, String value, int userHandle) { return putStringForUser(resolver, name, value, null, false, userHandle, @@ -15226,7 +15227,7 @@ public final class Settings { * callingPackage, a negative result will be returned. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isCallingPackageAllowedToWriteSettings(Context context, int uid, String callingPackage, boolean throwException) { return isCallingPackageAllowedToPerformAppOpsProtectedOperation(context, uid, diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 2c735fd9012f..649c8f353196 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -627,7 +627,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date, boolean read) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -687,7 +687,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -734,7 +734,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -781,7 +781,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(ContentResolver resolver, String address, String body, String subject, Long date, boolean deliveryReport, long threadId) { diff --git a/core/java/android/security/KeystoreArguments.java b/core/java/android/security/KeystoreArguments.java index a59c4e04285d..19f78c8500d6 100644 --- a/core/java/android/security/KeystoreArguments.java +++ b/core/java/android/security/KeystoreArguments.java @@ -17,6 +17,7 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -28,7 +29,7 @@ import android.os.Parcelable; public class KeystoreArguments implements Parcelable { public byte[][] args; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeystoreArguments createFromParcel(Parcel in) { @@ -43,7 +44,7 @@ public class KeystoreArguments implements Parcelable { args = null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeystoreArguments(byte[][] args) { this.args = args; } diff --git a/core/java/android/security/keymaster/ExportResult.java b/core/java/android/security/keymaster/ExportResult.java index 037b85270306..2c382efab1be 100644 --- a/core/java/android/security/keymaster/ExportResult.java +++ b/core/java/android/security/keymaster/ExportResult.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +34,7 @@ public class ExportResult implements Parcelable { this.exportData = new byte[0]; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public ExportResult createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeyCharacteristics.java b/core/java/android/security/keymaster/KeyCharacteristics.java index d8382fa8f969..4f2bad1127e8 100644 --- a/core/java/android/security/keymaster/KeyCharacteristics.java +++ b/core/java/android/security/keymaster/KeyCharacteristics.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -45,7 +46,7 @@ public class KeyCharacteristics implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeyCharacteristics() {} protected KeyCharacteristics(Parcel in) { @@ -71,7 +72,7 @@ public class KeyCharacteristics implements Parcelable { hwEnforced.writeToParcel(out, flags); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readFromParcel(Parcel in) { swEnforced = KeymasterArguments.CREATOR.createFromParcel(in); hwEnforced = KeymasterArguments.CREATOR.createFromParcel(in); diff --git a/core/java/android/security/keymaster/KeymasterArguments.java b/core/java/android/security/keymaster/KeymasterArguments.java index e009e128bfea..7608f3a7b9ef 100644 --- a/core/java/android/security/keymaster/KeymasterArguments.java +++ b/core/java/android/security/keymaster/KeymasterArguments.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -41,7 +42,7 @@ public class KeymasterArguments implements Parcelable { private List mArguments; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -55,7 +56,7 @@ public class KeymasterArguments implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterArguments() { mArguments = new ArrayList(); } @@ -69,7 +70,7 @@ public class KeymasterArguments implements Parcelable { * * @throws IllegalArgumentException if {@code tag} is not an enum tag. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addEnum(int tag, int value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ENUM) && (tagType != KeymasterDefs.KM_ENUM_REP)) { @@ -141,7 +142,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 32-bit int tag or if * {@code value} is outside of the permitted range [0; 2^32). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addUnsignedInt(int tag, long value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_UINT) && (tagType != KeymasterDefs.KM_UINT_REP)) { @@ -178,7 +179,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 64-bit long tag or if * {@code value} is outside of the permitted range [0; 2^64). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addUnsignedLong(int tag, BigInteger value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ULONG) && (tagType != KeymasterDefs.KM_ULONG_REP)) { @@ -364,7 +365,7 @@ public class KeymasterArguments implements Parcelable { out.writeTypedList(mArguments); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readFromParcel(Parcel in) { in.readTypedList(mArguments, KeymasterArgument.CREATOR); } diff --git a/core/java/android/security/keymaster/KeymasterBlob.java b/core/java/android/security/keymaster/KeymasterBlob.java index 68365bfe603f..18cdecb167db 100644 --- a/core/java/android/security/keymaster/KeymasterBlob.java +++ b/core/java/android/security/keymaster/KeymasterBlob.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +30,7 @@ public class KeymasterBlob implements Parcelable { public KeymasterBlob(byte[] blob) { this.blob = blob; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeymasterBlob createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeymasterBlobArgument.java b/core/java/android/security/keymaster/KeymasterBlobArgument.java index 81b08c5b5b0a..b4106a6f2bc9 100644 --- a/core/java/android/security/keymaster/KeymasterBlobArgument.java +++ b/core/java/android/security/keymaster/KeymasterBlobArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterBlobArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final byte[] blob; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBlobArgument(int tag, byte[] blob) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -39,7 +40,7 @@ class KeymasterBlobArgument extends KeymasterArgument { this.blob = blob; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBlobArgument(int tag, Parcel in) { super(tag); blob = in.createByteArray(); diff --git a/core/java/android/security/keymaster/KeymasterBooleanArgument.java b/core/java/android/security/keymaster/KeymasterBooleanArgument.java index 25b2ac409d97..574511c70051 100644 --- a/core/java/android/security/keymaster/KeymasterBooleanArgument.java +++ b/core/java/android/security/keymaster/KeymasterBooleanArgument.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** @@ -37,7 +38,7 @@ class KeymasterBooleanArgument extends KeymasterArgument { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBooleanArgument(int tag, Parcel in) { super(tag); } diff --git a/core/java/android/security/keymaster/KeymasterDateArgument.java b/core/java/android/security/keymaster/KeymasterDateArgument.java index 218f4880b289..f6b8fb589b25 100644 --- a/core/java/android/security/keymaster/KeymasterDateArgument.java +++ b/core/java/android/security/keymaster/KeymasterDateArgument.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import java.util.Date; @@ -38,7 +39,7 @@ class KeymasterDateArgument extends KeymasterArgument { this.date = date; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterDateArgument(int tag, Parcel in) { super(tag); date = new Date(in.readLong()); diff --git a/core/java/android/security/keymaster/KeymasterIntArgument.java b/core/java/android/security/keymaster/KeymasterIntArgument.java index 01d38c799d9c..6aed8c998d62 100644 --- a/core/java/android/security/keymaster/KeymasterIntArgument.java +++ b/core/java/android/security/keymaster/KeymasterIntArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterIntArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int value; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterIntArgument(int tag, int value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -41,7 +42,7 @@ class KeymasterIntArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterIntArgument(int tag, Parcel in) { super(tag); value = in.readInt(); diff --git a/core/java/android/security/keymaster/KeymasterLongArgument.java b/core/java/android/security/keymaster/KeymasterLongArgument.java index 3ac27ccef295..c0c6f0e518cb 100644 --- a/core/java/android/security/keymaster/KeymasterLongArgument.java +++ b/core/java/android/security/keymaster/KeymasterLongArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterLongArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long value; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterLongArgument(int tag, long value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -39,7 +40,7 @@ class KeymasterLongArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterLongArgument(int tag, Parcel in) { super(tag); value = in.readLong(); diff --git a/core/java/android/security/keymaster/OperationResult.java b/core/java/android/security/keymaster/OperationResult.java index b4e155a527de..0ace764e435b 100644 --- a/core/java/android/security/keymaster/OperationResult.java +++ b/core/java/android/security/keymaster/OperationResult.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -34,7 +35,7 @@ public class OperationResult implements Parcelable { public final byte[] output; public final KeymasterArguments outParams; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 859bb51607b9..a47c3b188b79 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -771,7 +771,7 @@ public class DreamService extends Service implements Window.Callback { * @see #setDozeScreenBrightness * @hide For use by system UI components only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDozeScreenBrightness() { return mDozeScreenBrightness; } diff --git a/core/java/android/service/dreams/IDreamManager.aidl b/core/java/android/service/dreams/IDreamManager.aidl index 6496de3e15a0..0ce9cfa7a0bf 100644 --- a/core/java/android/service/dreams/IDreamManager.aidl +++ b/core/java/android/service/dreams/IDreamManager.aidl @@ -27,9 +27,9 @@ interface IDreamManager { void dream(); @UnsupportedAppUsage void awaken(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDreamComponents(in ComponentName[] componentNames); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ComponentName[] getDreamComponents(); ComponentName getDefaultDreamComponentForUser(int userId); void testDream(int userId, in ComponentName componentName); diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 25f140f29e00..89e27ba21443 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -311,7 +311,7 @@ public abstract class NotificationListenerService extends Service { private Handler mHandler; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected NotificationListenerWrapper mWrapper = null; private boolean isConnected = false; diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java index 579a8bfc9d99..8e4a68e52697 100644 --- a/core/java/android/service/notification/StatusBarNotification.java +++ b/core/java/android/service/notification/StatusBarNotification.java @@ -430,7 +430,7 @@ public class StatusBarNotification implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Context getPackageContext(Context context) { if (mContext == null) { try { diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index a9ab33c0d1de..169507ce9871 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -35,6 +35,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.Uri; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -1743,9 +1744,9 @@ public class ZenModeConfig implements Parcelable { public static class ZenRule implements Parcelable { @UnsupportedAppUsage public boolean enabled; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean snoozing; // user manually disabled this instance - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String name; // required for automatic @UnsupportedAppUsage public int zenMode; // ie: Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS @@ -1755,7 +1756,7 @@ public class ZenModeConfig implements Parcelable { public ComponentName component; // optional public ComponentName configurationActivity; // optional public String id; // required for automatic (unique) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long creationTime; // required for automatic // package name, only used for manual rules when they have turned DND on. public String enabler; diff --git a/core/java/android/service/vr/IVrManager.aidl b/core/java/android/service/vr/IVrManager.aidl index a8293b47db30..f8ae08563a52 100644 --- a/core/java/android/service/vr/IVrManager.aidl +++ b/core/java/android/service/vr/IVrManager.aidl @@ -94,7 +94,7 @@ interface IVrManager { * @return {@link android.view.Display.INVALID_DISPLAY} if there is no virtual display * currently, else return the display id of the virtual display */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getVr2dDisplayId(); /** diff --git a/core/java/android/service/vr/VrListenerService.java b/core/java/android/service/vr/VrListenerService.java index 2758ace8d00b..d92e3b8b6b9b 100644 --- a/core/java/android/service/vr/VrListenerService.java +++ b/core/java/android/service/vr/VrListenerService.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -140,7 +141,7 @@ public abstract class VrListenerService extends Service { * @see android.R.attr#enableVrMode * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onCurrentVrActivityChanged( ComponentName component, boolean running2dInVr, int pid) { // Override to implement. Default to old behaviour of sending null for 2D. diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 4249e5c20d3b..9a76f19f3e41 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -127,7 +127,7 @@ public abstract class WallpaperService extends Service { private static final int MSG_VISIBILITY_CHANGED = 10010; private static final int MSG_WALLPAPER_OFFSETS = 10020; private static final int MSG_WALLPAPER_COMMAND = 10025; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MSG_WINDOW_RESIZED = 10030; private static final int MSG_WINDOW_MOVED = 10035; private static final int MSG_TOUCH_EVENT = 10040; diff --git a/core/java/android/speech/IRecognitionListener.aidl b/core/java/android/speech/IRecognitionListener.aidl index e77851b0e405..7c79b1ae15de 100644 --- a/core/java/android/speech/IRecognitionListener.aidl +++ b/core/java/android/speech/IRecognitionListener.aidl @@ -83,6 +83,6 @@ oneway interface IRecognitionListener { * @param eventType the type of the occurred event * @param params a Bundle containing the passed parameters */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onEvent(in int eventType, in Bundle params); } diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index 6a5d5c63cb4d..479a0c16c747 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -843,7 +843,7 @@ public class PhoneStateListener { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDataConnectionRealTimeInfoChanged( DataConnectionRealTimeInfo dcRtInfo) { // default implementation empty @@ -1046,7 +1046,7 @@ public class PhoneStateListener { * @param rawData is the byte array of the OEM hook raw data. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onOemHookRawEvent(byte[] rawData) { // default implementation empty } diff --git a/core/java/android/telephony/Rlog.java b/core/java/android/telephony/Rlog.java index 2afdd339e80b..a1c74e69e7a2 100644 --- a/core/java/android/telephony/Rlog.java +++ b/core/java/android/telephony/Rlog.java @@ -53,7 +53,7 @@ public final class Rlog { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int d(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg + '\n' + Log.getStackTraceString(tr)); diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java index b9811638b28f..31da79995172 100644 --- a/core/java/android/text/AndroidBidi.java +++ b/core/java/android/text/AndroidBidi.java @@ -18,6 +18,7 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; import android.icu.text.Bidi; +import android.os.Build; import android.text.Layout.Directions; import com.android.internal.annotations.VisibleForTesting; @@ -32,7 +33,7 @@ public class AndroidBidi { /** * Runs the bidi algorithm on input text. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int bidi(int dir, char[] chs, byte[] chInfo) { if (chs == null || chInfo == null) { throw new NullPointerException(); diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index c60d446d921d..16b45c30b69f 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -987,7 +987,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getIndexFirstChangedBlock() { return mIndexFirstChangedBlock; } @@ -995,7 +995,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIndexFirstChangedBlock(int i) { mIndexFirstChangedBlock = i; } diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index b5688a48344e..1878d61c78ac 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; import android.net.Uri; +import android.os.Build; import java.lang.annotation.Retention; @@ -44,7 +45,7 @@ public final class FontConfig { /** * Returns the ordered list of families included in the system fonts. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull Family[] getFamilies() { return mFamilies; } @@ -91,7 +92,7 @@ public final class FontConfig { /** * Returns the index to be used to access this font when accessing a TTC file. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getTtcIndex() { return mTtcIndex; } @@ -99,7 +100,7 @@ public final class FontConfig { /** * Returns the list of axes associated to this font. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull FontVariationAxis[] getAxes() { return mAxes; } @@ -107,7 +108,7 @@ public final class FontConfig { /** * Returns the weight value for this font. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getWeight() { return mWeight; } @@ -115,7 +116,7 @@ public final class FontConfig { /** * Returns whether this font is italic. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isItalic() { return mIsItalic; } @@ -231,7 +232,7 @@ public final class FontConfig { /** * Returns the name given by the system to this font family. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable String getName() { return mName; } @@ -239,7 +240,7 @@ public final class FontConfig { /** * Returns the list of fonts included in this family. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable Font[] getFonts() { return mFonts; } @@ -254,7 +255,7 @@ public final class FontConfig { /** * Returns the font variant for this family, e.g. "elegant" or "compact". May be null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Variant int getVariant() { return mVariant; } diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index ab19fa9a1256..b80b01f5a64a 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.BackgroundColorSpan; @@ -631,7 +632,7 @@ public class Html { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void withinStyle(StringBuilder out, CharSequence text, int start, int end) { for (int i = start; i < end; i++) { diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 8a4497a0f0ce..f0f0867d414b 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -24,6 +24,7 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.Rect; import android.graphics.text.LineBreaker; +import android.os.Build; import android.text.method.TextKeyListener; import android.text.style.AlignmentSpan; import android.text.style.LeadingMarginSpan; @@ -414,7 +415,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void drawText(Canvas canvas, int firstLine, int lastLine) { int previousLineBottom = getLineTop(firstLine); int previousLineEnd = getLineStart(firstLine); @@ -583,7 +584,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void drawBackground(Canvas canvas, Path highlight, Paint highlightPaint, int cursorOffsetVertical, int firstLine, int lastLine) { // First, draw LineBackgroundSpans. @@ -664,7 +665,7 @@ public abstract class Layout { * @return The range of lines that need to be drawn, possibly empty. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getLineRangeForDraw(Canvas canvas) { int dtop, dbottom; @@ -1154,7 +1155,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getPrimaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, trailing, clamped); @@ -1174,7 +1175,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getSecondaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, !trailing, clamped); @@ -1849,7 +1850,7 @@ public abstract class Layout { * only robust for left-aligned displays. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean shouldClampCursor(int line) { // Only clamp cursor position in left-aligned displays. switch (getParagraphAlignment(line)) { diff --git a/core/java/android/text/SpanSet.java b/core/java/android/text/SpanSet.java index 81bdd65974a8..d464278c714c 100644 --- a/core/java/android/text/SpanSet.java +++ b/core/java/android/text/SpanSet.java @@ -17,6 +17,7 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.reflect.Array; import java.util.Arrays; @@ -34,7 +35,7 @@ public class SpanSet { private final Class classType; int numberOfSpans; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) E[] spans; int[] spanStarts; int[] spanEnds; diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index c5f7f581dcd1..0e61eff86c2b 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.BaseCanvas; import android.graphics.Paint; +import android.os.Build; import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -863,7 +864,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public T[] getSpans(int queryStart, int queryEnd, @Nullable Class kind, boolean sortByInsertionOrder) { if (kind == null) return (T[]) ArrayUtils.emptyArray(Object.class); diff --git a/core/java/android/text/SpannableStringInternal.java b/core/java/android/text/SpannableStringInternal.java index 0fe9b6afeaea..f2ab1bb31fbc 100644 --- a/core/java/android/text/SpannableStringInternal.java +++ b/core/java/android/text/SpannableStringInternal.java @@ -18,6 +18,7 @@ package android.text; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; @@ -153,7 +154,7 @@ import java.lang.reflect.Array; * * @return True if excluded, false if included. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean isOutOfCopyRange(int start, int end, int spanStart, int spanEnd) { if (spanStart > end || spanEnd < start) return true; if (spanStart != spanEnd && start != end) { @@ -185,12 +186,12 @@ import java.lang.reflect.Array; setSpan(what, start, end, flags, true/*enforceParagraph*/); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean isIndexFollowsNextLine(int index) { return index != 0 && index != length() && charAt(index - 1) != '\n'; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setSpan(Object what, int start, int end, int flags, boolean enforceParagraph) { int nstart = start; int nend = end; @@ -555,12 +556,12 @@ import java.lang.reflect.Array; * * Due to backward compatibility reasons, we copy even NoCopySpan by default */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void copySpans(Spanned src, int start, int end) { copySpansFromSpanned(src, start, end, false); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void copySpans(SpannableStringInternal src, int start, int end) { copySpansFromInternal(src, start, end, false); } @@ -576,15 +577,15 @@ import java.lang.reflect.Array; @UnsupportedAppUsage private int mSpanCount; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ static final Object[] EMPTY = new Object[0]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int START = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int END = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int FLAGS = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int COLUMNS = 3; } diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 85e2d98e93c0..85911fffc1bf 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -1433,15 +1433,15 @@ public class StaticLayout extends Layout { // Unused, here because of gray list private API accesses. /*package*/ static class LineBreaks { private static final int INITIAL_SIZE = 16; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] breaks = new int[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] widths = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] ascents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] descents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] flags = new int[INITIAL_SIZE]; // hasTab // breaks, widths, and flags should all have the same length } diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 6318c4757bce..1f11d10052fe 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -57,7 +57,7 @@ public class TextLine { private static final char TAB_CHAR = '\t'; private TextPaint mPaint; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CharSequence mText; private int mStart; private int mLen; @@ -83,13 +83,13 @@ public class TextLine { private final TextPaint mWorkPaint = new TextPaint(); private final TextPaint mActivePaint = new TextPaint(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mMetricAffectingSpanSpanSet = new SpanSet(MetricAffectingSpan.class); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mCharacterStyleSpanSet = new SpanSet(CharacterStyle.class); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mReplacementSpanSpanSet = new SpanSet(ReplacementSpan.class); diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index c2e3a80a5c51..8e6c26ae9f93 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -460,7 +460,7 @@ public class DateFormat { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean hasDesignator(CharSequence inFormat, char designator) { if (inFormat == null) return false; diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index ff08269a93a4..511c9746c84c 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -25,6 +25,7 @@ import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; import android.icu.util.MeasureUnit; +import android.os.Build; import com.android.internal.R; @@ -395,7 +396,7 @@ public class DateUtils * the briefest form available (e.g. "2h"). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CharSequence formatDuration(long millis, int abbrev) { final FormatWidth width; switch (abbrev) { diff --git a/core/java/android/text/method/WordIterator.java b/core/java/android/text/method/WordIterator.java index d766186c13b0..f427e1bd2b72 100644 --- a/core/java/android/text/method/WordIterator.java +++ b/core/java/android/text/method/WordIterator.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.icu.lang.UCharacter; import android.icu.lang.UProperty; import android.icu.text.BreakIterator; +import android.os.Build; import android.text.CharSequenceCharacterIterator; import android.text.Selection; @@ -71,7 +72,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int preceding(int offset) { checkOffsetIsValid(offset); while (true) { @@ -83,7 +84,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int following(int offset) { checkOffsetIsValid(offset); while (true) { @@ -95,7 +96,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.isBoundary(offset); @@ -108,7 +109,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nextBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.following(offset); @@ -121,7 +122,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int prevBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.preceding(offset); @@ -180,7 +181,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPrevWordBeginningOnTwoWordsBoundary(int offset) { return getBeginning(offset, true); } @@ -199,7 +200,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNextWordEndOnTwoWordBoundary(int offset) { return getEnd(offset, true); } @@ -280,7 +281,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPunctuationBeginning(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationStartBoundary(offset)) { @@ -297,7 +298,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPunctuationEnd(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationEndBoundary(offset)) { @@ -314,7 +315,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is after a punctuation character. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAfterPunctuation(int offset) { if (mStart < offset && offset <= mEnd) { final int codePoint = Character.codePointBefore(mCharSeq, offset); @@ -330,7 +331,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is at a punctuation character. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOnPunctuation(int offset) { if (mStart <= offset && offset < mEnd) { final int codePoint = Character.codePointAt(mCharSeq, offset); diff --git a/core/java/android/text/style/EasyEditSpan.java b/core/java/android/text/style/EasyEditSpan.java index b23c2b7da6ac..ccccdcf88b69 100644 --- a/core/java/android/text/style/EasyEditSpan.java +++ b/core/java/android/text/style/EasyEditSpan.java @@ -19,6 +19,7 @@ package android.text.style; import android.annotation.NonNull; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.text.ParcelableSpan; import android.text.TextUtils; @@ -116,7 +117,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDeleteEnabled() { return mDeleteEnabled; } @@ -126,7 +127,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDeleteEnabled(boolean value) { mDeleteEnabled = value; } @@ -136,7 +137,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PendingIntent getPendingIntent() { return mPendingIntent; } diff --git a/core/java/android/text/style/SuggestionSpan.java b/core/java/android/text/style/SuggestionSpan.java index 9378636c24ca..1f15d462b9b1 100644 --- a/core/java/android/text/style/SuggestionSpan.java +++ b/core/java/android/text/style/SuggestionSpan.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -131,9 +132,9 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { private final String mLanguageTag; private final int mHashCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mEasyCorrectUnderlineThickness; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mEasyCorrectUnderlineColor; private float mMisspelledUnderlineThickness; @@ -434,7 +435,7 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { * @deprecated this is deprecated in {@link android.os.Build.VERSION_CODES#Q}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public void notifySelection(Context context, String original, int index) { Log.w(TAG, "notifySelection() is deprecated. Does nothing."); diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index a7ddfa93a74e..6e25160de8ac 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.app.ActivityThread; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.Spannable; @@ -660,7 +661,7 @@ public class Linkify { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void gatherTelLinks(ArrayList links, Spannable s, @Nullable Context context) { PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index e5115846013f..a2046307302b 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; import android.graphics.Rect; +import android.os.Build; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; @@ -848,7 +849,7 @@ public abstract class Transition implements Cloneable { return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static ArrayMap getRunningAnimators() { ArrayMap runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { @@ -1913,7 +1914,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void end() { --mNumInstances; if (mNumInstances == 0) { @@ -1971,7 +1972,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void cancel() { int numAnimators = mCurrentAnimators.size(); for (int i = numAnimators - 1; i >= 0; i--) { diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 1b0612e87202..3d5b811f7d9c 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -19,6 +19,7 @@ package android.transition; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.ArrayMap; import android.util.Log; import android.view.View; @@ -215,7 +216,7 @@ public class TransitionManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static ArrayMap> getRunningTransitions() { WeakReference>> runningTransitions = sRunningTransitions.get(); diff --git a/core/java/android/util/EventLog.java b/core/java/android/util/EventLog.java index a7d20b56eca3..4654dbfa9531 100644 --- a/core/java/android/util/EventLog.java +++ b/core/java/android/util/EventLog.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.BufferedReader; import java.io.FileReader; @@ -85,7 +86,7 @@ public class EventLog { private static final byte FLOAT_TYPE = 4; /** @param data containing event, read from the system */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ Event(byte[] data) { mBuffer = ByteBuffer.wrap(data); mBuffer.order(ByteOrder.nativeOrder()); diff --git a/core/java/android/util/IconDrawableFactory.java b/core/java/android/util/IconDrawableFactory.java index 5eeb12273661..b5e8dd7ed0af 100644 --- a/core/java/android/util/IconDrawableFactory.java +++ b/core/java/android/util/IconDrawableFactory.java @@ -23,6 +23,7 @@ import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.UserHandle; import android.os.UserManager; @@ -51,7 +52,7 @@ public class IconDrawableFactory { return appInfo.isInstantApp() || mUm.hasBadge(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Drawable getBadgedIcon(ApplicationInfo appInfo) { return getBadgedIcon(appInfo, UserHandle.getUserId(appInfo.uid)); } diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java index bf9a8384fe2c..8c4dcb3b28e2 100644 --- a/core/java/android/util/LocalLog.java +++ b/core/java/android/util/LocalLog.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.SystemClock; import java.io.FileDescriptor; @@ -112,7 +113,7 @@ public final class LocalLog { ReadOnlyLocalLog(LocalLog log) { mLog = log; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { mLog.dump(pw); } @@ -127,7 +128,7 @@ public final class LocalLog { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ReadOnlyLocalLog readOnlyLocalLog() { return new ReadOnlyLocalLog(this); } diff --git a/core/java/android/util/LogWriter.java b/core/java/android/util/LogWriter.java index a674ae166d63..21b366531eac 100644 --- a/core/java/android/util/LogWriter.java +++ b/core/java/android/util/LogWriter.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.Writer; @@ -39,7 +40,7 @@ public class LogWriter extends Writer { * {@link android.util.Log#ERROR Log.ERROR}. * @param tag A string tag to associate with each printed log statement. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LogWriter(int priority, String tag) { mPriority = priority; mTag = tag; diff --git a/core/java/android/util/LongArray.java b/core/java/android/util/LongArray.java index 93bcd6b8d4a1..53dddeb5ad0b 100644 --- a/core/java/android/util/LongArray.java +++ b/core/java/android/util/LongArray.java @@ -18,6 +18,7 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.Preconditions; @@ -45,7 +46,7 @@ public class LongArray implements Cloneable { /** * Creates an empty LongArray with the default initial capacity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LongArray() { this(10); } @@ -104,7 +105,7 @@ public class LongArray implements Cloneable { * * @throws IndexOutOfBoundsException when index < 0 || index > size() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void add(int index, long value) { ensureCapacity(1); int rightSegment = mSize - index; @@ -208,7 +209,7 @@ public class LongArray implements Cloneable { /** * Returns the number of values in this array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int size() { return mSize; } diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java index 0892c94d5bec..4ac3178ecb4c 100644 --- a/core/java/android/util/NtpTrustedTime.java +++ b/core/java/android/util/NtpTrustedTime.java @@ -26,6 +26,7 @@ import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkInfo; import android.net.SntpClient; +import android.os.Build; import android.os.SystemClock; import android.provider.Settings; import android.text.TextUtils; @@ -138,7 +139,7 @@ public class NtpTrustedTime implements TrustedTime { return sSingleton; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean forceRefresh() { synchronized (this) { NtpConnectionInfo connectionInfo = getNtpConnectionInfo(); @@ -181,7 +182,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasCache() { return mTimeResult != null; } @@ -208,7 +209,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long currentTimeMillis() { TimeResult timeResult = mTimeResult; if (timeResult == null) { @@ -227,7 +228,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedNtpTime() { if (LOGD) Log.d(TAG, "getCachedNtpTime() cache hit"); TimeResult timeResult = mTimeResult; @@ -240,7 +241,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedNtpTimeReference() { TimeResult timeResult = mTimeResult; return timeResult == null ? 0 : timeResult.getElapsedRealtimeMillis(); diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 1e5ec0b1c5c3..9be17cf75ba7 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -16,6 +16,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Path; +import android.os.Build; import dalvik.annotation.optimization.FastNative; @@ -29,7 +30,7 @@ public class PathParser { * @param pathString The string representing a path, the same as "d" string in svg file. * @return the generated Path object. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Path createPathFromPathData(String pathString) { if (pathString == null) { throw new IllegalArgumentException("Path string can not be null."); diff --git a/core/java/android/util/Rational.java b/core/java/android/util/Rational.java index aade6204aff8..d7730f2b0b3f 100644 --- a/core/java/android/util/Rational.java +++ b/core/java/android/util/Rational.java @@ -19,6 +19,7 @@ import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.IOException; import java.io.InvalidObjectException; @@ -77,9 +78,9 @@ public final class Rational extends Number implements Comparable { * Do not change the order of these fields or add new instance fields to maintain the * Serializable compatibility across API revisions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mNumerator; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mDenominator; /** diff --git a/core/java/android/util/RecurrenceRule.java b/core/java/android/util/RecurrenceRule.java index 0f2d8bc9e375..39d1f2cbef19 100644 --- a/core/java/android/util/RecurrenceRule.java +++ b/core/java/android/util/RecurrenceRule.java @@ -18,6 +18,7 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -51,7 +52,7 @@ public class RecurrenceRule implements Parcelable { @VisibleForTesting public static Clock sClock = Clock.systemDefaultZone(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ZonedDateTime start; public final ZonedDateTime end; public final Period period; @@ -68,7 +69,7 @@ public class RecurrenceRule implements Parcelable { } @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static RecurrenceRule buildRecurringMonthly(int dayOfMonth, ZoneId zone) { // Assume we started last January, since it has all possible days final ZonedDateTime now = ZonedDateTime.now(sClock).withZoneSameInstant(zone); diff --git a/core/java/android/util/Slog.java b/core/java/android/util/Slog.java index 2c8bbbfcf8de..3880131324fc 100644 --- a/core/java/android/util/Slog.java +++ b/core/java/android/util/Slog.java @@ -89,7 +89,7 @@ public final class Slog { * will always be handled asynchronously. Primarily for use by coding running within * the system process. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int wtf(String tag, String msg) { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, null, false, true); } @@ -130,7 +130,7 @@ public final class Slog { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, tr, false, true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int println(int priority, String tag, String msg) { return Log.println_native(Log.LOG_ID_SYSTEM, priority, tag, msg); } diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index e0b8d52aa132..cd6585cd3fa1 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -363,7 +363,7 @@ public class TimeUtils { * @return String representation of the time. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String logTimeOfDay(long millis) { Calendar c = Calendar.getInstance(); if (millis >= 0) { diff --git a/core/java/android/util/TrustedTime.java b/core/java/android/util/TrustedTime.java index f41fe85fa8bb..f279bdb79420 100644 --- a/core/java/android/util/TrustedTime.java +++ b/core/java/android/util/TrustedTime.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Interface that provides trusted time information, possibly coming from an NTP @@ -52,7 +53,7 @@ public interface TrustedTime { * @deprecated Only kept for UnsupportedAppUsage. Do not use. See {@link NtpTrustedTime} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCacheAge(); /** diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java index bee04f4d8036..c41b3cf9fb72 100644 --- a/core/java/android/view/AccessibilityIterators.java +++ b/core/java/android/view/AccessibilityIterators.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Configuration; +import android.os.Build; import java.text.BreakIterator; import java.util.Locale; @@ -46,11 +47,11 @@ public final class AccessibilityIterators { */ public static abstract class AbstractTextSegmentIterator implements TextSegmentIterator { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AbstractTextSegmentIterator() { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mText; private final int[] mSegment = new int[2]; diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index b5080cdb37aa..3da3184afae1 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -854,7 +854,7 @@ public final class Choreographer { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void scheduleVsyncLocked() { mDisplayEventReceiver.scheduleVsync(); } @@ -994,7 +994,7 @@ public final class Choreographer { public Object action; // Runnable or FrameCallback public Object token; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void run(long frameTimeNanos) { if (token == FRAME_CALLBACK_TOKEN) { ((FrameCallback)action).doFrame(frameTimeNanos); diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 34e8221bc971..b8a712d55929 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -289,7 +289,7 @@ public final class Display { * Display type: Physical display connected through an external port. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int TYPE_EXTERNAL = 2; @@ -1400,7 +1400,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Mode(int modeId, int width, int height, float refreshRate) { mModeId = modeId; mWidth = width; @@ -1583,7 +1583,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public HdrCapabilities(int[] supportedHdrTypes, float maxLuminance, float maxAverageLuminance, float minLuminance) { mSupportedHdrTypes = supportedHdrTypes; diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index 467d93ef3aaf..e8a4ed44b7c8 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.FrameInfo; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -228,7 +229,7 @@ public abstract class DisplayEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchHotplug(long timestampNanos, long physicalDisplayId, boolean connected) { onHotplug(timestampNanos, physicalDisplayId, connected); } diff --git a/core/java/android/view/DragEvent.java b/core/java/android/view/DragEvent.java index 9d8f7c3c083d..b6b029bdbb44 100644 --- a/core/java/android/view/DragEvent.java +++ b/core/java/android/view/DragEvent.java @@ -19,6 +19,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.ClipData; import android.content.ClipDescription; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -130,9 +131,9 @@ public class DragEvent implements Parcelable { int mAction; float mX, mY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ClipDescription mClipDescription; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ClipData mClipData; IDragAndDropPermissions mDragAndDropPermissions; @@ -337,7 +338,7 @@ public class DragEvent implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static DragEvent obtain(DragEvent source) { return obtain(source.mAction, source.mX, source.mY, source.mOffsetX, source.mOffsetY, source.mLocalState, source.mClipDescription, source.mClipData, source.mDragSurface, diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index 387787e3b0be..388096e09631 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -18,6 +18,7 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -258,7 +259,7 @@ public final class FrameMetrics { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long[] mTimingData; /** diff --git a/core/java/android/view/IRecentsAnimationRunner.aidl b/core/java/android/view/IRecentsAnimationRunner.aidl index 925786f82e00..f054b869a9b9 100644 --- a/core/java/android/view/IRecentsAnimationRunner.aidl +++ b/core/java/android/view/IRecentsAnimationRunner.aidl @@ -42,7 +42,7 @@ oneway interface IRecentsAnimationRunner { * * @see {@link RecentsAnimationController#cleanupScreenshot} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationCanceled(in @nullable ActivityManager.TaskSnapshot taskSnapshot) = 1; /** @@ -52,7 +52,7 @@ oneway interface IRecentsAnimationRunner { * @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be * {@code null} if the device is not currently in split screen */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationStart(in IRecentsAnimationController controller, in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in Rect homeContentInsets, in Rect minimizedHomeBounds) = 2; diff --git a/core/java/android/view/IRemoteAnimationRunner.aidl b/core/java/android/view/IRemoteAnimationRunner.aidl index 7b35aa2d2b45..423e23d2bc08 100644 --- a/core/java/android/view/IRemoteAnimationRunner.aidl +++ b/core/java/android/view/IRemoteAnimationRunner.aidl @@ -33,7 +33,7 @@ oneway interface IRemoteAnimationRunner { * @param apps The list of apps to animate. * @param finishedCallback The callback to invoke when the animation is finished. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationStart(in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in IRemoteAnimationFinishedCallback finishedCallback); @@ -41,6 +41,6 @@ oneway interface IRemoteAnimationRunner { * Called when the animation was cancelled. From this point on, any updates onto the leashes * won't have any effect anymore. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationCancelled(); } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 43a8992aa74e..c50d25e5445b 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -184,7 +184,7 @@ interface IWindowManager * Used by system ui to report that recents has shown itself. * @deprecated to be removed once prebuilts are updated */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void endProlongedAnimations(); void startFreezingScreen(int exitAnim, int enterAnim); @@ -198,7 +198,7 @@ interface IWindowManager void exitKeyguardSecurely(IOnKeyguardExitResult callback); @UnsupportedAppUsage boolean isKeyguardLocked(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isKeyguardSecure(int userId); void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message); @@ -210,11 +210,11 @@ interface IWindowManager // These can only be called with the SET_ANIMATON_SCALE permission. @UnsupportedAppUsage float getAnimationScale(int which); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) float[] getAnimationScales(); @UnsupportedAppUsage void setAnimationScale(int which, float scale); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAnimationScales(in float[] scales); float getCurrentAnimatorScale(); @@ -235,7 +235,7 @@ interface IWindowManager // should be enabled. The 'enabled' value is null or blank for // the system default (differs per build variant) or any valid // boolean string as parsed by SystemProperties.getBoolean(). - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStrictModeVisualIndicatorPreference(String enabled); /** @@ -411,7 +411,7 @@ interface IWindowManager /** * Lock the device immediately with the specified options (can be null). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void lockNow(in Bundle options); /** diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 9febc9f09ef3..0089a852a893 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -178,7 +178,7 @@ interface IWindowSession { * @param data Data transferred by drag and drop * @return Token of drag operation which will be passed to cancelDragAndDrop. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IBinder performDrag(IWindow window, int flags, in SurfaceControl surface, int touchSource, float touchX, float touchY, float thumbCenterX, float thumbCenterY, in ClipData data); diff --git a/core/java/android/view/InputChannel.java b/core/java/android/view/InputChannel.java index f2d3f5ad08bf..f76b1f89625b 100644 --- a/core/java/android/view/InputChannel.java +++ b/core/java/android/view/InputChannel.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -54,7 +55,7 @@ public final class InputChannel implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mPtr; // used by native code private static native long[] nativeOpenInputChannelPair(String name); diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 58e5b2dfaa37..22ac4dcd2cfe 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -424,7 +424,7 @@ public final class InputDevice implements Parcelable { }; // Called by native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private InputDevice(int id, int generation, int controllerNumber, String name, int vendorId, int productId, String descriptor, boolean isExternal, int sources, int keyboardType, KeyCharacterMap keyCharacterMap, boolean hasVibrator, boolean hasMicrophone, @@ -757,7 +757,7 @@ public final class InputDevice implements Parcelable { } // Called from native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void addMotionRange(int axis, int source, float min, float max, float flat, float fuzz, float resolution) { mMotionRanges.add(new MotionRange(axis, source, min, max, flat, fuzz, resolution)); diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index a06a0c68e241..038dff654ba6 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Looper; import android.os.MessageQueue; @@ -124,7 +125,7 @@ public abstract class InputEventReceiver { * * @param event The input event that was received. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInputEvent(InputEvent event) { finishInputEvent(event, false); } @@ -216,7 +217,7 @@ public abstract class InputEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchInputEvent(int seq, InputEvent event) { mSeqMap.put(event.getSequenceNumber(), seq); onInputEvent(event); diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java index 86a309e3ed79..40eb438262a1 100644 --- a/core/java/android/view/InputEventSender.java +++ b/core/java/android/view/InputEventSender.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -138,7 +139,7 @@ public abstract class InputEventSender { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchInputEventFinished(int seq, boolean handled) { onInputEventFinished(seq, handled); } diff --git a/core/java/android/view/InputFilter.java b/core/java/android/view/InputFilter.java index 36d558630da9..b18c5cdb2aab 100644 --- a/core/java/android/view/InputFilter.java +++ b/core/java/android/view/InputFilter.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -118,7 +119,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * * @param looper The looper to run callbacks on. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InputFilter(Looper looper) { mH = new H(looper); } @@ -188,7 +189,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * @param event The input event that was received. * @param policyFlags The input event policy flags. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInputEvent(InputEvent event, int policyFlags) { sendInputEvent(event, policyFlags); } diff --git a/core/java/android/view/InputQueue.java b/core/java/android/view/InputQueue.java index 74ce6ac02db3..7accb66aa3aa 100644 --- a/core/java/android/view/InputQueue.java +++ b/core/java/android/view/InputQueue.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.LongSparseArray; @@ -101,7 +102,7 @@ public final class InputQueue { mActiveEventArray.put(id, event); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void finishInputEvent(long id, boolean handled) { int index = mActiveEventArray.indexOfKey(id); if (index >= 0) { diff --git a/core/java/android/view/KeyCharacterMap.java b/core/java/android/view/KeyCharacterMap.java index 90e0f3f89a0f..02a97888cffd 100644 --- a/core/java/android/view/KeyCharacterMap.java +++ b/core/java/android/view/KeyCharacterMap.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.input.InputManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.method.MetaKeyKeyListener; @@ -308,7 +309,7 @@ public class KeyCharacterMap implements Parcelable { } // Called from native - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private KeyCharacterMap(long ptr) { mPtr = ptr; } @@ -750,9 +751,9 @@ public class KeyCharacterMap implements Parcelable { private FallbackAction next; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int keyCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int metaState; private FallbackAction() { diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 0ab1751fbf95..c87e51e35891 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -849,7 +849,7 @@ public class KeyEvent extends InputEvent implements Parcelable { // Symbolic names of all metakeys in bit order from least significant to most significant. // Accordingly there are exactly 32 values in this table. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String[] META_SYMBOLIC_NAMES = new String[] { "META_SHIFT_ON", "META_ALT_ON", @@ -920,7 +920,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_CAP_LOCKED = 0x100; /** @@ -928,7 +928,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_ALT_LOCKED = 0x200; /** @@ -936,7 +936,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_SYM_LOCKED = 0x400; /** @@ -945,7 +945,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * in its API that is currently being retained for legacy reasons. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_SELECTING = 0x800; /** @@ -1266,29 +1266,29 @@ public class KeyEvent extends InputEvent implements Parcelable { private KeyEvent mNext; private int mId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDeviceId; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSource; private int mDisplayId; private @Nullable byte[] mHmac; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMetaState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAction; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mKeyCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mScanCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mRepeatCount; @UnsupportedAppUsage private int mFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mDownTime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mEventTime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mCharacters; public interface Callback { @@ -1651,7 +1651,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static KeyEvent obtain(long downTime, long eventTime, int action, int code, int repeat, int metaState, int deviceId, int scancode, int flags, int source, String characters) { @@ -2103,7 +2103,7 @@ public class KeyEvent extends InputEvent implements Parcelable { } // Mask of all modifier key meta states. Specifically excludes locked keys like caps lock. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_MODIFIER_MASK = META_SHIFT_ON | META_SHIFT_LEFT_ON | META_SHIFT_RIGHT_ON | META_ALT_ON | META_ALT_LEFT_ON | META_ALT_RIGHT_ON @@ -2112,23 +2112,23 @@ public class KeyEvent extends InputEvent implements Parcelable { | META_SYM_ON | META_FUNCTION_ON; // Mask of all lock key meta states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_LOCK_MASK = META_CAPS_LOCK_ON | META_NUM_LOCK_ON | META_SCROLL_LOCK_ON; // Mask of all valid meta states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_ALL_MASK = META_MODIFIER_MASK | META_LOCK_MASK; // Mask of all synthetic meta states that are reserved for API compatibility with // historical uses in MetaKeyKeyListener. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_SYNTHETIC_MASK = META_CAP_LOCKED | META_ALT_LOCKED | META_SYM_LOCKED | META_SELECTING; // Mask of all meta states that are not valid use in specifying a modifier key. // These bits are known to be used for purposes other than specifying modifiers. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_INVALID_MODIFIER_MASK = META_LOCK_MASK | META_SYNTHETIC_MASK; diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index b925b492c04b..66c514824e35 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -956,7 +956,7 @@ public abstract class LayoutInflater { * argument and should be used for everything except {@code >include>} * tag parsing. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private View createViewFromTag(View parent, String name, Context context, AttributeSet attrs) { return createViewFromTag(parent, name, context, attrs, false); } @@ -976,7 +976,7 @@ public abstract class LayoutInflater { * attribute (if set) for the view being inflated, * {@code false} otherwise */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) View createViewFromTag(View parent, String name, Context context, AttributeSet attrs, boolean ignoreThemeAttr) { if (name.equals("view")) { diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index abb82bc9e16b..a8d261553a8f 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1484,7 +1484,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { } // Private value for history pos that obtains the current sample. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int HISTORY_CURRENT = -0x80000000; // This is essentially the same as native AMOTION_EVENT_INVALID_CURSOR_POSITION as they're all diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 726176568605..2bd3d46d389a 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -25,6 +25,7 @@ import android.graphics.Canvas; import android.graphics.Outline; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.widget.RemoteViews; @@ -68,7 +69,7 @@ public class NotificationHeaderView extends ViewGroup { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NotificationHeaderView(Context context, @Nullable AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java index f60d98b2dc23..38ae03db3290 100644 --- a/core/java/android/view/PointerIcon.java +++ b/core/java/android/view/PointerIcon.java @@ -153,17 +153,17 @@ public final class PointerIcon implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mType; private int mSystemIconResourceId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Bitmap mBitmap; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mHotSpotX; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mHotSpotY; // The bitmaps for the additional frame of animated pointer icon. Note that the first frame // will be stored in mBitmap. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Bitmap mBitmapFrames[]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDurationPerFrame; /** diff --git a/core/java/android/view/RemoteAnimationAdapter.java b/core/java/android/view/RemoteAnimationAdapter.java index 166d3baa2fdf..a78036fba094 100644 --- a/core/java/android/view/RemoteAnimationAdapter.java +++ b/core/java/android/view/RemoteAnimationAdapter.java @@ -18,6 +18,7 @@ package android.view; import android.app.ActivityOptions; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -65,7 +66,7 @@ public class RemoteAnimationAdapter implements Parcelable { * @param statusBarTransitionDelay The desired delay for all visual animations in the * status bar caused by this app animation in millis. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RemoteAnimationAdapter(IRemoteAnimationRunner runner, long duration, long statusBarTransitionDelay, boolean changeNeedsSnapshot) { mRunner = runner; diff --git a/core/java/android/view/RemoteAnimationTarget.java b/core/java/android/view/RemoteAnimationTarget.java index e3129b639900..ac5d14e97c85 100644 --- a/core/java/android/view/RemoteAnimationTarget.java +++ b/core/java/android/view/RemoteAnimationTarget.java @@ -38,6 +38,7 @@ import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -98,7 +99,7 @@ public class RemoteAnimationTarget implements Parcelable { * The {@link SurfaceControl} for the starting state of a target if this transition is * MODE_CHANGING, {@code null)} otherwise. This is relative to the app window. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final SurfaceControl startLeash; /** @@ -171,7 +172,7 @@ public class RemoteAnimationTarget implements Parcelable { * should be equivalent to the size of the starting thumbnail. Note that sourceContainerBounds * is the end bounds of a change transition. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Rect startBounds; /** diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 0847a179c553..5b79174a6cd8 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -34,6 +34,7 @@ import android.graphics.Rect; import android.graphics.RenderNode; import android.graphics.SurfaceTexture; import android.hardware.HardwareBuffer; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -74,7 +75,7 @@ public class Surface implements Parcelable { throws OutOfResourcesException; private static native void nativeUnlockCanvasAndPost(long nativeObject, Canvas canvas); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native void nativeRelease(long nativeObject); private static native boolean nativeIsValid(long nativeObject); private static native boolean nativeIsConsumerRunningBehind(long nativeObject); @@ -127,7 +128,7 @@ public class Surface implements Parcelable { private String mName; @UnsupportedAppUsage long mNativeObject; // package scope only for SurfaceControl access - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mLockedObject; private int mGenerationId; // incremented each time mNativeObject changes private final Canvas mCanvas = new CompatibleCanvas(); @@ -264,7 +265,7 @@ public class Surface implements Parcelable { } /* called from android_view_Surface_createFromIGraphicBufferProducer() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Surface(long nativeObject) { synchronized (mLock) { setNativeObjectLocked(nativeObject); diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 6d6fabb16b72..5a4584387dba 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -309,7 +309,7 @@ public final class SurfaceControl implements Parcelable { * Surface creation flag: Surface is created hidden * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HIDDEN = 0x00000004; /** @@ -2898,7 +2898,7 @@ public final class SurfaceControl implements Parcelable { * @return Itself. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Transaction setCornerRadius(SurfaceControl sc, float cornerRadius) { checkPreconditions(sc); nativeSetCornerRadius(mNativeObject, sc.mNativeObject, cornerRadius); diff --git a/core/java/android/view/SurfaceSession.java b/core/java/android/view/SurfaceSession.java index 0f851c1881f5..cbc0479a4c07 100644 --- a/core/java/android/view/SurfaceSession.java +++ b/core/java/android/view/SurfaceSession.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An instance of this class represents a connection to the surface @@ -26,7 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; */ public final class SurfaceSession { // Note: This field is accessed by native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeClient; // SurfaceComposerClient* private static native long nativeCreate(); diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index a02070a21ac8..fc0ec4c560d4 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -29,6 +29,7 @@ import android.graphics.Rect; import android.graphics.SurfaceTexture; import android.graphics.TextureLayer; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.util.Log; @@ -117,7 +118,7 @@ public class TextureView extends View { private SurfaceTextureListener mListener; private boolean mHadSurface; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mOpaque = true; private final Matrix mMatrix = new Matrix(); @@ -125,7 +126,7 @@ public class TextureView extends View { private final Object[] mLock = new Object[0]; private boolean mUpdateLayer; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mUpdateSurface; private Canvas mCanvas; @@ -133,7 +134,7 @@ public class TextureView extends View { private final Object[] mNativeWindowLock = new Object[0]; // Set by native code, do not write! - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeWindow; /** @@ -227,7 +228,7 @@ public class TextureView extends View { /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDetachedFromWindowInternal() { destroyHardwareLayer(); releaseSurfaceTexture(); @@ -244,7 +245,7 @@ public class TextureView extends View { destroyHardwareLayer(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void destroyHardwareLayer() { if (mLayer != null) { mLayer.detachSurfaceTexture(); @@ -853,9 +854,9 @@ public class TextureView extends View { void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native void nCreateNativeWindow(SurfaceTexture surface); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native void nDestroyNativeWindow(); private static native boolean nLockCanvas(long nativeWindow, Canvas canvas, Rect dirty); diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index 1f71924ca927..e1c4305e8747 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -18,6 +18,7 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.Pools.SynchronizedPool; @@ -436,25 +437,25 @@ public final class VelocityTracker { /** * Polynomial coefficients describing motion in X. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final float[] xCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial coefficients describing motion in Y. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final float[] yCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial degree, or zero if only position information is available. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int degree; /** * Confidence (coefficient of determination), between 0 (no fit) and 1 (perfect fit). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float confidence; /** diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index bda368ecb3a2..e5561b339948 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -809,7 +809,7 @@ import java.util.function.Predicate; @UiThread public class View implements Drawable.Callback, KeyEvent.Callback, AccessibilityEventSource { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = false; /** @hide */ @@ -2409,7 +2409,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private int mAutofillViewId = NO_ID; // ID for accessibility purposes. This ID must be unique for every window - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAccessibilityViewId = NO_ID; private int mAccessibilityCursorPosition = ACCESSIBILITY_CURSOR_POSITION_UNDEFINED; @@ -2421,7 +2421,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setTag(Object) * @see #getTag() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected Object mTag = null; /* @@ -3888,7 +3888,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Flag to make the status bar not expandable. Unless you also * set {@link #STATUS_BAR_DISABLE_NOTIFICATION_ICONS}, new notifications will continue to show. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int STATUS_BAR_DISABLE_EXPAND = 0x00010000; /** @@ -4551,7 +4551,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private LongSparseLongArray mMeasureCache; @ViewDebug.ExportedProperty(deepExport = true, prefix = "bg_") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Drawable mBackground; private TintInfo mBackgroundTint; @@ -4669,7 +4669,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * This field should be made private, so it is hidden from the SDK. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected OnCreateContextMenuListener mOnCreateContextMenuListener; @UnsupportedAppUsage @@ -4678,13 +4678,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @UnsupportedAppUsage private OnTouchListener mOnTouchListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnHoverListener mOnHoverListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnGenericMotionListener mOnGenericMotionListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnDragListener mOnDragListener; private OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener; @@ -5113,7 +5113,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean mCachingFailed; @UnsupportedAppUsage private Bitmap mDrawingCache; @@ -6850,7 +6850,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScrollabilityCache getScrollCache() { initScrollCache(); return mScrollCache; @@ -10368,7 +10368,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean isVisibleToUser(Rect boundInView) { if (mAttachInfo != null) { // Attached to invisible window means this view is not visible. @@ -10756,7 +10756,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide pending API council approval */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onFocusLost() { resetPressedState(); } @@ -11648,7 +11648,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean fitsSystemWindows() { return getFitsSystemWindows(); } @@ -13709,7 +13709,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void notifyViewAccessibilityStateChangedIfNeeded(int changeType) { if (!AccessibilityManager.getInstance(mContext).isEnabled() || mAttachInfo == null) { return; @@ -14129,7 +14129,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TextSegmentIterator getIteratorForGranularity(int granularity) { switch (granularity) { case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER: { @@ -14596,7 +14596,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return True if the event was handled by the view, false otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean dispatchPointerEvent(MotionEvent event) { if (event.isTouchEvent()) { return dispatchTouchEvent(event); @@ -15916,7 +15916,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isInScrollingContainer() { ViewParent p = getParent(); while (p != null && p instanceof ViewGroup) { @@ -16646,7 +16646,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return The inverse of the current matrix of this view. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Matrix getInverseMatrix() { ensureTransformationInfo(); if (mTransformationInfo.mInverseMatrix == null) { @@ -18688,7 +18688,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void invalidateParentIfNeeded() { if (isHardwareAccelerated() && mParent instanceof View) { ((View) mParent).invalidate(true); @@ -18795,7 +18795,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ThreadedRenderer getThreadedRenderer() { return mAttachInfo != null ? mAttachInfo.mThreadedRenderer : null; } @@ -19932,7 +19932,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #computeHorizontalScrollOffset() * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDrawHorizontalScrollBar(Canvas canvas, Drawable scrollBar, int l, int t, int r, int b) { scrollBar.setBounds(l, t, r, b); @@ -20115,7 +20115,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Return true if the application tag in the AndroidManifest has set "supportRtl" to true */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean hasRtlSupport() { return mContext.getApplicationInfo().hasRtlSupport(); } @@ -20273,7 +20273,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resolvePadding() { final int resolvedLayoutDirection = getLayoutDirection(); @@ -20371,7 +20371,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDetachedFromWindowInternal() { mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT; mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT; @@ -21088,7 +21088,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void destroyHardwareResources() { if (mOverlay != null) { mOverlay.getOverlayView().destroyHardwareResources(); @@ -21224,7 +21224,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RenderNode updateDisplayListIfDirty() { final RenderNode renderNode = mRenderNode; if (!canHaveDisplayList()) { @@ -21295,7 +21295,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return renderNode; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void resetDisplayList() { mRenderNode.discardDisplayList(); if (mBackgroundRenderNode != null) { @@ -24749,7 +24749,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean toGlobalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -24771,7 +24771,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean toLocalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -26193,7 +26193,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisabledSystemUiVisibility(int flags) { if (mAttachInfo != null) { if (mAttachInfo.mDisabledSystemUiVisibility != flags) { @@ -26242,7 +26242,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * */ public static class DragShadowBuilder { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WeakReference mView; /** @@ -26710,7 +26710,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Drawable that are not transparent. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void applyDrawableToTransparentRegion(Drawable dr, Region region) { if (DBG) { Log.i("View", "Getting transparent region for: " + this); @@ -27278,7 +27278,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"), @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"), }) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRawTextDirection() { return (mPrivateFlags2 & PFLAG2_TEXT_DIRECTION_MASK) >> PFLAG2_TEXT_DIRECTION_MASK_SHIFT; } @@ -27535,7 +27535,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd") }) @TextAlignment - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRawTextAlignment() { return (mPrivateFlags2 & PFLAG2_TEXT_ALIGNMENT_MASK) >> PFLAG2_TEXT_ALIGNMENT_MASK_SHIFT; } @@ -28885,7 +28885,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * constants declared by {@link View} (there are more display states than * screen states). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mDisplayState = Display.STATE_UNKNOWN; /** @@ -29365,7 +29365,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * The current state of the scrollbars: ON, OFF, or FADING */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int state = OFF; private int mLastColor; @@ -29817,7 +29817,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) { return host.createAccessibilityNodeInfoInternal(); } @@ -30235,7 +30235,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return true; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void hideTooltip() { if (mTooltipInfo == null) { return; diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index abf76ece1f3d..16211fcecdf4 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -680,7 +680,7 @@ public class ViewConfiguration { * to a hover movement gesture. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getHoverTapSlop() { return HOVER_TAP_SLOP; } diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 100b4fdbf446..01cb0a67c1a2 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -29,6 +29,7 @@ import android.graphics.Picture; import android.graphics.RecordingCanvas; import android.graphics.Rect; import android.graphics.RenderNode; +import android.os.Build; import android.os.Debug; import android.os.Handler; import android.os.Looper; @@ -476,7 +477,7 @@ public class ViewDebug { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getViewRootImplCount() { return Debug.countInstancesOfClass(ViewRootImpl.class); } @@ -1152,7 +1153,7 @@ public class ViewDebug { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void dump(View root, boolean skipChildren, boolean includeProperties, OutputStream clientStream) throws IOException { BufferedWriter out = null; diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index eb6c49549100..37bea5821e42 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -131,7 +131,7 @@ import java.util.function.Predicate; public abstract class ViewGroup extends View implements ViewParent, ViewManager { private static final String TAG = "ViewGroup"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = false; /** @@ -3059,7 +3059,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void transformPointToViewLocal(float[] point, View child) { point[0] += mScrollX - child.mLeft; point[1] += mScrollY - child.mTop; @@ -3772,7 +3772,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfoInternal(info); if (getAccessibilityNodeProvider() != null) { @@ -3904,7 +3904,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void dispatchDetachedFromWindow() { // If we still have a touch target, we are still in the process of // dispatching motion events to a child; we need to get rid of that @@ -7769,7 +7769,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resolvePadding() { super.resolvePadding(); int count = getChildCount(); @@ -9240,7 +9240,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) { super.encodeProperties(encoder); diff --git a/core/java/android/view/ViewOverlay.java b/core/java/android/view/ViewOverlay.java index 274f1eddee95..02f7e95ba742 100644 --- a/core/java/android/view/ViewOverlay.java +++ b/core/java/android/view/ViewOverlay.java @@ -22,6 +22,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import java.util.ArrayList; @@ -56,7 +57,7 @@ public class ViewOverlay { * of the overlay * @return */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ViewGroup getOverlayView() { return mOverlayViewGroup; } @@ -96,7 +97,7 @@ public class ViewOverlay { mOverlayViewGroup.clear(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean isEmpty() { return mOverlayViewGroup.isEmpty(); } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 9bc07702feee..49582305663d 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -272,7 +272,7 @@ public final class ViewRootImpl implements ViewParent, */ private static final int CONTENT_CAPTURE_ENABLED_FALSE = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final ThreadLocal sRunQueues = new ThreadLocal(); static final ArrayList sFirstDrawHandlers = new ArrayList<>(); @@ -417,11 +417,11 @@ public final class ViewRootImpl implements ViewParent, final Region mTransparentRegion; final Region mPreviousTransparentRegion; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mWidth; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mHeight; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Rect mDirty; public boolean mIsAnimating; @@ -801,7 +801,7 @@ public final class ViewRootImpl implements ViewParent, } /** Add static config callback to be notified about global config changes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void addConfigCallback(ConfigChangedCallback callback) { synchronized (sConfigCallbacks) { sConfigCallbacks.add(callback); @@ -1175,7 +1175,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getWindowFlags() { return mWindowAttributes.flags; } @@ -1957,7 +1957,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void scheduleTraversals() { if (!mTraversalScheduled) { mTraversalScheduled = true; @@ -5206,7 +5206,7 @@ public final class ViewRootImpl implements ViewParent, * @param inTouchMode Whether we want to be in touch mode. * @return True if the touch mode changed and focus changed was changed as a result */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean ensureTouchMode(boolean inTouchMode) { if (DBG) Log.d("touchmode", "ensureTouchMode(" + inTouchMode + "), current " + "touch mode is " + mAttachInfo.mInTouchMode); @@ -7239,7 +7239,7 @@ public final class ViewRootImpl implements ViewParent, } /* drag/drop */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setLocalDragState(Object obj) { mLocalDragState = obj; } @@ -7865,7 +7865,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchResized(ClientWindowFrames frames, boolean reportDraw, MergedConfiguration mergedConfiguration, boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId) { @@ -8056,7 +8056,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void enqueueInputEvent(InputEvent event) { enqueueInputEvent(event, null, 0, false); } @@ -8475,7 +8475,7 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.addViewRect(info); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void cancelInvalidate(View view) { mHandler.removeMessages(MSG_INVALIDATE, view); // fixme: might leak the AttachInfo.InvalidateInfo objects instead of returning @@ -8484,12 +8484,12 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.removeView(view); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dispatchInputEvent(InputEvent event) { dispatchInputEvent(event, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dispatchInputEvent(InputEvent event, InputEventReceiver receiver) { SomeArgs args = SomeArgs.obtain(); args.arg1 = event; diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java index d9b55e4e729d..5a99ab2f5bdb 100644 --- a/core/java/android/view/ViewTreeObserver.java +++ b/core/java/android/view/ViewTreeObserver.java @@ -51,7 +51,7 @@ public final class ViewTreeObserver { // Non-recursive listeners use CopyOnWriteArray // Any listener invoked from ViewRootImpl.performTraversals() should not be recursive - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CopyOnWriteArray mOnGlobalLayoutListeners; @UnsupportedAppUsage private CopyOnWriteArray mOnComputeInternalInsetsListeners; @@ -242,7 +242,7 @@ public final class ViewTreeObserver { * Only used when {@link #setTouchableInsets(int)} is called with * the option {@link #TOUCHABLE_INSETS_REGION}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Region touchableRegion = new Region(); /** @@ -267,7 +267,7 @@ public final class ViewTreeObserver { * Option for {@link #setTouchableInsets(int)}: the area inside of * the provided touchable region in {@link #touchableRegion} can be touched. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TOUCHABLE_INSETS_REGION = 3; /** diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 5331a1b8d538..8dd4b667d357 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -162,7 +162,7 @@ public abstract class Window { * Max value used as a feature ID * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FEATURE_MAX = FEATURE_ACTIVITY_TRANSITIONS; /** @@ -791,7 +791,7 @@ public abstract class Window { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean isDestroyed() { return mDestroyed; } @@ -1137,7 +1137,7 @@ public abstract class Window { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addPrivateFlags(int flags) { setPrivateFlags(flags, flags); } diff --git a/core/java/android/view/WindowAnimationFrameStats.java b/core/java/android/view/WindowAnimationFrameStats.java index dfc4f0cd4dc6..251ae9bd58f2 100644 --- a/core/java/android/view/WindowAnimationFrameStats.java +++ b/core/java/android/view/WindowAnimationFrameStats.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -48,7 +49,7 @@ public final class WindowAnimationFrameStats extends FrameStats implements Parce * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void init(long refreshPeriodNano, long[] framesPresentedTimeNano) { mRefreshPeriodNano = refreshPeriodNano; mFramesPresentedTimeNano = framesPresentedTimeNano; diff --git a/core/java/android/view/WindowContentFrameStats.java b/core/java/android/view/WindowContentFrameStats.java index 217197c96793..c788346efdd8 100644 --- a/core/java/android/view/WindowContentFrameStats.java +++ b/core/java/android/view/WindowContentFrameStats.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public final class WindowContentFrameStats extends FrameStats implements Parcela * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void init(long refreshPeriodNano, long[] framesPostedTimeNano, long[] framesPresentedTimeNano, long[] framesReadyTimeNano) { mRefreshPeriodNano = refreshPeriodNano; diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 2cab32b48793..5d1b13f06d39 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -76,6 +76,7 @@ import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -1078,7 +1079,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows only on the owning user's window. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15; /** @@ -1147,7 +1148,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows on all users' windows. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_DISPLAY_OVERLAY = FIRST_SYSTEM_WINDOW+26; /** @@ -2724,7 +2725,7 @@ public interface WindowManager extends ViewManager { * The ui visibility as requested by the views in this hierarchy. * the combined value should be systemUiVisibility | subtreeSystemUiVisibility. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int subtreeSystemUiVisibility; /** @@ -2900,7 +2901,7 @@ public interface WindowManager extends ViewManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int INPUT_FEATURE_DISABLE_USER_ACTIVITY = 0x00000004; /** diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index f01cbcc1430e..dd0ab6503a8a 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -259,7 +259,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getRootViews(IBinder token) { ArrayList views = new ArrayList<>(); synchronized (mLock) { @@ -438,7 +438,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeView(View view, boolean immediate) { if (view == null) { throw new IllegalArgumentException("view must not be null"); diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index d803f8bfa6cc..f63749be6df2 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -126,7 +126,7 @@ public final class AccessibilityInteractionClient /** * @return The client for the current thread. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static AccessibilityInteractionClient getInstance() { final long threadId = Thread.currentThread().getId(); return getInstanceForThread(threadId); @@ -205,7 +205,7 @@ public final class AccessibilityInteractionClient * * @param message The message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSameThreadMessage(Message message) { synchronized (mInstanceLock) { mSameThreadMessage = message; @@ -729,7 +729,7 @@ public final class AccessibilityInteractionClient return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void clearCache() { sAccessibilityCache.clear(); } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index a9e8d5498a57..a8534faf43e5 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -111,7 +111,7 @@ public final class AccessibilityManager { public static final int DALTONIZER_DISABLED = -1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DALTONIZER_SIMULATE_MONOCHROMACY = 0; /** @hide */ diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 303ba9e2a7d8..97ce92cd90aa 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -726,7 +726,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getAccessibilityViewId(long accessibilityNodeId) { return (int) accessibilityNodeId; } @@ -740,7 +740,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getVirtualDescendantId(long accessibilityNodeId) { return (int) ((accessibilityNodeId & VIRTUAL_DESCENDANT_ID_MASK) >> VIRTUAL_DESCENDANT_ID_SHIFT); @@ -768,7 +768,7 @@ public class AccessibilityNodeInfo implements Parcelable { private static final AccessibilityNodeInfo DEFAULT = new AccessibilityNodeInfo(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mSealed; // Data. @@ -988,7 +988,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean refresh(Bundle arguments, boolean bypassCache) { enforceSealed(); if (!canPerformRequestOverConnection(mConnectionId, mWindowId, mSourceNodeId)) { diff --git a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl index f96f0acd6082..049bb31adbb1 100644 --- a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl +++ b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl @@ -33,7 +33,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setFindAccessibilityNodeInfoResult(in AccessibilityNodeInfo info, int interactionId); /** @@ -42,7 +42,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}s. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setFindAccessibilityNodeInfosResult(in List infos, int interactionId); @@ -52,6 +52,6 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param Whether the action was performed. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setPerformAccessibilityActionResult(boolean succeeded, int interactionId); } diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl index 97036f3f3a1b..5d3c72015ee3 100644 --- a/core/java/android/view/accessibility/IAccessibilityManager.aidl +++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl @@ -44,7 +44,7 @@ interface IAccessibilityManager { List getInstalledAccessibilityServiceList(int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) List getEnabledAccessibilityServiceList(int feedbackType, int userId); int addAccessibilityInteractionConnection(IWindow windowToken, IBinder leashToken, diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 5785999e2672..1931174d4bb8 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2334,7 +2334,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isCursorAnchorInfoEnabled() { synchronized (mH) { final boolean isImmediate = (mRequestUpdateCursorAnchorInfoMonitorMode & @@ -2350,7 +2350,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUpdateCursorAnchorInfoMode(int flags) { synchronized (mH) { mRequestUpdateCursorAnchorInfoMonitorMode = flags; diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java index fa4f7d6d32da..b606340b77a7 100644 --- a/core/java/android/view/textclassifier/TextClassificationManager.java +++ b/core/java/android/view/textclassifier/TextClassificationManager.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.ServiceManager; import android.view.textclassifier.TextClassifier.TextClassifierType; @@ -104,7 +105,7 @@ public final class TextClassificationManager { * @see TextClassifier#DEFAULT_SYSTEM * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TextClassifier getTextClassifier(@TextClassifierType int type) { switch (type) { case TextClassifier.LOCAL: diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index afddaa2ff58a..35d84458bd35 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -18,6 +18,7 @@ package android.view.textservice; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -97,7 +98,7 @@ public class SpellCheckerSession { private final InternalListener mInternalListener; private final TextServicesManager mTextServicesManager; private final SpellCheckerInfo mSpellCheckerInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpellCheckerSessionListener mSpellCheckerSessionListener; private final SpellCheckerSessionListenerImpl mSpellCheckerSessionListenerImpl; diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index cd70a313db67..d34c8d58e789 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -22,6 +22,7 @@ import android.annotation.TestApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; @@ -217,7 +218,7 @@ public final class TextServicesManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SpellCheckerInfo[] getEnabledSpellCheckers() { try { final SpellCheckerInfo[] retval = mService.getEnabledSpellCheckers(mUserId); diff --git a/core/java/android/webkit/IWebViewUpdateService.aidl b/core/java/android/webkit/IWebViewUpdateService.aidl index 1da0500727ad..e17773159ec5 100644 --- a/core/java/android/webkit/IWebViewUpdateService.aidl +++ b/core/java/android/webkit/IWebViewUpdateService.aidl @@ -51,7 +51,7 @@ interface IWebViewUpdateService { * DevelopmentSettings uses this to get the current available WebView * providers (to display as choices to the user). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) WebViewProviderInfo[] getValidWebViewPackages(); /** @@ -62,7 +62,7 @@ interface IWebViewUpdateService { /** * Used by DevelopmentSetting to get the name of the WebView provider currently in use. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getCurrentWebViewPackageName(); /** diff --git a/core/java/android/webkit/PluginData.java b/core/java/android/webkit/PluginData.java index c9a196017a75..5d481b12a27c 100644 --- a/core/java/android/webkit/PluginData.java +++ b/core/java/android/webkit/PluginData.java @@ -17,6 +17,7 @@ package android.webkit; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.InputStream; import java.util.Map; @@ -93,7 +94,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InputStream getInputStream() { return mStream; } @@ -108,7 +109,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getContentLength() { return mContentLength; } @@ -126,7 +127,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Map getHeaders() { return mHeaders; } @@ -141,7 +142,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getStatusCode() { return mStatusCode; } diff --git a/core/java/android/webkit/UrlInterceptRegistry.java b/core/java/android/webkit/UrlInterceptRegistry.java index c9dee00942c3..4fa6fdeecbee 100644 --- a/core/java/android/webkit/UrlInterceptRegistry.java +++ b/core/java/android/webkit/UrlInterceptRegistry.java @@ -18,6 +18,7 @@ package android.webkit; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.webkit.CacheManager.CacheResult; import java.util.Iterator; @@ -154,7 +155,7 @@ public final class UrlInterceptRegistry { */ @Deprecated @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static synchronized PluginData getPluginData( String url, Map headers) { if (urlInterceptDisabled()) { diff --git a/core/java/android/webkit/WebResourceResponse.java b/core/java/android/webkit/WebResourceResponse.java index 219523b15ab0..e4af9095265c 100644 --- a/core/java/android/webkit/WebResourceResponse.java +++ b/core/java/android/webkit/WebResourceResponse.java @@ -19,6 +19,7 @@ package android.webkit; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.InputStream; import java.io.StringBufferInputStream; @@ -34,7 +35,7 @@ public class WebResourceResponse { private boolean mImmutable; private String mMimeType; private String mEncoding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mStatusCode; private String mReasonPhrase; private Map mResponseHeaders; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8eb1371505bf..487d13e40bf3 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -112,7 +112,7 @@ public class WebView extends AbsoluteLayout // Throwing an exception for incorrect thread usage if the // build target is JB MR2 or newer. Defaults to false, and is // set in the WebView constructor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static volatile boolean sEnforceThreadChecking = false; /** @@ -407,7 +407,7 @@ public class WebView extends AbsoluteLayout * @hide */ @SuppressWarnings("deprecation") // for super() call into deprecated base class constructor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected WebView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes, @Nullable Map javaScriptInterfaces, boolean privateBrowsing) { @@ -2587,7 +2587,7 @@ public class WebView extends AbsoluteLayout return WebViewFactory.getProvider(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Looper mWebViewThread = Looper.myLooper(); @UnsupportedAppUsage diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 5fc93443f4b8..dde9c3089370 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -26,6 +26,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; +import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; import android.os.Trace; @@ -390,7 +391,7 @@ public final class WebViewFactory { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static Class getProviderClass() { Context webViewContext = null; Application initialApplication = AppGlobals.getInitialApplication(); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 45b21c569cea..88c0809613ee 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -253,7 +253,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Controls CHOICE_MODE_MULTIPLE_MODAL. null when inactive. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ActionMode mChoiceActionMode; /** @@ -288,7 +288,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Should be used by subclasses to listen to changes in the dataset */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AdapterDataSetObserver mDataSetObserver; /** @@ -452,7 +452,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Handles scrolling between positions within the list. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AbsPositionScroller mPositionScroller; /** @@ -1454,7 +1454,7 @@ public abstract class AbsListView extends AdapterView implements Te * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean isVerticalScrollBarHidden() { return isFastScrollEnabled(); } @@ -2249,7 +2249,7 @@ public abstract class AbsListView extends AdapterView implements Te } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean canScrollUp() { boolean canScrollUp; // 0th element is not visible @@ -2266,7 +2266,7 @@ public abstract class AbsListView extends AdapterView implements Te return canScrollUp; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean canScrollDown() { boolean canScrollDown; int count = getChildCount(); @@ -3275,7 +3275,7 @@ public abstract class AbsListView extends AdapterView implements Te CheckForLongPress.INVALID_COORD); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean performLongPress(final View child, final int longPressPosition, final long longPressId, float x, float y) { // CHOICE_MODE_MULTIPLE_MODAL takes over long press. @@ -6694,7 +6694,7 @@ public abstract class AbsListView extends AdapterView implements Te * scrap heap. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int scrappedFromPosition; /** diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java index 67ed30f2ec73..b9ff26b7d9ff 100644 --- a/core/java/android/widget/AbsSeekBar.java +++ b/core/java/android/widget/AbsSeekBar.java @@ -29,6 +29,7 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.util.AttributeSet; import android.view.KeyEvent; @@ -857,7 +858,7 @@ public abstract class AbsSeekBar extends ProgressBar { /** * Draw the thumb. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void drawThumb(Canvas canvas) { if (mThumb != null) { final int saveCount = canvas.save(); diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java index aa3590aaff0a..6d566baa23cd 100644 --- a/core/java/android/widget/ActionMenuPresenter.java +++ b/core/java/android/widget/ActionMenuPresenter.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -587,7 +588,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter * Dismiss all popup menus - overflow and submenus. * @return true if popups were dismissed, false otherwise. (This can be because none were open.) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean dismissPopupMenus() { boolean result = hideOverflowMenu(); result |= hideSubMenus(); @@ -610,7 +611,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter /** * @return true if the overflow menu is currently showing */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOverflowMenuShowing() { return mOverflowPopup != null && mOverflowPopup.isShowing(); } @@ -769,7 +770,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Parcelable onSaveInstanceState() { SavedState state = new SavedState(); state.openSubMenuId = mOpenSubMenuId; @@ -777,7 +778,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onRestoreInstanceState(Parcelable state) { SavedState saved = (SavedState) state; if (saved.openSubMenuId > 0) { diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java index 3a743562110f..f83ff305cfdc 100644 --- a/core/java/android/widget/ActionMenuView.java +++ b/core/java/android/widget/ActionMenuView.java @@ -22,6 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.Gravity; @@ -719,7 +720,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo * @hide Private LinearLayout (superclass) API. Un-hide if LinearLayout API is made public. */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean hasDividerBeforeChildAt(int childIndex) { if (childIndex == 0) { return false; @@ -790,7 +791,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo /** @hide */ public interface ActionMenuChildView { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean needsDividerBefore(); public boolean needsDividerAfter(); } @@ -798,31 +799,31 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo public static class LayoutParams extends LinearLayout.LayoutParams { /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOverflowButton; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int cellsUsed; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int extraPixels; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean expandable; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean preventEdgeOffset; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean expanded; public LayoutParams(Context c, AttributeSet attrs) { diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java index 9da337ad97da..299760bfa91f 100644 --- a/core/java/android/widget/ActivityChooserModel.java +++ b/core/java/android/widget/ActivityChooserModel.java @@ -27,6 +27,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.DataSetObservable; import android.os.AsyncTask; +import android.os.Build; import android.text.TextUtils; import android.util.Log; import android.util.Xml; @@ -379,7 +380,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param intent The intent. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIntent(Intent intent) { synchronized (mInstanceLock) { if (mIntent == intent) { @@ -514,7 +515,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param listener The listener. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOnChooseActivityListener(OnChooseActivityListener listener) { synchronized (mInstanceLock) { mActivityChoserModelPolicy = listener; diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 00526d9f8a2c..ea906c68c69b 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -113,7 +113,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe private final PassThroughClickListener mPassThroughClickListener; private CharSequence mHintText; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TextView mHintView; private int mHintResource; @@ -615,7 +615,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide Pending API council approval */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDropDownDismissedOnCompletion(boolean dropDownDismissedOnCompletion) { mDropDownDismissedOnCompletion = dropDownDismissedOnCompletion; } @@ -1225,7 +1225,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide internal used only by SearchDialog */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void showDropDownAfterLayout() { mPopup.postShow(); } diff --git a/core/java/android/widget/DatePickerSpinnerDelegate.java b/core/java/android/widget/DatePickerSpinnerDelegate.java index fd89b2e09131..c6d456d8cb01 100644 --- a/core/java/android/widget/DatePickerSpinnerDelegate.java +++ b/core/java/android/widget/DatePickerSpinnerDelegate.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; import android.icu.util.Calendar; +import android.os.Build; import android.os.Parcelable; import android.text.InputType; import android.text.TextUtils; @@ -501,7 +502,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { || mCurrentDate.get(Calendar.DAY_OF_MONTH) != dayOfMonth); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDate(int year, int month, int dayOfMonth) { mCurrentDate.set(year, month, dayOfMonth); resetAutofilledValue(); @@ -512,7 +513,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateSpinners() { // set the spinner ranges respecting the min and max dates if (mCurrentDate.equals(mMinDate)) { @@ -565,7 +566,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Updates the calendar view with the current date. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateCalendarView() { mCalendarView.setDate(mCurrentDate.getTimeInMillis(), false, false); } @@ -574,7 +575,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Notifies the listener, if such, for a change in the selected date. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDateChanged() { mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); if (mOnDateChangedListener != null) { @@ -630,7 +631,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateInputState() { // Make sure that if the user changes the value and the IME is active // for one of the inputs if this widget, the IME is closed. If the user diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 20a53c03bed1..955552289c3a 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -30,6 +30,7 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.database.ContentObserver; +import android.os.Build; import android.os.Handler; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -81,7 +82,7 @@ public class DateTimeView extends TextView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public DateTimeView(Context context, AttributeSet attrs) { super(context, attrs); final TypedArray a = context.obtainStyledAttributes(attrs, diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 32f3acd387b0..c10ffbee686a 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -87,7 +87,7 @@ public class EdgeEffect { private static final float RADIUS_FACTOR = 0.6f; private float mGlowAlpha; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mGlowScaleY; private float mGlowAlphaStart; diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index f2955ac554fc..4099c8aa6710 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -323,7 +323,7 @@ public class Editor { private boolean mShowErrorAfterAttach; boolean mInBatchEditControllers; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mShowSoftInputOnFocus = true; private boolean mPreserveSelection; private boolean mRestartActionModeOnNextRefresh; @@ -355,7 +355,7 @@ public class Editor { Callback mCustomInsertionActionModeCallback; // Set when this TextView gained focus with some text selected. Will start selection mode. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mCreatedWithASelection; // The button state as of the last time #onTouchEvent is called. diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index 0c0b3491a854..7dbe7b234422 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -140,7 +140,7 @@ class FastScroller { @UnsupportedAppUsage private Drawable mThumbDrawable; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Drawable mTrackDrawable; private int mTextAppearance; private int mThumbPosition; diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index a6dce7f05f4a..50773b1c43b9 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -39,6 +39,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Insets; import android.graphics.Paint; +import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.util.LogPrinter; @@ -2815,7 +2816,7 @@ public class GridLayout extends ViewGroup { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final Alignment UNDEFINED_ALIGNMENT = new Alignment() { @Override int getGravityOffset(View view, int cellDelta) { diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 4a5e95e492e5..196d68bcd08a 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -979,7 +979,7 @@ public class GridView extends AbsListView { return sel; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean determineColumns(int availableSpace) { final int requestedHorizontalSpacing = mRequestedHorizontalSpacing; final int stretchMode = mStretchMode; diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 3bb39c135034..97dbb1542717 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -150,9 +150,9 @@ public class HorizontalScrollView extends FrameLayout { private int mMinimumVelocity; private int mMaximumVelocity; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mOverscrollDistance; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mOverflingDistance; private float mHorizontalScrollFactor; diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index c20773848759..e4de4001c3e2 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -127,7 +127,7 @@ public class ImageView extends View { @UnsupportedAppUsage private Drawable mDrawable = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private BitmapDrawable mRecycleableBitmapDrawable = null; private ColorStateList mDrawableTintList = null; private BlendMode mDrawableBlendMode = null; diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index a796ba545d8f..fa84407c5c4d 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -212,9 +212,9 @@ public class LinearLayout extends ViewGroup { private static final int VERTICAL_GRAVITY_COUNT = 4; private static final int INDEX_CENTER_VERTICAL = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int INDEX_TOP = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int INDEX_BOTTOM = 2; private static final int INDEX_FILL = 3; diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index 4311ffbe0e95..6232480f8620 100755 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -332,7 +332,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDropDownAlwaysVisible(boolean dropDownAlwaysVisible) { mDropDownAlwaysVisible = dropDownAlwaysVisible; } @@ -342,7 +342,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDropDownAlwaysVisible() { return mDropDownAlwaysVisible; } @@ -933,7 +933,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @param max Max number of items that can be visible and still allow the list to expand. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setListItemExpandMax(int max) { mListItemExpandMaximum = max; } @@ -1130,7 +1130,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @return the content's height or -1 if content already exists */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int buildDropDown() { ViewGroup dropDownView; int otherHeights = 0; diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 3c3daa3c7001..cf0e0d1f1842 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1979,7 +1979,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean trackMotionScroll(int deltaY, int incrementalDeltaY) { final boolean result = super.trackMotionScroll(deltaY, incrementalDeltaY); removeUnusedFixedViews(mHeaderViewInfos); @@ -4028,7 +4028,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int getHeightForPosition(int position) { final int height = super.getHeightForPosition(position); if (shouldAdjustHeightForDivider(position)) { diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 8dfb936ef7ee..7c20472df357 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -250,7 +250,7 @@ public class NumberPicker extends LinearLayout { /** * The min height of this widget. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMinHeight; /** @@ -261,7 +261,7 @@ public class NumberPicker extends LinearLayout { /** * The max width of this widget. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMinWidth; /** @@ -277,7 +277,7 @@ public class NumberPicker extends LinearLayout { /** * The height of the text. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mTextSize; /** @@ -298,7 +298,7 @@ public class NumberPicker extends LinearLayout { /** * Upper value of the range of numbers allowed for the NumberPicker */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMaxValue; /** @@ -309,7 +309,7 @@ public class NumberPicker extends LinearLayout { /** * Listener to be notified upon current value change. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnValueChangeListener mOnValueChangeListener; /** @@ -367,7 +367,7 @@ public class NumberPicker extends LinearLayout { /** * The {@link Scroller} responsible for flinging the selector. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Scroller mFlingScroller; /** @@ -429,7 +429,7 @@ public class NumberPicker extends LinearLayout { /** * @see ViewConfiguration#getScaledMaximumFlingVelocity() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMaximumFlingVelocity; /** diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 1c33d80fd4ca..27fcde25ad37 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -19,6 +19,7 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.hardware.SensorManager; +import android.os.Build; import android.util.Log; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; @@ -36,7 +37,7 @@ public class OverScroller { @UnsupportedAppUsage private final SplineOverScroller mScrollerY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Interpolator mInterpolator; private final boolean mFlywheel; diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java index 0ce964666a2b..2aa587539930 100644 --- a/core/java/android/widget/PopupMenu.java +++ b/core/java/android/widget/PopupMenu.java @@ -20,6 +20,7 @@ import android.annotation.MenuRes; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; @@ -40,7 +41,7 @@ import com.android.internal.view.menu.ShowableListMenu; * it. */ public class PopupMenu { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Context mContext; private final MenuBuilder mMenu; private final View mAnchor; diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index cc3d74477342..e7e148abb95a 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -183,7 +183,7 @@ public class PopupWindow { private boolean mClipToScreen; private boolean mAllowScrollingAnchorParent = true; private boolean mLayoutInsetDecor = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mNotTouchModal; private boolean mAttachedInDecor = true; private boolean mAttachedInDecorSet = false; diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 796654a4dc99..67216f5955f7 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -240,7 +240,7 @@ public class ProgressBar extends View { /** Value used to track progress animation, in the range [0...1]. */ private float mVisualProgress; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mMirrorForRtl = false; private boolean mAggregatedIsVisible; @@ -1673,7 +1673,7 @@ public class ProgressBar extends View { // Stub method. } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private synchronized void refreshProgress(int id, int progress, boolean fromUser, boolean animate) { if (mUiThreadId == Thread.currentThread().getId()) { diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index dcfb3872bda0..4ba1ca8989b7 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -261,7 +261,7 @@ public class RemoteViews implements Parcelable, Filter { * RemoteViews. */ private RemoteViews mLandscape = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RemoteViews mPortrait = null; @ApplyFlags @@ -439,7 +439,7 @@ public class RemoteViews implements Parcelable, Filter { // Do nothing } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mergeBehavior() { return MERGE_REPLACE; } @@ -508,7 +508,7 @@ public class RemoteViews implements Parcelable, Filter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void mergeRemoteViews(RemoteViews newRv) { if (newRv == null) return; // We first copy the new RemoteViews, as the process of merging modifies the way the actions @@ -700,7 +700,7 @@ public class RemoteViews implements Parcelable, Filter { return SET_PENDING_INTENT_TEMPLATE_TAG; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) PendingIntent pendingIntentTemplate; } @@ -1148,7 +1148,7 @@ public class RemoteViews implements Parcelable, Filter { private static class BitmapCache { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ArrayList mBitmaps; int mBitmapMemory = -1; @@ -1564,7 +1564,7 @@ public class RemoteViews implements Parcelable, Filter { * ViewGroup methods that are related to adding Views. */ private class ViewGroupActionAdd extends Action { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RemoteViews mNestedViews; private int mIndex; @@ -2479,7 +2479,7 @@ public class RemoteViews implements Parcelable, Filter { * Returns an estimate of the bitmap heap memory usage for this RemoteViews. */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int estimateMemoryUsage() { return mBitmapCache.getBitmapMemory(); } @@ -3004,7 +3004,7 @@ public class RemoteViews implements Parcelable, Filter { * @hide * @deprecated this appears to have no users outside of UnsupportedAppUsage? */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public void setRemoteAdapter(int viewId, ArrayList list, int viewTypeCount) { addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount)); diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index b8849367b7b6..c98ed6a2f5d0 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -32,6 +32,7 @@ import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.res.Configuration; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -107,7 +108,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback private final Executor mAsyncViewLoadExecutor; private OnClickHandler mRemoteViewsOnClickHandler; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final FixedSizeRemoteViewsCache mCache; private int mVisibleWindowLowerBound; private int mVisibleWindowUpperBound; @@ -116,7 +117,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // loaded. private RemoteViewsFrameLayoutRefSet mRequestedViews; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final HandlerThread mWorkerThread; // items may be interrupted within the normally processed queues private final Handler mMainHandler; @@ -896,17 +897,17 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDataReady() { return mDataReady; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRemoteViewsOnClickHandler(OnClickHandler handler) { mRemoteViewsOnClickHandler = handler; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void saveRemoteViewsCache() { final RemoteViewsCacheKey key = new RemoteViewsCacheKey( new Intent.FilterComparison(mIntent), mAppWidgetId); @@ -1051,7 +1052,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Intent getRemoteViewsServiceIntent() { return mIntent; } @@ -1098,7 +1099,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * views are currently being displayed. This allows for certain optimizations and preloading * which wouldn't otherwise be possible. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVisibleRangeHint(int lowerBound, int upperBound) { mVisibleWindowLowerBound = lowerBound; mVisibleWindowUpperBound = upperBound; diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index b44b8c222fac..f3de9828c4aa 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -188,7 +188,7 @@ public class ScrollView extends FrameLayout { * These are no-ops on user builds. */ private StrictMode.Span mScrollStrictSpan = null; // aka "drag" - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private StrictMode.Span mFlingStrictSpan = null; /** diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index b8a324931f86..2108f8ea350e 100755 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -1938,7 +1938,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mThreshold = getThreshold(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SearchAutoComplete(Context context, AttributeSet attrs) { super(context, attrs); mThreshold = getThreshold(); diff --git a/core/java/android/widget/SeekBar.java b/core/java/android/widget/SeekBar.java index 5676881cee76..201cab1c81e3 100644 --- a/core/java/android/widget/SeekBar.java +++ b/core/java/android/widget/SeekBar.java @@ -18,6 +18,7 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -90,7 +91,7 @@ public class SeekBar extends AbsSeekBar { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void onProgressRefresh(float scale, boolean fromUser, int progress) { super.onProgressRefresh(scale, fromUser, progress); diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 46fc09f4c3b3..ba6fa197f164 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -1082,7 +1082,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { /** * @return true if the popup is showing, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isShowing(); /** @@ -1113,7 +1113,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isShowing() { return mPopup != null ? mPopup.isShowing() : false; } diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 5bca56f14add..3295fd2ea1c3 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -35,6 +35,7 @@ import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.text.Layout; import android.text.StaticLayout; @@ -110,7 +111,7 @@ public class Switch extends CompoundButton { private boolean mHasTrackTintMode = false; private int mThumbTextPadding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mSwitchMinWidth; private int mSwitchPadding; private boolean mSplitTrack; diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index 95c0e8658c57..b1485ef27de5 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -32,6 +32,7 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.icu.text.DateTimePatternGenerator; import android.net.Uri; +import android.os.Build; import android.os.Handler; import android.os.SystemClock; import android.os.UserHandle; @@ -494,7 +495,7 @@ public class TextClock extends TextView { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CharSequence getFormat() { return mFormat; } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 3fc0f4efd608..d8b4c748b283 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4364,7 +4364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener shouldRequestLayout); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setRawTextSize(float size, boolean shouldRequestLayout) { if (size != mTextPaint.getTextSize()) { mTextPaint.setTextSize(size); @@ -7876,7 +7876,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return drawableState; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Path getUpdatedHighlightPath() { Path highlight = null; Paint highlightPaint = mHighlightPaint; @@ -12359,7 +12359,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * be {@code null} if no text is set */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CharSequence getTextForAccessibility() { // If the text is empty, we must be showing the hint text. if (TextUtils.isEmpty(mText)) { @@ -12501,7 +12501,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CharSequence getTransformedText(int start, int end) { return removeSuggestionSpans(mTransformed.subSequence(start, end)); } @@ -12989,7 +12989,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return x; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int getLineAtCoordinate(float y) { y -= getTotalPaddingTop(); // Clamp the position to inside of the view. @@ -13178,7 +13178,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * Deletes the range of text [start, end[. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void deleteText_internal(int start, int end) { ((Editable) mText).delete(start, end); } @@ -13230,7 +13230,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CharSequence getIterableTextForAccessibility() { return mText; } diff --git a/core/java/android/widget/ViewAnimator.java b/core/java/android/widget/ViewAnimator.java index 90f61ca50d52..3f8325a8f547 100644 --- a/core/java/android/widget/ViewAnimator.java +++ b/core/java/android/widget/ViewAnimator.java @@ -21,6 +21,7 @@ import android.annotation.AnimRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -156,7 +157,7 @@ public class ViewAnimator extends FrameLayout { * @param animate Whether or not to use the in and out animations, defaults * to true. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void showOnly(int childIndex, boolean animate) { final int count = getChildCount(); for (int i = 0; i < count; i++) { diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 2df9a785450b..5abb6e1637e7 100644 --- a/core/java/android/widget/ViewFlipper.java +++ b/core/java/android/widget/ViewFlipper.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.TypedArray; +import android.os.Build; import android.os.Message; import android.util.AttributeSet; import android.util.Log; @@ -183,7 +184,7 @@ public class ViewFlipper extends ViewAnimator { * addition to queuing future flips. If omitted, defaults to * true. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateRunning(boolean flipNow) { boolean running = mVisible && mStarted && mUserPresent; if (running != mRunning) { diff --git a/core/java/com/android/ims/internal/uce/common/CapInfo.java b/core/java/com/android/ims/internal/uce/common/CapInfo.java index a7a90f6912c2..bca647a911d6 100644 --- a/core/java/com/android/ims/internal/uce/common/CapInfo.java +++ b/core/java/com/android/ims/internal/uce/common/CapInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -91,7 +92,7 @@ public class CapInfo implements Parcelable { /** * Constructor for the CapInfo class. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo() { }; @@ -99,7 +100,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IM is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isImSupported() { return mImSupported; } @@ -107,7 +108,7 @@ public class CapInfo implements Parcelable { /** * Sets IM as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setImSupported(boolean imSupported) { this.mImSupported = imSupported; } @@ -115,7 +116,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Thumbnail is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtThumbSupported() { return mFtThumbSupported; } @@ -123,7 +124,7 @@ public class CapInfo implements Parcelable { /** * Sets FT thumbnail as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtThumbSupported(boolean ftThumbSupported) { this.mFtThumbSupported = ftThumbSupported; } @@ -133,7 +134,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Store and Forward is supported */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtSnFSupported() { return mFtSnFSupported; } @@ -141,7 +142,7 @@ public class CapInfo implements Parcelable { /** * Sets FT Store and Forward as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtSnFSupported(boolean ftSnFSupported) { this.mFtSnFSupported = ftSnFSupported; } @@ -149,7 +150,7 @@ public class CapInfo implements Parcelable { /** * Checks whether File transfer HTTP is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtHttpSupported() { return mFtHttpSupported; } @@ -157,7 +158,7 @@ public class CapInfo implements Parcelable { /** * Sets File transfer HTTP as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtHttpSupported(boolean ftHttpSupported) { this.mFtHttpSupported = ftHttpSupported; } @@ -165,7 +166,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtSupported() { return mFtSupported; } @@ -173,7 +174,7 @@ public class CapInfo implements Parcelable { /** * Sets FT as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtSupported(boolean ftSupported) { this.mFtSupported = ftSupported; } @@ -181,7 +182,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IS is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIsSupported() { return mIsSupported; } @@ -189,7 +190,7 @@ public class CapInfo implements Parcelable { /** * Sets IS as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIsSupported(boolean isSupported) { this.mIsSupported = isSupported; } @@ -197,7 +198,7 @@ public class CapInfo implements Parcelable { /** * Checks whether video sharing is supported during a CS call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVsDuringCSSupported() { return mVsDuringCSSupported; } @@ -206,7 +207,7 @@ public class CapInfo implements Parcelable { * Sets video sharing as supported or not supported during a CS * call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVsDuringCSSupported(boolean vsDuringCSSupported) { this.mVsDuringCSSupported = vsDuringCSSupported; } @@ -215,7 +216,7 @@ public class CapInfo implements Parcelable { * Checks whether video sharing outside a voice call is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVsSupported() { return mVsSupported; } @@ -223,7 +224,7 @@ public class CapInfo implements Parcelable { /** * Sets video sharing as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVsSupported(boolean vsSupported) { this.mVsSupported = vsSupported; } @@ -231,7 +232,7 @@ public class CapInfo implements Parcelable { /** * Checks whether social presence is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSpSupported() { return mSpSupported; } @@ -239,7 +240,7 @@ public class CapInfo implements Parcelable { /** * Sets social presence as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSpSupported(boolean spSupported) { this.mSpSupported = spSupported; } @@ -248,7 +249,7 @@ public class CapInfo implements Parcelable { * Checks whether capability discovery via presence is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isCdViaPresenceSupported() { return mCdViaPresenceSupported; } @@ -257,7 +258,7 @@ public class CapInfo implements Parcelable { * Sets capability discovery via presence as supported or not * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) { this.mCdViaPresenceSupported = cdViaPresenceSupported; } @@ -265,7 +266,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP voice call is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIpVoiceSupported() { return mIpVoiceSupported; } @@ -273,7 +274,7 @@ public class CapInfo implements Parcelable { /** * Sets IP voice call as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIpVoiceSupported(boolean ipVoiceSupported) { this.mIpVoiceSupported = ipVoiceSupported; } @@ -281,7 +282,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP video call is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIpVideoSupported() { return mIpVideoSupported; } @@ -289,7 +290,7 @@ public class CapInfo implements Parcelable { /** * Sets IP video call as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIpVideoSupported(boolean ipVideoSupported) { this.mIpVideoSupported = ipVideoSupported; } @@ -298,7 +299,7 @@ public class CapInfo implements Parcelable { * Checks whether Geo location Pull using File Transfer is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPullFtSupported() { return mGeoPullFtSupported; } @@ -307,7 +308,7 @@ public class CapInfo implements Parcelable { * Sets Geo location Pull using File Transfer as supported or * not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPullFtSupported(boolean geoPullFtSupported) { this.mGeoPullFtSupported = geoPullFtSupported; } @@ -315,7 +316,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Pull is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPullSupported() { return mGeoPullSupported; } @@ -323,7 +324,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Pull as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPullSupported(boolean geoPullSupported) { this.mGeoPullSupported = geoPullSupported; } @@ -331,7 +332,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Push is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPushSupported() { return mGeoPushSupported; } @@ -339,7 +340,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Push as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPushSupported(boolean geoPushSupported) { this.mGeoPushSupported = geoPushSupported; } @@ -347,7 +348,7 @@ public class CapInfo implements Parcelable { /** * Checks whether short messaging is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSmSupported() { return mSmSupported; } @@ -355,7 +356,7 @@ public class CapInfo implements Parcelable { /** * Sets short messaging as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSmSupported(boolean smSupported) { this.mSmSupported = smSupported; } @@ -363,22 +364,22 @@ public class CapInfo implements Parcelable { /** * Checks whether store/forward and group chat are supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFullSnFGroupChatSupported() { return mFullSnFGroupChatSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVoiceCallSupported() { return mRcsIpVoiceCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVideoCallSupported() { return mRcsIpVideoCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVideoOnlyCallSupported() { return mRcsIpVideoOnlyCallSupported; } @@ -386,20 +387,20 @@ public class CapInfo implements Parcelable { /** * Sets store/forward and group chat supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) { this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) { this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) { this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) { this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported; } @@ -536,20 +537,20 @@ public class CapInfo implements Parcelable { } /** Sets the list of supported extensions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setExts(String[] exts) { this.mExts = exts; } /** Gets the time stamp for when to query again. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCapTimestamp() { return mCapTimestamp; } /** Sets the time stamp for when to query again. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapTimestamp(long capTimestamp) { this.mCapTimestamp = capTimestamp; } diff --git a/core/java/com/android/ims/internal/uce/common/StatusCode.java b/core/java/com/android/ims/internal/uce/common/StatusCode.java index 7f69493aa284..847792f4b50c 100644 --- a/core/java/com/android/ims/internal/uce/common/StatusCode.java +++ b/core/java/com/android/ims/internal/uce/common/StatusCode.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -75,14 +76,14 @@ public class StatusCode implements Parcelable { * Constructor for the StatusCode class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public StatusCode() {} /** * Gets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getStatusCode() { return mStatusCode; } @@ -91,7 +92,7 @@ public class StatusCode implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatusCode(int nStatusCode) { this.mStatusCode = nStatusCode; } diff --git a/core/java/com/android/ims/internal/uce/common/UceLong.java b/core/java/com/android/ims/internal/uce/common/UceLong.java index bf514471b506..d878c10c76b4 100644 --- a/core/java/com/android/ims/internal/uce/common/UceLong.java +++ b/core/java/com/android/ims/internal/uce/common/UceLong.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +33,7 @@ public class UceLong implements Parcelable { * Constructor for the UceLong class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UceLong() { }; @@ -40,7 +41,7 @@ public class UceLong implements Parcelable { * Gets the long value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUceLong() { return mUceLong; } @@ -49,7 +50,7 @@ public class UceLong implements Parcelable { * Sets the long value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUceLong(long uceLong) { this.mUceLong = uceLong; } @@ -57,7 +58,7 @@ public class UceLong implements Parcelable { /** Get the client ID as integer value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getClientId() { return mClientId; } @@ -66,7 +67,7 @@ public class UceLong implements Parcelable { * Set the client ID as integer value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setClientId(int nClientId) { this.mClientId = nClientId; } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl index c69d5a94f760..62897c7fb1ae 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl @@ -29,7 +29,7 @@ interface IOptionsListener * @param version, version information of the service. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void getVersionCb(in String version ); /** @@ -38,7 +38,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service availability. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceAvailable(in StatusCode statusCode); /** @@ -47,7 +47,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service unavailability. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceUnavailable(in StatusCode statusCode); /** @@ -58,7 +58,7 @@ interface IOptionsListener * @param capInfo, capabilities of the remote entity received. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sipResponseReceived( String uri, in OptionsSipResponse sipResponse, in OptionsCapInfo capInfo); @@ -67,7 +67,7 @@ interface IOptionsListener * @param cmdStatus, command status of the request placed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cmdStatus(in OptionsCmdStatus cmdStatus); /** @@ -78,7 +78,7 @@ interface IOptionsListener * @param tID, transation of the request received from network. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void incomingOptions( String uri, in OptionsCapInfo capInfo, in int tID); } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl index 2e49082988c3..a7487b804567 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl @@ -33,7 +33,7 @@ interface IOptionsService * @return StatusCode, status of the request placed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getVersion(int optionsServiceHandle); /** @@ -45,7 +45,7 @@ interface IOptionsService * The service will fill UceLong.mUceLong with optionsServiceListenerHdl * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode addListener(int optionsServiceHandle, IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); @@ -56,7 +56,7 @@ interface IOptionsService * @param optionsServiceListenerHdl provided in createOptionsService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode removeListener(int optionsServiceHandle, in UceLong optionsServiceListenerHdl); /** @@ -69,7 +69,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode setMyInfo(int optionsServiceHandle , in CapInfo capInfo, int reqUserData); @@ -82,7 +82,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getMyInfo(int optionsServiceHandle , int reqUserdata); /** @@ -95,7 +95,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactCap(int optionsServiceHandle , String remoteURI, int reqUserData); @@ -109,7 +109,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactListCap(int optionsServiceHandle, in String[] remoteURIList, int reqUserData); @@ -126,7 +126,7 @@ interface IOptionsService * @param bContactInBL, true if the contact is blacklisted, else false. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode responseIncomingOptions(int optionsServiceHandle, int tId, int sipResponseCode, String reasonPhrase, in OptionsCapInfo capInfo, in boolean bContactInBL); diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java index 1da5a2439f02..6f83bf3224a8 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -31,12 +32,12 @@ public class OptionsCapInfo implements Parcelable { return new OptionsCapInfo(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getSdp() { return mSdp; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSdp(String sdp) { this.mSdp = sdp; } @@ -44,19 +45,19 @@ public class OptionsCapInfo implements Parcelable { /** * Constructor for the OptionsCapInfo class. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCapInfo() { mCapInfo = new CapInfo(); }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo getCapInfo() { return mCapInfo; } /** * Sets the CapInfo */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java index 401ca2fa24ea..82eb1b54a775 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java @@ -18,6 +18,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -56,7 +57,7 @@ public class OptionsCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -65,7 +66,7 @@ public class OptionsCmdId implements Parcelable { * Constructor for the OptionsCDCmdId class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCmdId(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java index 70a7a84d3820..461f8bfb48c8 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +43,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -58,7 +59,7 @@ public class OptionsCmdStatus implements Parcelable { /** Sets the user data. @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUserData(int userData) { this.mUserData = userData; } @@ -75,7 +76,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatus(StatusCode status) { this.mStatus = status; } @@ -84,7 +85,7 @@ public class OptionsCmdStatus implements Parcelable { * Constructor for the OptionsCmdStatus class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCmdStatus() { mStatus = new StatusCode(); mCapInfo = new CapInfo(); @@ -101,7 +102,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the CapInfo * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java index 5afddf0c42c0..acea0f03742f 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +43,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the Options command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -59,7 +60,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the request ID * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -76,7 +77,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -93,7 +94,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -110,7 +111,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -119,7 +120,7 @@ public class OptionsSipResponse implements Parcelable { * Constructor for the OptionsSipResponse class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsSipResponse() { mCmdId = new OptionsCmdId(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl index 65e7fc9756bb..572a5f32ee93 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl @@ -36,7 +36,7 @@ interface IPresenceListener * Gets the version of the presence listener implementation. * @param version, version information. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void getVersionCb(in String version ); /** @@ -44,7 +44,7 @@ interface IPresenceListener * availability. * @param statusCode, UCE_SUCCESS as service availability. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceAvailable(in StatusCode statusCode); /** @@ -52,7 +52,7 @@ interface IPresenceListener * unavailability. * @param statusCode, UCE_SUCCESS as service unAvailability. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceUnAvailable(in StatusCode statusCode); /** @@ -60,14 +60,14 @@ interface IPresenceListener * publish request. * @param publishTrigger, Publish trigger for the network being supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void publishTriggering(in PresPublishTriggerType publishTrigger); /** * Callback function to be invoked to inform the client of the status of an asynchronous call. * @param cmdStatus, command status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cmdStatus( in PresCmdStatus cmdStatus); /** @@ -75,7 +75,7 @@ interface IPresenceListener * such as PUBLISH or SUBSCRIBE, has been received. * @param sipResponse, network response received for the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sipResponseReceived(in PresSipResponse sipResponse); /** @@ -84,7 +84,7 @@ interface IPresenceListener * @param presentityURI, URI of the remote entity the request was placed. * @param tupleInfo, array of capability information remote entity supports. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void capInfoReceived(in String presentityURI, in PresTupleInfo [] tupleInfo); @@ -94,7 +94,7 @@ interface IPresenceListener * @param rlmiInfo, resource infomation received from network. * @param resInfo, array of capabilities received from network for the list of remore URI. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void listCapInfoReceived(in PresRlmiInfo rlmiInfo, in PresResInfo [] resInfo); @@ -102,7 +102,7 @@ interface IPresenceListener * Callback function to be invoked to inform the client when Unpublish message * is sent to network. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void unpublishMessageSent(); } \ No newline at end of file diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl index 26a3e83efcfa..de28dfa9f2d7 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl @@ -33,7 +33,7 @@ interface IPresenceService * @param presenceServiceHdl returned in createPresenceService(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getVersion(int presenceServiceHdl); /** @@ -46,7 +46,7 @@ interface IPresenceService * * @return StatusCode, status of the request placed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode addListener(int presenceServiceHdl, IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); @@ -56,7 +56,7 @@ interface IPresenceService * @param presenceServiceListenerHdl provided in createPresenceService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode removeListener(int presenceServiceHdl, in UceLong presenceServiceListenerHdl); /** @@ -72,7 +72,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode reenableService(int presenceServiceHdl, int userData); /** @@ -85,7 +85,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode publishMyCap(int presenceServiceHdl, in PresCapInfo myCapInfo , int userData); /** @@ -99,7 +99,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactCap(int presenceServiceHdl , String remoteUri, int userData); /** @@ -113,7 +113,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactListCap(int presenceServiceHdl, in String[] remoteUriList, int userData); /** @@ -129,7 +129,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode setNewFeatureTag(int presenceServiceHdl, String featureTag, in PresServiceInfo serviceInfo, int userData); diff --git a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java index 1a3a028713f6..ec8b6bfa4ef3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -27,14 +28,14 @@ import com.android.ims.internal.uce.common.CapInfo; public class PresCapInfo implements Parcelable { private CapInfo mCapInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mContactUri = ""; /** * Gets the UCE capability information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo getCapInfo() { return mCapInfo; } @@ -51,7 +52,7 @@ public class PresCapInfo implements Parcelable { * Gets the contact URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getContactUri() { return mContactUri; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java index fba0c77e8dbf..9692b428c792 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -58,7 +59,7 @@ public class PresCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -68,7 +69,7 @@ public class PresCmdId implements Parcelable { * Constructor for the PresCmdId class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdId(){}; diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java index fbc64b83a360..7e22106f3be3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -43,7 +44,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -60,7 +61,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the user data. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUserData(int userData) { this.mUserData = userData; } @@ -76,7 +77,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatus(StatusCode status) { this.mStatus = status; } @@ -93,7 +94,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -102,7 +103,7 @@ public class PresCmdStatus implements Parcelable{ * Constructor for the PresCmdStatus class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdStatus() { mStatus = new StatusCode(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java index fdff86f9669f..04bbf6cd8e30 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java +++ b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -70,7 +71,7 @@ public class PresPublishTriggerType implements Parcelable { * Sets the publish trigger type. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPublishTrigeerType(int nPublishTriggerType) { this.mPublishTriggerType = nPublishTriggerType; } @@ -80,7 +81,7 @@ public class PresPublishTriggerType implements Parcelable { * Constructor for the PresPublishTriggerType class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresPublishTriggerType(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java index af9b0568d29b..2f797b41b14f 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +40,7 @@ public class PresResInfo implements Parcelable { * Sets the Presence service resource instance information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setInstanceInfo(PresResInstanceInfo instanceInfo) { this.mInstanceInfo = instanceInfo; } @@ -56,7 +57,7 @@ public class PresResInfo implements Parcelable { * Sets the resource URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResUri(String resUri) { this.mResUri = resUri; } @@ -73,7 +74,7 @@ public class PresResInfo implements Parcelable { * Sets the display name. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisplayName(String displayName) { this.mDisplayName = displayName; } @@ -83,7 +84,7 @@ public class PresResInfo implements Parcelable { * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresResInfo() { mInstanceInfo = new PresResInstanceInfo(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java index 9f3725133452..733c0afff367 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource instance state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResInstanceState(int nResInstanceState) { this.mResInstanceState = nResInstanceState; } @@ -78,7 +79,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResId(String resourceId) { this.mId = resourceId; } @@ -97,7 +98,7 @@ public class PresResInstanceInfo implements Parcelable{ * code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReason(String reason) { this.mReason = reason; } @@ -114,7 +115,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the entity URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresentityUri(String presentityUri) { this.mPresentityUri = presentityUri; } @@ -131,7 +132,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the tuple information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setTupleInfo(PresTupleInfo[] tupleInfo) { this.mTupleInfoArray = new PresTupleInfo[tupleInfo.length]; this.mTupleInfoArray = tupleInfo; @@ -142,7 +143,7 @@ public class PresResInstanceInfo implements Parcelable{ * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresResInstanceInfo(){ }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java index 65b9fdbbeb18..e33aa1303886 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUri(String uri) { this.mUri = uri; } @@ -78,7 +79,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the version. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVersion(int version) { this.mVersion = version; } @@ -95,7 +96,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFullState(boolean fullState) { this.mFullState = fullState; } @@ -112,7 +113,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI list name. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setListName(String listName) { this.mListName = listName; } @@ -129,7 +130,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the subscription request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -146,7 +147,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresSubscriptionState(PresSubscriptionState presSubscriptionState) { this.mPresSubscriptionState = presSubscriptionState; } @@ -163,7 +164,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription expiration time. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSubscriptionExpireTime(int subscriptionExpireTime) { this.mSubscriptionExpireTime = subscriptionExpireTime; } @@ -180,7 +181,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription terminated reason. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSubscriptionTerminatedReason(String subscriptionTerminatedReason) { this.mSubscriptionTerminatedReason = subscriptionTerminatedReason; } @@ -189,7 +190,7 @@ public class PresRlmiInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresRlmiInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java index 5eafa0fde8cc..aed673e63d94 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -46,7 +47,7 @@ public class PresServiceInfo implements Parcelable { * Gets the media type. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getMediaType() { return mMediaCap; } @@ -63,7 +64,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceId() { return mServiceID; } @@ -79,7 +80,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service description. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceDesc() { return mServiceDesc; } @@ -96,7 +97,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service version. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceVer() { return mServiceVer; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java index 45b02f31eddc..9549152ce175 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +34,7 @@ public class PresSipResponse implements Parcelable { * Gets the Presence command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdId getCmdId() { return mCmdId; } @@ -42,7 +43,7 @@ public class PresSipResponse implements Parcelable { * Sets the Presence command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -51,7 +52,7 @@ public class PresSipResponse implements Parcelable { * Gets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRequestId() { return mRequestId; } @@ -60,7 +61,7 @@ public class PresSipResponse implements Parcelable { * Sets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -69,7 +70,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSipResponseCode() { return mSipResponseCode; } @@ -78,7 +79,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -89,7 +90,7 @@ public class PresSipResponse implements Parcelable { * code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getReasonPhrase() { return mReasonPhrase; } @@ -98,7 +99,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -107,7 +108,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP retryAfter sec value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRetryAfter() { return mRetryAfter; } @@ -116,7 +117,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -125,7 +126,7 @@ public class PresSipResponse implements Parcelable { * Constructor for the PresSipResponse class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresSipResponse(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java index ab1e17c48e75..85ec3967f8f3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -78,7 +79,7 @@ public class PresSubscriptionState implements Parcelable { * Constructor for the PresSubscriptionState class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresSubscriptionState() { }; /** @@ -94,7 +95,7 @@ public class PresSubscriptionState implements Parcelable { * Sets the Presence subscription state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresSubscriptionState(int nPresSubscriptionState) { this.mPresSubscriptionState = nPresSubscriptionState; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java index 3608eb6a5e8a..34a7b1e3de65 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +41,7 @@ public class PresTupleInfo implements Parcelable { * Sets the feature tag. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFeatureTag(String featureTag) { this.mFeatureTag = featureTag; } @@ -56,7 +57,7 @@ public class PresTupleInfo implements Parcelable { * Sets the contact URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setContactUri(String contactUri) { this.mContactUri = contactUri; } @@ -73,7 +74,7 @@ public class PresTupleInfo implements Parcelable { * Sets the timestamp. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setTimestamp(String timestamp) { this.mTimestamp = timestamp; } @@ -82,7 +83,7 @@ public class PresTupleInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresTupleInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl index 41abf7d1a1f0..2341faed3e15 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl @@ -25,6 +25,6 @@ interface IUceListener * @param serviceStatusValue defined in ImsUceManager * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStatus(int serviceStatusValue); } diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl index ec45371689cf..156e9229e256 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl @@ -38,7 +38,7 @@ interface IUceService * Service status is returned in setStatus callback in IUceListener. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startService(IUceListener uceListener); /** @@ -46,7 +46,7 @@ interface IUceService * @return boolean true if the service stop request is processed successfully, FALSE otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean stopService(); @@ -56,7 +56,7 @@ interface IUceService * @return boolean true if service started else false. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isServiceStarted(); /** @@ -74,7 +74,7 @@ interface IUceService * * @deprecated This is replaced with new API createOptionsServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int createOptionsService(IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); /** @@ -101,7 +101,7 @@ interface IUceService * in IOptionsListener * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void destroyOptionsService(int optionsServiceHandle); /** @@ -119,7 +119,7 @@ interface IUceService * * @deprecated This is replaced with new API createPresenceServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int createPresenceService(IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); /** @@ -147,7 +147,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void destroyPresenceService(int presenceServiceHdl); @@ -159,7 +159,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean getServiceStatus(); /** @@ -171,7 +171,7 @@ interface IUceService * * @deprecated use API getPresenceServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IPresenceService getPresenceService(); /** @@ -194,7 +194,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IOptionsService getOptionsService(); /** diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index be43e82c3f88..f690bd3477f0 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -26,6 +26,7 @@ import android.content.DialogInterface; import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.text.Layout; @@ -979,7 +980,7 @@ public class AlertController { boolean mRecycleOnMeasure = true; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RecycleListView(Context context) { this(context, null); } diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl index 04146bcad083..3a9f3b9c1128 100644 --- a/core/java/com/android/internal/app/IAppOpsService.aidl +++ b/core/java/com/android/internal/app/IAppOpsService.aidl @@ -89,7 +89,7 @@ interface IAppOpsService { void setUidMode(int code, int uid, int mode); @UnsupportedAppUsage void setMode(int code, int uid, String packageName, int mode); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void resetAllModes(int reqUserId, String reqPackageName); void setAudioRestriction(int code, int usage, int uid, int mode, in String[] exceptionPackages); diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index 6a0b443b7df8..e6a166140d89 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -55,7 +55,7 @@ interface IBatteryStats { ParcelFileDescriptor getStatisticsStream(); // Return true if we see the battery as currently charging. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isCharging(); // Return the computed amount of time remaining on battery, in milliseconds. @@ -64,7 +64,7 @@ interface IBatteryStats { // Return the computed amount of time remaining to fully charge, in milliseconds. // Returns -1 if nothing could be computed. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long computeChargeTimeRemaining(); void noteEvent(int code, String name, int uid); @@ -134,7 +134,7 @@ interface IBatteryStats { void noteDeviceIdleMode(int mode, String activeReason, int activeUid); void setBatteryState(int status, int health, int plugType, int level, int temp, int volt, int chargeUAh, int chargeFullUAh, long chargeTimeToFullSeconds); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long getAwakeTimeBattery(); long getAwakeTimePlugged(); diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index 49b4cd1e6a73..81c61aa0f250 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -61,7 +61,7 @@ interface IVoiceInteractionManagerService { * @param bcp47Locale The BCP47 language tag for the keyphrase's locale. * @RequiresPermission Manifest.permission.MANAGE_VOICE_KEYPHRASES */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) SoundTrigger.KeyphraseSoundModel getKeyphraseSoundModel(int keyphraseId, in String bcp47Locale); /** * Add/Update the given keyphrase sound model for the current user. diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 61a52bcc03f9..3e1fa1d5fe59 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -38,6 +38,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.metrics.LogMaker; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; @@ -64,7 +65,7 @@ import java.util.concurrent.Executors; * be passed in and out of a managed profile. */ public class IntentForwarderActivity extends Activity { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String TAG = "IntentForwarderActivity"; public static String FORWARD_INTENT_TO_PARENT diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 105e05a4a6c3..3c53d07b6180 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -27,6 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import android.os.Build; import android.os.Bundle; import android.os.LocaleList; import android.os.RemoteException; @@ -78,7 +79,7 @@ public class LocalePicker extends ListFragment { return label; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Locale getLocale() { return locale; } diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index 0cd12022e17d..8cab91aab512 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -32,6 +32,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.TypedValue; import android.view.ActionMode; import android.view.ContextThemeWrapper; @@ -80,11 +81,11 @@ public class WindowDecorActionBar extends ActionBar implements private ActionBarOverlayLayout mOverlayLayout; private ActionBarContainer mContainerView; private DecorToolbar mDecorToolbar; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ActionBarContextView mContextView; private ActionBarContainer mSplitView; private View mContentView; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScrollingTabContainerView mTabScrollView; private ArrayList mTabs = new ArrayList(); @@ -1149,7 +1150,7 @@ public class WindowDecorActionBar extends ActionBar implements * @hide */ public class TabImpl extends ActionBar.Tab { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ActionBar.TabListener mCallback; private Object mTag; private Drawable mIcon; diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index 1186dfe92906..2d68cb472fa3 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -42,7 +42,7 @@ interface IAppWidgetService { void deleteAppWidgetId(String callingPackage, int appWidgetId); void deleteHost(String packageName, int hostId); void deleteAllHosts(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getAppWidgetViews(String callingPackage, int appWidgetId); int[] getAppWidgetIdsForHost(String callingPackage, int hostId); IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, @@ -64,10 +64,10 @@ interface IAppWidgetService { AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId); boolean hasBindAppWidgetPermission(in String packageName, int userId); void setBindAppWidgetPermission(in String packageName, int userId, in boolean permission); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean bindAppWidgetId(in String callingPackage, int appWidgetId, int providerProfileId, in ComponentName providerComponent, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean bindRemoteViewsService(String callingPackage, int appWidgetId, in Intent intent, IApplicationThread caller, IBinder token, IServiceConnection connection, int flags); diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 140c410e8de6..7b6df6c7118a 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -63,7 +63,7 @@ public class MetricsLogger { public static final int LOGTAG = EventLogTags.SYSUI_MULTI_ACTION; /** Write an event log record, consisting of content.serialize(). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void write(LogMaker content) { if (content.getType() == MetricsEvent.TYPE_UNKNOWN) { content.setType(MetricsEvent.TYPE_ACTION); diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index b4727499d8ef..a17f5f5f8910 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -236,7 +236,7 @@ public final class VpnProfile implements Cloneable, Parcelable { * *

See {@link #encode()} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static VpnProfile decode(String key, byte[] value) { try { if (key == null) { diff --git a/core/java/com/android/internal/os/BaseCommand.java b/core/java/com/android/internal/os/BaseCommand.java index 32442f0472bb..c110b263e781 100644 --- a/core/java/com/android/internal/os/BaseCommand.java +++ b/core/java/com/android/internal/os/BaseCommand.java @@ -19,12 +19,13 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BasicShellCommandHandler; +import android.os.Build; import java.io.PrintStream; public abstract class BaseCommand { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final protected BasicShellCommandHandler mArgs = new BasicShellCommandHandler() { @Override public int onCommand(String cmd) { return 0; @@ -40,7 +41,7 @@ public abstract class BaseCommand { private String[] mRawArgs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BaseCommand() { } diff --git a/core/java/com/android/internal/os/BatterySipper.java b/core/java/com/android/internal/os/BatterySipper.java index 2620ba0749a9..5337ac3cc27e 100644 --- a/core/java/com/android/internal/os/BatterySipper.java +++ b/core/java/com/android/internal/os/BatterySipper.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BatteryStats.Uid; +import android.os.Build; import java.util.List; @@ -120,7 +121,7 @@ public class BatterySipper implements Comparable { public double audioPowerMah; public double bluetoothPowerMah; public double cameraPowerMah; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public double cpuPowerMah; public double flashlightPowerMah; public double gpsPowerMah; diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java index 3dfa3c3f6906..92dd4dda39df 100644 --- a/core/java/com/android/internal/os/BatteryStatsHelper.java +++ b/core/java/com/android/internal/os/BatteryStatsHelper.java @@ -26,6 +26,7 @@ import android.hardware.SensorManager; import android.net.ConnectivityManager; import android.os.BatteryStats; import android.os.BatteryStats.Uid; +import android.os.Build; import android.os.Bundle; import android.os.MemoryFile; import android.os.Parcel; @@ -272,7 +273,7 @@ public class BatteryStatsHelper { return mStats; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Intent getBatteryBroadcast() { if (mBatteryBroadcast == null && mCollectBatteryBroadcast) { load(); @@ -361,7 +362,7 @@ public class BatteryStatsHelper { /** * Refreshes the power usage list. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void refreshStats(int statsType, SparseArray asUsers) { refreshStats(statsType, asUsers, SystemClock.elapsedRealtime() * 1000, SystemClock.uptimeMillis() * 1000); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index b986463a62f7..e7e75a84643b 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -13558,7 +13558,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDischargeStartLevel() { synchronized(this) { return getDischargeStartLevelLocked(); @@ -13570,7 +13570,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDischargeCurrentLevel() { synchronized(this) { return getDischargeCurrentLevelLocked(); diff --git a/core/java/com/android/internal/os/ClassLoaderFactory.java b/core/java/com/android/internal/os/ClassLoaderFactory.java index f83c5bdc4e28..d347f2e21dd2 100644 --- a/core/java/com/android/internal/os/ClassLoaderFactory.java +++ b/core/java/com/android/internal/os/ClassLoaderFactory.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Trace; import dalvik.system.DelegateLastClassLoader; @@ -139,7 +140,7 @@ public class ClassLoaderFactory { return classLoader; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native String createClassloaderNamespace(ClassLoader classLoader, int targetSdkVersion, String librarySearchPath, diff --git a/core/java/com/android/internal/os/FuseAppLoop.java b/core/java/com/android/internal/os/FuseAppLoop.java index 2393036b5a38..1c6c6a73b44d 100644 --- a/core/java/com/android/internal/os/FuseAppLoop.java +++ b/core/java/com/android/internal/os/FuseAppLoop.java @@ -19,6 +19,7 @@ package com.android.internal.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.ParcelFileDescriptor; @@ -230,7 +231,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void onCommand(int command, long unique, long inode, long offset, int size, byte[] data) { synchronized (mLock) { @@ -259,7 +260,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] onOpen(long unique, long inode) { synchronized (mLock) { try { diff --git a/core/java/com/android/internal/os/ProcessCpuTracker.java b/core/java/com/android/internal/os/ProcessCpuTracker.java index 8e0546e6a86c..6d5cb67352b3 100644 --- a/core/java/com/android/internal/os/ProcessCpuTracker.java +++ b/core/java/com/android/internal/os/ProcessCpuTracker.java @@ -24,6 +24,7 @@ import static android.os.Process.PROC_PARENS; import static android.os.Process.PROC_SPACE_TERM; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.CpuUsageProto; import android.os.Process; import android.os.StrictMode; @@ -200,7 +201,7 @@ public class ProcessCpuTracker { public boolean interesting; public String baseName; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String name; public int nameWidth; @@ -216,7 +217,7 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rel_uptime; /** @@ -232,13 +233,13 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int rel_utime; /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int rel_stime; public long base_minfaults; @@ -732,13 +733,13 @@ public class ProcessCpuTracker { return statses; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final public int countWorkingStats() { buildWorkingProcs(); return mWorkingProcs.size(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final public Stats getWorkingStats(int index) { return mWorkingProcs.get(index); } diff --git a/core/java/com/android/internal/os/SomeArgs.java b/core/java/com/android/internal/os/SomeArgs.java index 003f61079dcf..5ec882cee3c8 100644 --- a/core/java/com/android/internal/os/SomeArgs.java +++ b/core/java/com/android/internal/os/SomeArgs.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Helper class for passing more arguments though a message @@ -42,11 +43,11 @@ public final class SomeArgs { static final int WAIT_FINISHED = 2; int mWaitState = WAIT_NONE; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg3; public Object arg4; public Object arg5; @@ -55,9 +56,9 @@ public final class SomeArgs { public Object arg8; public Object arg9; public int argi1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int argi2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int argi3; public int argi4; public int argi5; @@ -67,7 +68,7 @@ public final class SomeArgs { /* do nothing - reduce visibility */ } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SomeArgs obtain() { synchronized (sPoolLock) { if (sPoolSize > 0) { @@ -93,7 +94,7 @@ public final class SomeArgs { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void recycle() { if (mInPool) { throw new IllegalStateException("Already recycled."); diff --git a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 313bd42fe8c1..a28a66376497 100644 --- a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -51,7 +51,7 @@ interface ITelephonyRegistry { boolean notifyNow); void listenForSubscriber(in int subId, String pkg, String featureId, IPhoneStateListener callback, long events, boolean notifyNow); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void notifyCallStateForAllSubs(int state, String incomingNumber); void notifyCallState(in int phoneId, in int subId, int state, String incomingNumber); void notifyServiceStateForPhoneId(in int phoneId, in int subId, in ServiceState state); diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java index c6dea18d77d1..5571a58a8999 100644 --- a/core/java/com/android/internal/util/ArrayUtils.java +++ b/core/java/com/android/internal/util/ArrayUtils.java @@ -19,6 +19,7 @@ package com.android.internal.util; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.ArraySet; import dalvik.system.VMRuntime; @@ -56,7 +57,7 @@ public class ArrayUtils { return (char[])VMRuntime.getRuntime().newUnpaddedArray(char.class, minLen); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int[] newUnpaddedIntArray(int minLen) { return (int[])VMRuntime.getRuntime().newUnpaddedArray(int.class, minLen); } @@ -77,7 +78,7 @@ public class ArrayUtils { return (Object[])VMRuntime.getRuntime().newUnpaddedArray(Object.class, minLen); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static T[] newUnpaddedArray(Class clazz, int minLen) { return (T[])VMRuntime.getRuntime().newUnpaddedArray(clazz, minLen); @@ -386,7 +387,7 @@ public class ArrayUtils { * Adds value to given array if not already present, providing set-like * behavior. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static @NonNull T[] appendElement(Class kind, @Nullable T[] array, T element) { return appendElement(kind, array, element, false); @@ -416,7 +417,7 @@ public class ArrayUtils { /** * Removes value from given array if present, providing set-like behavior. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static @Nullable T[] removeElement(Class kind, @Nullable T[] array, T element) { if (array != null) { diff --git a/core/java/com/android/internal/util/AsyncChannel.java b/core/java/com/android/internal/util/AsyncChannel.java index 7e3c171abfa6..0e8c92991b66 100644 --- a/core/java/com/android/internal/util/AsyncChannel.java +++ b/core/java/com/android/internal/util/AsyncChannel.java @@ -401,7 +401,7 @@ public class AsyncChannel { * @param srcHandler * @param dstMessenger */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void connected(Context srcContext, Handler srcHandler, Messenger dstMessenger) { if (DBG) log("connected srcHandler to the dstMessenger E"); @@ -514,7 +514,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -606,7 +606,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -639,7 +639,7 @@ public class AsyncChannel { * @param arg2 * @param obj */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, int arg1, int arg2, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -656,7 +656,7 @@ public class AsyncChannel { * @param what * @param obj */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -670,7 +670,7 @@ public class AsyncChannel { * @param msg to send * @return reply message or null if an error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Message sendMessageSynchronously(Message msg) { Message resultMsg = SyncMessenger.sendMessageSynchronously(mDstMessenger, msg); return resultMsg; @@ -712,7 +712,7 @@ public class AsyncChannel { * @param arg2 * @return reply message or null if an error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Message sendMessageSynchronously(int what, int arg1, int arg2) { Message msg = Message.obtain(); msg.what = what; diff --git a/core/java/com/android/internal/util/GrowingArrayUtils.java b/core/java/com/android/internal/util/GrowingArrayUtils.java index 597fe6b53d11..8c12e36a27d1 100644 --- a/core/java/com/android/internal/util/GrowingArrayUtils.java +++ b/core/java/com/android/internal/util/GrowingArrayUtils.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A helper class that aims to provide comparable growth performance to ArrayList, but on primitive @@ -39,7 +40,7 @@ public final class GrowingArrayUtils { * @return the array to which the element was appended. This may be different than the given * array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static T[] append(T[] array, int currentSize, T element) { assert currentSize <= array.length; @@ -57,7 +58,7 @@ public final class GrowingArrayUtils { /** * Primitive int version of {@link #append(Object[], int, Object)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int[] append(int[] array, int currentSize, int element) { assert currentSize <= array.length; diff --git a/core/java/com/android/internal/util/HexDump.java b/core/java/com/android/internal/util/HexDump.java index ad88dd6deec6..6468cafe85d4 100644 --- a/core/java/com/android/internal/util/HexDump.java +++ b/core/java/com/android/internal/util/HexDump.java @@ -107,7 +107,7 @@ public class HexDump return toHexString(array, 0, array.length, true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) public static String toHexString(byte[] array, boolean upperCase) { return toHexString(array, 0, array.length, upperCase); diff --git a/core/java/com/android/internal/util/IndentingPrintWriter.java b/core/java/com/android/internal/util/IndentingPrintWriter.java index 2435afb61083..520f5184260a 100644 --- a/core/java/com/android/internal/util/IndentingPrintWriter.java +++ b/core/java/com/android/internal/util/IndentingPrintWriter.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.Writer; @@ -26,7 +27,7 @@ import java.io.Writer; @Deprecated public class IndentingPrintWriter extends android.util.IndentingPrintWriter { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter(Writer writer, String singleIndent) { super(writer, singleIndent, -1); } @@ -49,13 +50,13 @@ public class IndentingPrintWriter extends android.util.IndentingPrintWriter { return this; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter increaseIndent() { super.increaseIndent(); return this; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter decreaseIndent() { super.decreaseIndent(); return this; diff --git a/core/java/com/android/internal/util/MemInfoReader.java b/core/java/com/android/internal/util/MemInfoReader.java index 5de77d9b0545..0c5c8537e85a 100644 --- a/core/java/com/android/internal/util/MemInfoReader.java +++ b/core/java/com/android/internal/util/MemInfoReader.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Debug; import android.os.StrictMode; @@ -51,7 +52,7 @@ public final class MemInfoReader { /** * Amount of RAM that is not being used for anything. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getFreeSize() { return mInfos[Debug.MEMINFO_FREE] * 1024; } @@ -60,7 +61,7 @@ public final class MemInfoReader { * Amount of RAM that the kernel is being used for caches, not counting caches * that are mapped in to processes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedSize() { return getCachedSizeKb() * 1024; } diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java index 4d441cd98a96..88e4e355000a 100644 --- a/core/java/com/android/internal/util/Preconditions.java +++ b/core/java/com/android/internal/util/Preconditions.java @@ -19,6 +19,7 @@ package com.android.internal.util; import android.annotation.IntRange; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.text.TextUtils; import java.util.Arrays; @@ -52,7 +53,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalArgumentException if {@code expression} is false */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void checkArgument(boolean expression, final Object errorMessage) { if (!expression) { throw new IllegalArgumentException(String.valueOf(errorMessage)); @@ -208,7 +209,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalStateException if {@code expression} is false */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void checkState(final boolean expression, String errorMessage) { if (!expression) { throw new IllegalStateException(errorMessage); @@ -518,7 +519,7 @@ public class Preconditions { * * @throws IllegalArgumentException if {@code value} was not within the range */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int checkArgumentInRange(int value, int lower, int upper, String valueName) { if (value < lower) { diff --git a/core/java/com/android/internal/util/State.java b/core/java/com/android/internal/util/State.java index 636378e32091..4613dad8cc67 100644 --- a/core/java/com/android/internal/util/State.java +++ b/core/java/com/android/internal/util/State.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; /** @@ -44,7 +45,7 @@ public class State implements IState { /* (non-Javadoc) * @see com.android.internal.util.IState#exit() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public void exit() { } diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java index 7a79cc9ef868..4cff785cd671 100644 --- a/core/java/com/android/internal/util/StateMachine.java +++ b/core/java/com/android/internal/util/StateMachine.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -1324,7 +1325,7 @@ public class StateMachine { * * @param name of the state machine */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected StateMachine(String name, Handler handler) { initStateMachine(name, handler.getLooper()); } @@ -1357,7 +1358,7 @@ public class StateMachine { * Add a new state to the state machine, parent will be null * @param state to add */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void addState(State state) { mSmHandler.addState(state, null); } @@ -1376,7 +1377,7 @@ public class StateMachine { * * @param initialState is the state which will receive the first message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void setInitialState(State initialState) { mSmHandler.setInitialState(initialState); } @@ -1415,7 +1416,7 @@ public class StateMachine { * * @param destState will be the state that receives the next message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void transitionTo(IState destState) { mSmHandler.transitionTo(destState); } @@ -1700,7 +1701,7 @@ public class StateMachine { * @param obj is assigned to Message.obj * @return A Message object from the global pool */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Message obtainMessage(int what, int arg1, int arg2, Object obj) { return Message.obtain(mSmHandler, what, arg1, arg2, obj); } @@ -1738,7 +1739,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -1765,7 +1766,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1, int arg2, Object obj) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2066,7 +2067,7 @@ public class StateMachine { /** * Start the state machine. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void start() { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2083,7 +2084,7 @@ public class StateMachine { * @param pw * @param args */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(getName() + ":"); pw.println(" total records=" + getLogRecCount()); diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index cd5502c9f270..33ebe43cb23a 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -82,7 +82,7 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { private Looper mMainLooper; private Handler mH; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Object mLock = new Object(); @GuardedBy("mLock") private boolean mFinished = false; diff --git a/core/java/com/android/internal/view/menu/ActionMenu.java b/core/java/com/android/internal/view/menu/ActionMenu.java index 648262965ab1..c699ca193f2b 100644 --- a/core/java/com/android/internal/view/menu/ActionMenu.java +++ b/core/java/com/android/internal/view/menu/ActionMenu.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.Build; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -40,7 +41,7 @@ public class ActionMenu implements Menu { private ArrayList mItems; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionMenu(Context context) { mContext = context; mItems = new ArrayList(); diff --git a/core/java/com/android/internal/view/menu/ActionMenuItem.java b/core/java/com/android/internal/view/menu/ActionMenuItem.java index bd8bcb9cf81e..acb233e39cc8 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItem.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItem.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.os.Build; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; @@ -70,7 +71,7 @@ public class ActionMenuItem implements MenuItem { private static final int HIDDEN = 0x00000008; private static final int ENABLED = 0x00000010; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionMenuItem(Context context, int group, int id, int categoryOrder, int ordering, CharSequence title) { mContext = context; diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java index 7622b939b6eb..61536e8960e2 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcelable; import android.text.TextUtils; import android.util.AttributeSet; @@ -225,7 +226,7 @@ public class ActionMenuItemView extends TextView updateTextButtonVisibility(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasText() { return !TextUtils.isEmpty(getText()); } diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java index b31ae38b4566..0b490b20df0e 100644 --- a/core/java/com/android/internal/view/menu/MenuBuilder.java +++ b/core/java/com/android/internal/view/menu/MenuBuilder.java @@ -27,6 +27,7 @@ import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.SparseArray; @@ -210,7 +211,7 @@ public class MenuBuilder implements Menu { setShortcutsVisibleInner(true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuBuilder setDefaultShowAsAction(int defaultShowAsAction) { mDefaultShowAsAction = defaultShowAsAction; return this; @@ -223,7 +224,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to add */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addMenuPresenter(MenuPresenter presenter) { addMenuPresenter(presenter, mContext); } @@ -250,7 +251,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to remove */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeMenuPresenter(MenuPresenter presenter) { for (WeakReference ref : mPresenters) { final MenuPresenter item = ref.get(); @@ -1015,7 +1016,7 @@ public class MenuBuilder implements Menu { * {@link #startDispatchingItemsChanged()} is called. Useful when * many menu operations are going to be performed as a batch. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void stopDispatchingItemsChanged() { if (!mPreventDispatchingItemsChanged) { mPreventDispatchingItemsChanged = true; @@ -1023,7 +1024,7 @@ public class MenuBuilder implements Menu { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startDispatchingItemsChanged() { mPreventDispatchingItemsChanged = false; @@ -1145,7 +1146,7 @@ public class MenuBuilder implements Menu { return mActionItems; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getNonActionItems() { flagActionItems(); return mNonActionItems; diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 218f5185ec47..2452398a5348 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -25,6 +25,7 @@ import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.Log; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; @@ -662,17 +663,17 @@ public final class MenuItemImpl implements MenuItem { return mMenu.getOptionalIconsVisible(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isActionButton() { return (mFlags & IS_ACTION) == IS_ACTION; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean requestsActionButton() { return (mShowAsAction & SHOW_AS_ACTION_IF_ROOM) == SHOW_AS_ACTION_IF_ROOM; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean requiresActionButton() { return (mShowAsAction & SHOW_AS_ACTION_ALWAYS) == SHOW_AS_ACTION_ALWAYS; } diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index 980943ebea5a..c266d0218b31 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -23,6 +23,7 @@ import android.annotation.StyleRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -47,14 +48,14 @@ public class MenuPopupHelper implements MenuHelper { // Mutable cached popup menu properties. private View mAnchorView; private int mDropDownGravity = Gravity.START; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mForceShowIcon; private Callback mPresenterCallback; private MenuPopup mPopup; private OnDismissListener mOnDismissListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu) { this(context, menu, null, false, com.android.internal.R.attr.popupMenuStyle, 0); } @@ -93,7 +94,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param anchor the view to which the popup window should be anchored */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAnchorView(@NonNull View anchor) { mAnchorView = anchor; } @@ -125,7 +126,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param gravity alignment of the popup relative to the anchor */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGravity(int gravity) { mDropDownGravity = gravity; } @@ -151,7 +152,7 @@ public class MenuPopupHelper implements MenuHelper { } @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuPopup getPopup() { if (mPopup == null) { mPopup = createPopup(); @@ -165,7 +166,7 @@ public class MenuPopupHelper implements MenuHelper { * @return {@code true} if the popup was shown or was already showing prior to calling this * method, {@code false} otherwise */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean tryShow() { if (isShowing()) { return true; diff --git a/core/java/com/android/internal/view/menu/MenuPresenter.java b/core/java/com/android/internal/view/menu/MenuPresenter.java index 35b8fefe75ab..37155b9ff7fe 100644 --- a/core/java/com/android/internal/view/menu/MenuPresenter.java +++ b/core/java/com/android/internal/view/menu/MenuPresenter.java @@ -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.Parcelable; import android.view.ViewGroup; @@ -48,7 +49,7 @@ public interface MenuPresenter { * @return true if the Callback will handle presenting the submenu, false if * the presenter should attempt to do so. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean onOpenSubMenu(MenuBuilder subMenu); } diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java index 0f0c1a3de3a2..914de6102fef 100644 --- a/core/java/com/android/internal/widget/AbsActionBarView.java +++ b/core/java/com/android/internal/widget/AbsActionBarView.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.ContextThemeWrapper; @@ -294,7 +295,7 @@ public abstract class AbsActionBarView extends ViewGroup { return isOverflowReserved() && getVisibility() == VISIBLE; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dismissPopupMenus() { if (mActionMenuPresenter != null) { mActionMenuPresenter.dismissPopupMenus(); diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 051526ef2da7..80fc218839d5 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java @@ -19,6 +19,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ActionMode; @@ -58,7 +59,7 @@ public class ActionBarContextView extends AbsActionBarView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionBarContextView(Context context, AttributeSet attrs) { this(context, attrs, com.android.internal.R.attr.actionModeStyle); } diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index aca0b713686f..adbf645de74e 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -170,7 +170,7 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar init(context); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionBarOverlayLayout(Context context, AttributeSet attrs) { super(context, attrs); init(context); diff --git a/core/java/com/android/internal/widget/CachingIconView.java b/core/java/com/android/internal/widget/CachingIconView.java index 0bf323f8f493..4a70f7416075 100644 --- a/core/java/com/android/internal/widget/CachingIconView.java +++ b/core/java/com/android/internal/widget/CachingIconView.java @@ -28,6 +28,7 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.RemotableViewMethod; @@ -54,7 +55,7 @@ public class CachingIconView extends ImageView { private int mBackgroundColor; private boolean mWillBeForceHidden; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CachingIconView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); } diff --git a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl index d6efca5d36eb..c06dab9f75d6 100644 --- a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl +++ b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl @@ -21,23 +21,23 @@ import android.widget.RemoteViews; /** {@hide} */ interface IRemoteViewsFactory { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onDataSetChanged(); oneway void onDataSetChangedAsync(); oneway void onDestroy(in Intent intent); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCount(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getViewAt(int position); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getLoadingView(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getViewTypeCount(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long getItemId(int position); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean hasStableIds(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isCreated(); } diff --git a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java index 9ef9f697c46c..f230ddb8b5ea 100644 --- a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java +++ b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -46,7 +47,7 @@ public class LinearLayoutWithDefaultTouchRecepient extends LinearLayout { super(context, attrs); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDefaultTouchRecepient(View defaultTouchRecepient) { mDefaultTouchRecepient = defaultTouchRecepient; } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index c0c7f100ef21..b562ef838633 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -35,6 +35,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.UserInfo; import android.os.AsyncTask; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -729,13 +730,13 @@ public class LockPatternUtils { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOwnerInfo(String info, int userId) { setString(LOCK_SCREEN_OWNER_INFO, info, userId); updateCryptoUserInfo(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOwnerInfoEnabled(boolean enabled, int userId) { setBoolean(LOCK_SCREEN_OWNER_INFO_ENABLED, enabled, userId); updateCryptoUserInfo(userId); @@ -1113,7 +1114,7 @@ public class LockPatternUtils { return type != CREDENTIAL_TYPE_NONE; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isLockPasswordEnabled(int userId) { int type = getCredentialTypeForUser(userId); return type == CREDENTIAL_TYPE_PASSWORD || type == CREDENTIAL_TYPE_PIN; diff --git a/core/java/com/android/internal/widget/NumericTextView.java b/core/java/com/android/internal/widget/NumericTextView.java index c8f901133be6..e6cb24de9f94 100644 --- a/core/java/com/android/internal/widget/NumericTextView.java +++ b/core/java/com/android/internal/widget/NumericTextView.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; import android.view.KeyEvent; @@ -54,7 +55,7 @@ public class NumericTextView extends TextView { private OnValueChangedListener mListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NumericTextView(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/core/java/com/android/internal/widget/PreferenceImageView.java b/core/java/com/android/internal/widget/PreferenceImageView.java index 43b6b5a169c5..0ca98cfbdfb8 100644 --- a/core/java/com/android/internal/widget/PreferenceImageView.java +++ b/core/java/com/android/internal/widget/PreferenceImageView.java @@ -18,6 +18,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.widget.ImageView; @@ -30,7 +31,7 @@ public class PreferenceImageView extends ImageView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PreferenceImageView(Context context, AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/com/android/internal/widget/RecyclerView.java b/core/java/com/android/internal/widget/RecyclerView.java index d7a01c4762f1..fd9e43081d10 100644 --- a/core/java/com/android/internal/widget/RecyclerView.java +++ b/core/java/com/android/internal/widget/RecyclerView.java @@ -4968,7 +4968,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro * constructed by {@link GapWorker} prefetch from being bound to a lower priority prefetch. */ static class ScrapData { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ArrayList mScrapHeap = new ArrayList<>(); int mMaxScrap = DEFAULT_MAX_SCRAP; long mCreateRunningAverageNs = 0; diff --git a/core/java/com/android/internal/widget/ScrollBarUtils.java b/core/java/com/android/internal/widget/ScrollBarUtils.java index 3e9d697a0ace..0108bd4a27cf 100644 --- a/core/java/com/android/internal/widget/ScrollBarUtils.java +++ b/core/java/com/android/internal/widget/ScrollBarUtils.java @@ -17,10 +17,11 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class ScrollBarUtils { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getThumbLength(int size, int thickness, int extent, int range) { // Avoid the tiny thumb. final int minLength = thickness * 2; diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index aa0b0bbd4c19..d3029676cbb2 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.TextUtils; import android.text.TextUtils.TruncateAt; import android.view.Gravity; @@ -224,7 +225,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView mStackedTabMaxWidth = abp.getStackedTabMaxWidth(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void animateToVisibility(int visibility) { if (mVisibilityAnim != null) { mVisibilityAnim.cancel(); @@ -249,7 +250,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void animateToTab(final int position) { final View tabView = mTabLayout.getChildAt(position); if (mTabSelector != null) { @@ -331,7 +332,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void updateTab(int position) { ((TabView) mTabLayout.getChildAt(position)).update(); if (mTabSpinner != null) { diff --git a/core/java/com/android/server/net/NetlinkTracker.java b/core/java/com/android/server/net/NetlinkTracker.java index b57397f46a7e..197984fc7dcd 100644 --- a/core/java/com/android/server/net/NetlinkTracker.java +++ b/core/java/com/android/server/net/NetlinkTracker.java @@ -20,6 +20,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.RouteInfo; +import android.os.Build; import android.util.Log; import java.net.InetAddress; @@ -80,7 +81,7 @@ public class NetlinkTracker extends BaseNetworkObserver { private static final boolean DBG = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetlinkTracker(String iface, Callback callback) { TAG = "NetlinkTracker/" + iface; mInterfaceName = iface; @@ -189,12 +190,12 @@ public class NetlinkTracker extends BaseNetworkObserver { /** * Returns a copy of this object's LinkProperties. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public synchronized LinkProperties getLinkProperties() { return new LinkProperties(mLinkProperties); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public synchronized void clearLinkProperties() { // Clear the repository before clearing mLinkProperties. That way, if a clear() happens // while interfaceDnsServerInfo() is being called, we'll end up with no DNS servers in diff --git a/core/java/com/google/android/collect/Sets.java b/core/java/com/google/android/collect/Sets.java index c67a88a19080..e2429157d529 100644 --- a/core/java/com/google/android/collect/Sets.java +++ b/core/java/com/google/android/collect/Sets.java @@ -17,6 +17,7 @@ package com.google.android.collect; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.ArraySet; import java.util.Collections; @@ -107,7 +108,7 @@ public class Sets { /** * Creates a {@code ArraySet} instance containing the given elements. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ArraySet newArraySet(E... elements) { int capacity = elements.length * 4 / 3 + 1; ArraySet set = new ArraySet(capacity); diff --git a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java index e1fe1bdbdd5f..25091263b2b0 100644 --- a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -182,7 +182,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { private final SSLContext sslcontext; @UnsupportedAppUsage private final javax.net.ssl.SSLSocketFactory socketfactory; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final HostNameResolver nameResolver; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; @@ -262,7 +262,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { this.nameResolver = null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static KeyManager[] createKeyManagers(final KeyStore keystore, final String password) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException { if (keystore == null) { @@ -274,7 +274,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { return kmfactory.getKeyManagers(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static TrustManager[] createTrustManagers(final KeyStore keystore) throws KeyStoreException, NoSuchAlgorithmException { if (keystore == null) { diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 4f95a53e0ec8..055e5ad17def 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -80,7 +80,7 @@ public final class Bitmap implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123769491) private byte[] mNinePatchChunk; // may be null - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NinePatch.InsetStruct mNinePatchInsets; // may be null @UnsupportedAppUsage private int mWidth; @@ -176,7 +176,7 @@ public final class Bitmap implements Parcelable { * width/height values */ @SuppressWarnings("unused") // called from JNI - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void reinit(int width, int height, boolean requestPremultiplied) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index bad487b47682..ef1e7bfc6651 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Trace; import android.util.DisplayMetrics; import android.util.Log; @@ -875,7 +876,7 @@ public class BitmapFactory { @UnsupportedAppUsage private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); @UnsupportedAppUsage diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 829d0f4be513..42e6ab9c830c 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1355,7 +1355,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1379,7 +1379,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index 4263772c1c2c..e949584b0659 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -17,6 +17,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.VirtualRefBasePtr; @@ -28,12 +29,12 @@ public final class CanvasProperty { private VirtualRefBasePtr mProperty; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createFloat(float initialValue) { return new CanvasProperty(nCreateFloat(initialValue)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createPaint(Paint initialValue) { return new CanvasProperty(nCreatePaint(initialValue.getNativeInstance())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index a8b18a9fcb1f..90ff1899f34d 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that transforms colors through a 4x5 color matrix. This filter @@ -107,7 +108,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMatrixArray(@Nullable float[] array) { // called '...Array' so that passing null isn't ambiguous discardNativeInstance(); diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index c146bbd4441b..0782f8dfd9d3 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; +import android.os.Build; import android.text.FontConfig; import android.util.Xml; @@ -38,7 +39,7 @@ import java.util.regex.Pattern; public class FontListParser { /* Parse fallback list (no names) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static FontConfig parse(InputStream in) throws XmlPullParserException, IOException { return parse(in, "/system/fonts"); } diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index 2c25f4546771..f9113a21405c 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.HardwareBuffer; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +56,7 @@ public class GraphicBuffer implements Parcelable { private final int mFormat; private final int mUsage; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final long mNativeObject; // These two fields are only used by lock/unlockCanvas() @@ -87,7 +88,7 @@ public class GraphicBuffer implements Parcelable { /** * Private use only. See {@link #create(int, int, int, int)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index 221dfa192795..df91c5d492bd 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -23,6 +23,7 @@ package android.graphics; import android.annotation.ColorInt; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to simulate simple lighting effects. @@ -73,7 +74,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMultiply(@ColorInt int mul) { if (mMul != mul) { mMul = mul; @@ -99,7 +100,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorAdd(@ColorInt int add) { if (mAdd != add) { mAdd = add; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index ebe34cad0654..4eedbf563865 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -21,20 +21,21 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class LinearGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. @@ -44,7 +45,7 @@ public class LinearGradient extends Shader { @UnsupportedAppUsage @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index 4b3924f0d55f..9c9535d16aab 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -28,7 +28,7 @@ import java.io.InputStream; */ @Deprecated public class Movie { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeMovie; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index a191fe56b31d..4b6e4d124b48 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -53,7 +53,7 @@ import java.util.Locale; */ public class Paint { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 7811671b80d6..e5ef10d1d555 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -48,12 +49,12 @@ public class Path { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSimplePath = true; /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 50ecb62e7fcc..0700f217ecf0 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to tint the source pixels using a single @@ -64,7 +65,7 @@ public class PorterDuffColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PorterDuff.Mode getMode() { return mMode; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index 864331a9674e..dd1be1570d79 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -22,17 +22,18 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class RadialGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mRadius; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; private final float mFocalX; @@ -40,13 +41,13 @@ public class RadialGradient extends Shader { private final float mFocalRadius; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mCenterColor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mEdgeColor; diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index 43373ffbd3f4..29708738d2db 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Pools.SynchronizedPool; @@ -32,7 +33,7 @@ public class Region implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long mNativeRegion; // the native values for these must match up with the enum in SkRegion.h @@ -337,7 +338,7 @@ public class Region implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void recycle() { setEmpty(); sPool.release(this); @@ -411,7 +412,7 @@ public class Region implements Parcelable { /* Add an unused parameter so constructor can be called from jni without triggering 'not cloneable' exception */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Region(long ni, int unused) { this(ni); } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 228d03a1dd10..7a2e5843ffc7 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -69,17 +70,17 @@ import java.lang.ref.WeakReference; */ public class SurfaceTexture { private final Looper mCreatorLooper; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Handler mOnFrameAvailableHandler; /** * These fields are used by native code, do not access or modify. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mSurfaceTexture; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mProducer; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mFrameAvailableListener; private boolean mIsSingleBuffered; @@ -390,7 +391,7 @@ public class SurfaceTexture { * This method is invoked from native code only. */ @SuppressWarnings({"UnusedDeclaration"}) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(WeakReference weakSelf) { SurfaceTexture st = weakSelf.get(); if (st != null) { diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index f1ca1986bfa0..22807805e7fa 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -21,23 +21,24 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class SweepGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCx; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCy; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index ecb0ff43a9e2..b143be7b4d6a 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -1217,7 +1217,7 @@ public class Typeface { long native_instance, List axes); @UnsupportedAppUsage private static native long nativeCreateWeightAlias(long native_instance, int weight); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index e79fb76d806e..81769e2e21bf 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -22,6 +22,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Xfermode is the base class for objects that are called to implement custom @@ -32,6 +33,6 @@ import android.compat.annotation.UnsupportedAppUsage; */ public class Xfermode { static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int porterDuffMode = DEFAULT; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 06159d8a0558..33a6d38b698d 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -561,9 +561,9 @@ public class AnimatedStateListDrawable extends StateListDrawable { int[] mAnimThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) LongSparseLongArray mTransitions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SparseIntArray mStateIds; AnimatedStateListState(@Nullable AnimatedStateListState orig, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 73dbe65bd25b..33b09b8831ce 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -315,7 +315,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -1773,7 +1773,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } // onFinished: should be called from native - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void callOnFinished(VectorDrawableAnimatorRT set, int id) { set.mHandler.post(() -> set.onAnimationEnd(id)); } diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 2457ab85144f..f8dc61526ce6 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.view.ViewDebug; @@ -53,7 +54,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index ed210ab40b7a..28b3b04b827d 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -45,6 +45,7 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Region; import android.graphics.Xfermode; +import android.os.Build; import android.os.Trace; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -1715,7 +1716,7 @@ public abstract class Drawable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static BlendMode parseBlendMode(int value, BlendMode defaultMode) { switch (value) { case 3: return BlendMode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index 3408b64e7536..66752a2536d3 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.Theme; +import android.os.Build; import android.util.AttributeSet; import android.view.InflateException; @@ -50,7 +51,7 @@ public final class DrawableInflater { new HashMap<>(); private final Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ClassLoader mClassLoader; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index 98c38214adab..ebde75775e84 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -32,6 +32,7 @@ import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; @@ -47,7 +48,7 @@ import java.io.IOException; * Drawable container with only one child element. */ public abstract class DrawableWrapper extends Drawable implements Drawable.Callback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DrawableWrapperState mState; private Drawable mDrawable; private boolean mMutated; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index abf0e8a1fe89..32b310353b6c 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -170,7 +170,7 @@ public final class Icon implements Parcelable { * @return The length of the compressed bitmap byte array held by this {@link #TYPE_DATA} Icon. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDataLength() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataLength() on " + this); @@ -599,7 +599,7 @@ public final class Icon implements Parcelable { * Version of createWithResource that takes Resources. Do not use. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Icon createWithResource(Resources res, @DrawableRes int resId) { if (res == null) { throw new IllegalArgumentException("Resource must not be null."); @@ -771,7 +771,7 @@ public final class Icon implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasTint() { return (mTintList != null) || (mBlendMode != DEFAULT_BLEND_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 005a4d175fd5..87c0a061c9f2 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -27,6 +27,7 @@ import android.graphics.Insets; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -58,7 +59,7 @@ public class InsetDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); private final Rect mTmpInsetRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private InsetState mState; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 19f29aed203f..a03f8b566ddd 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -30,6 +30,7 @@ import android.graphics.ColorFilter; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.LayoutDirection; @@ -434,7 +435,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param layer The layer to add. * @return The index of the layer. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int addLayer(@NonNull ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 16ffd132a41b..8677fb1b7c1e 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -36,6 +36,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.util.AttributeSet; import com.android.internal.R; @@ -121,7 +122,7 @@ public class RippleDrawable extends LayerDrawable { private final Rect mDirtyBounds = new Rect(); /** Mirrors mLayerState with some extra information. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RippleState mState; /** The masking layer, e.g. the layer with id R.id.mask. */ @@ -159,7 +160,7 @@ public class RippleDrawable extends LayerDrawable { private Paint mRipplePaint; /** Target density of the display into which ripples are drawn. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDensity; /** Whether bounds are being overridden. */ @@ -979,7 +980,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index af7eed4b3897..7e246e552bec 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -25,6 +25,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; @@ -67,7 +68,7 @@ public class ScaleDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScaleState mState; ScaleDrawable() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index 88cd4625394b..af69029da9d7 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -22,6 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; @@ -130,7 +131,7 @@ public class StateListDrawable extends DrawableContainer { /** * Updates the constant state from the values in the typed array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateStateFromTypedArray(TypedArray a) { final StateListState state = mStateListState; @@ -208,7 +209,7 @@ public class StateListDrawable extends DrawableContainer { * @param attrs The attribute set. * @return An array of state_ attributes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int[] extractStateSet(AttributeSet attrs) { int j = 0; final int numAttrs = attrs.getAttributeCount(); diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index a1ccc7b7b5e4..6dcc251c2ddc 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.os.Trace; import android.util.ArrayMap; import android.util.AttributeSet; @@ -324,7 +325,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PorterDuffColorFilter mTintFilter; private BlendModeColorFilter mBlendModeColorFilter; diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 4e6580ea5f53..7bd581723d18 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -33,7 +33,7 @@ public final class FontVariationAxis { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mTag; private final String mTagString; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float mStyleValue; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 43de4699381f..4666963b5dd4 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -25,6 +25,7 @@ import android.graphics.Bitmap.Config; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.ErrnoException; import android.system.Os; @@ -121,7 +122,7 @@ public final class PdfRenderer implements AutoCloseable { private ParcelFileDescriptor mInput; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Page mCurrentPage; /** @hide */ @@ -246,7 +247,7 @@ public final class PdfRenderer implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void doClose() { if (mCurrentPage != null) { mCurrentPage.close(); diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index f53a7dc922f0..8f5982cd4528 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -17,6 +17,7 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.org.bouncycastle.util.io.pem.PemReader; @@ -137,7 +138,7 @@ public class Credentials { * Convert objects to a PEM format which is used for * CA_CERTIFICATE and USER_CERTIFICATE entries. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static byte[] convertToPem(Certificate... objects) throws IOException, CertificateEncodingException { ByteArrayOutputStream bao = new ByteArrayOutputStream(); diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 88b614dc7eef..c70c986fcd6b 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -71,7 +71,7 @@ public class KeyStore { private static final String TAG = "KeyStore"; // ResponseCodes - see system/security/keystore/include/keystore/keystore.h - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NO_ERROR = 1; public static final int LOCKED = 2; public static final int UNINITIALIZED = 3; @@ -191,7 +191,7 @@ public class KeyStore { return mToken; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public State state(int userId) { final int ret; try { @@ -222,7 +222,7 @@ public class KeyStore { return get(key, uid, false); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] get(String key) { return get(key, UID_SELF); } @@ -282,7 +282,7 @@ public class KeyStore { return ret == NO_ERROR || ret == KEY_NOT_FOUND; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean delete(String key) { return delete(key, UID_SELF); } @@ -319,7 +319,7 @@ public class KeyStore { * List uids of all keys that are auth bound to the current user. * Only system is allowed to call this method. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] listUidsOfAuthBoundKeys() { // uids are returned as a list of strings because list of integers // as an output parameter is not supported by aidl-cpp. @@ -386,7 +386,7 @@ public class KeyStore { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean unlock(String password) { return unlock(UserHandle.getUserId(Process.myUid()), password); } @@ -1262,7 +1262,7 @@ public class KeyStore { * Returns a {@link KeyStoreException} corresponding to the provided keystore/keymaster error * code. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static KeyStoreException getKeyStoreException(int errorCode) { if (errorCode > 0) { // KeyStore layer error diff --git a/location/java/android/location/IGeofenceProvider.aidl b/location/java/android/location/IGeofenceProvider.aidl index 426ebef86b96..b1ef672024ac 100644 --- a/location/java/android/location/IGeofenceProvider.aidl +++ b/location/java/android/location/IGeofenceProvider.aidl @@ -24,6 +24,6 @@ import android.hardware.location.IGeofenceHardware; * {@hide} */ oneway interface IGeofenceProvider { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setGeofenceHardware(in IGeofenceHardware proxy); } diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 62b4bc173bb9..20175d70e735 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -129,7 +129,7 @@ public class Location implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mProvider; private long mTime = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mElapsedRealtimeNanos = 0; // Estimate of the relative precision of the alignment of this SystemClock // timestamp, with the reported measurements in nanoseconds (68% confidence). diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 158482a6a833..717074cba26f 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -502,7 +502,7 @@ public final class AudioAttributes implements Parcelable { @Retention(RetentionPolicy.SOURCE) public @interface CapturePolicy {} - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mUsage = USAGE_UNKNOWN; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mContentType = CONTENT_TYPE_UNKNOWN; @@ -511,7 +511,7 @@ public final class AudioAttributes implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mFlags = 0x0; private HashSet mTags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mFormattedTags; private Bundle mBundle; // lazy-initialized, may be null diff --git a/media/java/android/media/AudioDevicePort.java b/media/java/android/media/AudioDevicePort.java index f6b04540c5c7..0f79675862c7 100644 --- a/media/java/android/media/AudioDevicePort.java +++ b/media/java/android/media/AudioDevicePort.java @@ -18,6 +18,7 @@ package android.media; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Arrays; @@ -41,7 +42,7 @@ public class AudioDevicePort extends AudioPort { private final int[] mEncapsulationModes; private final int[] mEncapsulationMetadataTypes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioDevicePort(AudioHandle handle, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains, int type, String address, int[] encapsulationModes, diff --git a/media/java/android/media/AudioDevicePortConfig.java b/media/java/android/media/AudioDevicePortConfig.java index 51b8037b82f8..69fd82be179b 100644 --- a/media/java/android/media/AudioDevicePortConfig.java +++ b/media/java/android/media/AudioDevicePortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioDevicePortConfig describes a possible configuration of an output or input device @@ -28,7 +29,7 @@ import android.compat.annotation.UnsupportedAppUsage; */ public class AudioDevicePortConfig extends AudioPortConfig { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioDevicePortConfig(AudioDevicePort devicePort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)devicePort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 8a60bdebbf09..1d06e2837841 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -21,6 +21,7 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -685,7 +686,7 @@ public final class AudioFormat implements Parcelable { */ // Update sound trigger JNI in core/jni/android_hardware_SoundTrigger.cpp when modifying this // constructor - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioFormat(int encoding, int sampleRate, int channelMask, int channelIndexMask) { this( AUDIO_FORMAT_HAS_PROPERTY_ENCODING @@ -744,11 +745,11 @@ public final class AudioFormat implements Parcelable { // This is an immutable class, all member variables are final. // Essential values. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mEncoding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mSampleRate; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mChannelMask; private final int mChannelIndexMask; private final int mPropertySetMask; diff --git a/media/java/android/media/AudioGain.java b/media/java/android/media/AudioGain.java index cae1b59d46a7..98dc06a6a996 100644 --- a/media/java/android/media/AudioGain.java +++ b/media/java/android/media/AudioGain.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioGain describes a gain controller. Gain controllers are exposed by @@ -71,7 +72,7 @@ public class AudioGain { // The channel mask passed to the constructor is as specified in AudioFormat // (e.g. AudioFormat.CHANNEL_OUT_STEREO) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioGain(int index, int mode, int channelMask, int minValue, int maxValue, int defaultValue, int stepValue, int rampDurationMinMs, int rampDurationMaxMs) { diff --git a/media/java/android/media/AudioHandle.java b/media/java/android/media/AudioHandle.java index 8fc834f8d0a9..ce51b5a33a9a 100644 --- a/media/java/android/media/AudioHandle.java +++ b/media/java/android/media/AudioHandle.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioHandle is used by the audio framework implementation to @@ -28,7 +29,7 @@ class AudioHandle { @UnsupportedAppUsage private final int mId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioHandle(int id) { mId = id; } diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8b28cc45fda2..29477366379b 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -709,7 +709,7 @@ public class AudioManager { * @hide * For test purposes only, will throw NPE with some methods that require a Context. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AudioManager() { } @@ -959,7 +959,7 @@ public class AudioManager { * @see #setRingerMode(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isValidRingerMode(int ringerMode) { if (ringerMode < 0 || ringerMode > RINGER_MODE_MAX) { return false; @@ -2478,7 +2478,7 @@ public class AudioManager { * @see #stopBluetoothSco() * @see #ACTION_SCO_AUDIO_STATE_UPDATED */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startBluetoothScoVirtualCall() { final IAudioService service = getService(); try { @@ -2630,7 +2630,7 @@ public class AudioManager { * @param on set true to mute the microphone; * false to turn mute off */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setMicrophoneMuteFromSwitch(boolean on) { final IAudioService service = getService(); try { @@ -2890,7 +2890,7 @@ public class AudioManager { * display). Note that BT audio sinks are not considered remote devices. * @return true if {@link AudioManager#STREAM_MUSIC} is active on a remote device */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isMusicActiveRemotely() { return AudioSystem.isStreamActiveRemotely(STREAM_MUSIC, 0); } @@ -3041,7 +3041,7 @@ public class AudioManager { /** * @hide Number of sound effects */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NUM_SOUND_EFFECTS = 10; /** @@ -3875,7 +3875,7 @@ public class AudioManager { * @param durationHint the type of focus request. AUDIOFOCUS_GAIN_TRANSIENT is recommended so * media applications resume after a call */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void requestAudioFocusForCall(int streamType, int durationHint) { final IAudioService service = getService(); try { @@ -3979,7 +3979,7 @@ public class AudioManager { * when ringing ends and the call is rejected or not answered. * Should match one or more calls to {@link #requestAudioFocusForCall(int, int)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void abandonAudioFocusForCall() { final IAudioService service = getService(); try { @@ -4715,7 +4715,7 @@ public class AudioManager { * agent when audio settings are restored and causes the AudioService * to read and apply restored settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void reloadAudioSettings() { final IAudioService service = getService(); try { diff --git a/media/java/android/media/AudioMixPort.java b/media/java/android/media/AudioMixPort.java index 33d603f0b9da..0e286b0f1f89 100644 --- a/media/java/android/media/AudioMixPort.java +++ b/media/java/android/media/AudioMixPort.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioMixPort is a specialized type of AudioPort @@ -32,7 +33,7 @@ public class AudioMixPort extends AudioPort { private final int mIoHandle; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioMixPort(AudioHandle handle, int ioHandle, int role, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -53,7 +54,7 @@ public class AudioMixPort extends AudioPort { /** * Get the device type (e.g AudioManager.DEVICE_OUT_SPEAKER) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int ioHandle() { return mIoHandle; } diff --git a/media/java/android/media/AudioMixPortConfig.java b/media/java/android/media/AudioMixPortConfig.java index 9d8120624a45..483524a8c168 100644 --- a/media/java/android/media/AudioMixPortConfig.java +++ b/media/java/android/media/AudioMixPortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioMixPortConfig describes a possible configuration of an output or input mixer. @@ -28,7 +29,7 @@ import android.compat.annotation.UnsupportedAppUsage; public class AudioMixPortConfig extends AudioPortConfig { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioMixPortConfig(AudioMixPort mixPort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)mixPort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioPatch.java b/media/java/android/media/AudioPatch.java index e5107d4e3309..99663bf3aab8 100644 --- a/media/java/android/media/AudioPatch.java +++ b/media/java/android/media/AudioPatch.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** @@ -36,7 +37,7 @@ public class AudioPatch { private final AudioPortConfig[] mSources; private final AudioPortConfig[] mSinks; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioPatch(AudioHandle patchHandle, AudioPortConfig[] sources, AudioPortConfig[] sinks) { mHandle = patchHandle; mSources = sources; diff --git a/media/java/android/media/AudioPort.java b/media/java/android/media/AudioPort.java index 7c3ca24e1c9a..e6dc622a11c1 100644 --- a/media/java/android/media/AudioPort.java +++ b/media/java/android/media/AudioPort.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An audio port is a node of the audio framework or hardware that can be connected to or @@ -82,7 +83,7 @@ public class AudioPort { @UnsupportedAppUsage private AudioPortConfig mActiveConfig; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioPort(AudioHandle handle, int role, String name, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -113,7 +114,7 @@ public class AudioPort { /** * Get the audio port role */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int role() { return mRole; } diff --git a/media/java/android/media/AudioPortConfig.java b/media/java/android/media/AudioPortConfig.java index 16fb5b80eb3e..4dd3cb699a7d 100644 --- a/media/java/android/media/AudioPortConfig.java +++ b/media/java/android/media/AudioPortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioPortConfig contains a possible configuration of an audio port chosen @@ -50,7 +51,7 @@ public class AudioPortConfig { static final int CHANNEL_MASK = 0x2; static final int FORMAT = 0x4; static final int GAIN = 0x8; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mConfigMask; @UnsupportedAppUsage diff --git a/media/java/android/media/AudioPortEventHandler.java b/media/java/android/media/AudioPortEventHandler.java index 8e8dfaf24b9a..763eb2944d19 100644 --- a/media/java/android/media/AudioPortEventHandler.java +++ b/media/java/android/media/AudioPortEventHandler.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -54,7 +55,7 @@ class AudioPortEventHandler { * Accessed by native methods: JNI Callback context. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mJniCallback; void init() { @@ -178,7 +179,7 @@ class AudioPortEventHandler { } @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object module_ref, int what, int arg1, int arg2, Object obj) { AudioPortEventHandler eventHandler = diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index c9cdbb0ed277..07c8ee514e07 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -30,6 +30,7 @@ import android.media.audiopolicy.AudioMix; import android.media.audiopolicy.AudioPolicy; import android.media.projection.MediaProjection; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -174,14 +175,14 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, * Accessed by native methods: provides access to the callback data. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeCallbackCookie; /** * Accessed by native methods: provides access to the JNIDeviceCallback instance. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeDeviceCallback; @@ -261,7 +262,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, /** * AudioAttributes */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioAttributes mAudioAttributes; private boolean mIsSubmixFullVolume = false; @@ -1965,7 +1966,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object audiorecord_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/AudioRecordingConfiguration.java b/media/java/android/media/AudioRecordingConfiguration.java index 42841d178401..6febabe0aefc 100644 --- a/media/java/android/media/AudioRecordingConfiguration.java +++ b/media/java/android/media/AudioRecordingConfiguration.java @@ -23,6 +23,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.audiofx.AudioEffect; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -222,7 +223,7 @@ public final class AudioRecordingConfiguration implements Parcelable { *
When called without the permission, the result is an empty string. * @return the package name */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getClientPackageName() { return mClientPackageName; } /** diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 279ba0a55be0..39bdf9557595 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.media.audiofx.AudioEffect; import android.media.audiopolicy.AudioMix; +import android.os.Build; import android.telephony.TelephonyManager; import android.util.Log; import android.util.Pair; @@ -83,7 +84,7 @@ public class AudioSystem public static final int STREAM_BLUETOOTH_SCO = 6; /** @hide Used to identify the volume of audio streams for enforced system sounds in certain * countries (e.g camera in Japan) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int STREAM_SYSTEM_ENFORCED = 7; /** @hide Used to identify the volume of audio streams for DTMF tones */ public static final int STREAM_DTMF = 8; @@ -596,7 +597,7 @@ public class AudioSystem } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void dynamicPolicyCallbackFromNative(int event, String regId, int val) { DynamicPolicyCallback cb; @@ -673,7 +674,7 @@ public class AudioSystem * @param effects * @param activeSource */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void recordingCallbackFromNative(int event, int riid, int uid, int session, int source, int portId, boolean silenced, int[] recordingFormat, AudioEffect.Descriptor[] clientEffects, AudioEffect.Descriptor[] effects, @@ -1498,7 +1499,7 @@ public class AudioSystem @UnsupportedAppUsage public static native int setMasterMute(boolean mute); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native boolean getMasterMute(); /** @hide */ @UnsupportedAppUsage diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index fa6a4ff5af67..b2c2c4b1bbb4 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -27,6 +27,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -579,7 +580,7 @@ public class AudioTrack extends PlayerBase * the native AudioTrack object, but not stored in it). */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mJniData; @@ -875,7 +876,7 @@ public class AudioTrack extends PlayerBase /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void deferred_connect(long nativeTrackInJavaObj) { if (mState != STATE_INITIALIZED) { // Note that for this native_setup, we are providing an already created/initialized @@ -4012,7 +4013,7 @@ public class AudioTrack extends PlayerBase // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object audiotrack_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index 45f1ca044afb..06bf5f70d9ec 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -565,7 +565,7 @@ public class CamcorderProfile // Methods implemented by JNI @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native final void native_init(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native final CamcorderProfile native_get_camcorder_profile( int cameraId, int quality); private static native final boolean native_has_camcorder_profile( diff --git a/media/java/android/media/EncoderCapabilities.java b/media/java/android/media/EncoderCapabilities.java index 67ce0f7cc0b9..768b6431f1a9 100644 --- a/media/java/android/media/EncoderCapabilities.java +++ b/media/java/android/media/EncoderCapabilities.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.ArrayList; import java.util.List; @@ -44,19 +45,19 @@ public class EncoderCapabilities */ static public class VideoEncoderCap { // These are not modifiable externally, thus are public accessible - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mCodec; // @see android.media.MediaRecorder.VideoEncoder public final int mMinBitRate; // min bit rate (bps) public final int mMaxBitRate; // max bit rate (bps) public final int mMinFrameRate; // min frame rate (fps) public final int mMaxFrameRate; // max frame rate (fps) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMinFrameWidth; // min frame width (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMaxFrameWidth; // max frame width (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMinFrameHeight; // min frame height (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMaxFrameHeight; // max frame height (pixel) // Private constructor called by JNI @@ -134,7 +135,7 @@ public class EncoderCapabilities * Returns the capabilities of the supported video encoders. * @see android.media.EncoderCapabilities.VideoEncoderCap */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static List getVideoEncoders() { int nEncoders = native_get_num_video_encoders(); if (nEncoders == 0) return null; diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 47e60000cd04..5c012bef9a68 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -79,7 +79,7 @@ interface IAudioService { void adjustStreamVolume(int streamType, int direction, int flags, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStreamVolume(int streamType, int index, int flags, String callingPackage); oneway void handleVolumeKey(in KeyEvent event, boolean isOnTv, diff --git a/media/java/android/media/IRemoteDisplayCallback.aidl b/media/java/android/media/IRemoteDisplayCallback.aidl index 584417d65121..75813c9ba593 100644 --- a/media/java/android/media/IRemoteDisplayCallback.aidl +++ b/media/java/android/media/IRemoteDisplayCallback.aidl @@ -22,6 +22,6 @@ import android.media.RemoteDisplayState; * {@hide} */ oneway interface IRemoteDisplayCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onStateChanged(in RemoteDisplayState state); } diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java index 84ee09b35b81..875c6f52d9b2 100644 --- a/media/java/android/media/JetPlayer.java +++ b/media/java/android/media/JetPlayer.java @@ -19,6 +19,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetFileDescriptor; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -130,7 +131,7 @@ public class JetPlayer * Accessed by native methods: provides access to C++ JetPlayer object */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativePlayerInJavaObj; @@ -564,7 +565,7 @@ public class JetPlayer // Called exclusively by native code //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object jetplayer_ref, int what, int arg1, int arg2) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java index 78eeca1ccc05..9976fa11d177 100644 --- a/media/java/android/media/MediaMetadata.java +++ b/media/java/android/media/MediaMetadata.java @@ -26,6 +26,7 @@ import android.media.browse.MediaBrowser; import android.media.session.MediaController; import android.media.session.MediaSession; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -650,7 +651,7 @@ public final class MediaMetadata implements Parcelable { * @return The key used by this class or null if no mapping exists * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getKeyFromMetadataEditorKey(int editorKey) { return EDITOR_KEY_MAPPING.get(editorKey, null); } diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index 54675d018038..ac19c21ae085 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.media.MediaCodec.BufferInfo; +import android.os.Build; import dalvik.system.CloseGuard; @@ -286,10 +287,10 @@ final public class MediaMuxer { public @interface Format {} // All the native functions are listed here. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native long nativeSetup(@NonNull FileDescriptor fd, int format) throws IllegalArgumentException, IOException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native void nativeRelease(long nativeObject); private static native void nativeStart(long nativeObject); private static native void nativeStop(long nativeObject); @@ -303,22 +304,22 @@ final public class MediaMuxer { int offset, int size, long presentationTimeUs, @MediaCodec.BufferFlag int flags); // Muxer internal states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_UNINITIALIZED = -1; private static final int MUXER_STATE_INITIALIZED = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_STARTED = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_STOPPED = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mState = MUXER_STATE_UNINITIALIZED; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final CloseGuard mCloseGuard = CloseGuard.get(); private int mLastTrackIndex = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeObject; private String convertMuxerStateCodeToString(int aState) { diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 47d276a50034..42e39101de13 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -31,6 +31,7 @@ import android.graphics.SurfaceTexture; import android.media.SubtitleController.Anchor; import android.media.SubtitleTrack.RenderingWidget; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.FileUtils; import android.os.Handler; @@ -1152,7 +1153,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, headers, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDataSource(String path, Map headers, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -1173,7 +1174,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, keys, values, cookies); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDataSource(String path, String[] keys, String[] values, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -4410,7 +4411,7 @@ public class MediaPlayer extends PlayerBase * JAVA framework to avoid triggering track scanning. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_INFO_EXTERNAL_METADATA_UPDATE = 803; /** Informs that audio is not playing. Note that playback of the video @@ -4430,7 +4431,7 @@ public class MediaPlayer extends PlayerBase * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_INFO_TIMED_TEXT_ERROR = 900; /** Subtitle track was not supported by the media framework. diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 1db02beaea1a..c61a2eb02921 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -108,7 +108,7 @@ public class MediaRecorder implements AudioRouting, private long mNativeContext; @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Surface mSurface; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 4d87fb3fa81f..4940c7647dbc 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -846,7 +846,7 @@ public class MediaRouter { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RouteInfo getSelectedRoute() { return getSelectedRoute(ROUTE_TYPE_ANY); } @@ -1776,7 +1776,7 @@ public class MediaRouter { return getName(context.getResources()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CharSequence getName(Resources res) { if (mNameResId != 0) { return res.getText(mNameResId); diff --git a/media/java/android/media/MicrophoneInfo.java b/media/java/android/media/MicrophoneInfo.java index acd284f3fad9..9e2e25fa1a7f 100644 --- a/media/java/android/media/MicrophoneInfo.java +++ b/media/java/android/media/MicrophoneInfo.java @@ -19,6 +19,7 @@ package android.media; import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Pair; import java.lang.annotation.Retention; @@ -164,7 +165,7 @@ public final class MicrophoneInfo { private int mType; private int mDirectionality; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) MicrophoneInfo(String deviceId, int type, String address, int location, int group, int indexInTheGroup, Coordinate3F position, Coordinate3F orientation, List> frequencyResponse, diff --git a/media/java/android/media/PlaybackParams.java b/media/java/android/media/PlaybackParams.java index f24f831d0333..080b9a4513ee 100644 --- a/media/java/android/media/PlaybackParams.java +++ b/media/java/android/media/PlaybackParams.java @@ -87,23 +87,23 @@ public final class PlaybackParams implements Parcelable { public static final int AUDIO_STRETCH_MODE_VOICE = 1; // flags to indicate which params are actually set - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_SPEED = 1 << 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_PITCH = 1 << 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_AUDIO_FALLBACK_MODE = 1 << 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_AUDIO_STRETCH_MODE = 1 << 3; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSet = 0; // params - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAudioFallbackMode = AUDIO_FALLBACK_MODE_DEFAULT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAudioStretchMode = AUDIO_STRETCH_MODE_DEFAULT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mPitch = 1.0f; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private float mSpeed = 1.0f; diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index c5fd3c30236d..60a00529cb5d 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -24,6 +24,7 @@ import android.graphics.Bitmap; import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.PlaybackState; +import android.os.Build; import android.os.Bundle; import android.os.Looper; import android.os.SystemClock; @@ -816,7 +817,7 @@ import android.util.Log; * position updates. The playback position being "readable" is considered from the application's * point of view. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int MEDIA_POSITION_READABLE = 1 << 0; /** * @hide @@ -824,7 +825,7 @@ import android.util.Log; * playback position updates. The playback position being "writable" * is considered from the application's point of view. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int MEDIA_POSITION_WRITABLE = 1 << 1; /** @hide */ diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java index 35cfaca8562a..00fc2757a702 100644 --- a/media/java/android/media/RemoteController.java +++ b/media/java/android/media/RemoteController.java @@ -26,6 +26,7 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -78,7 +79,7 @@ import java.util.List; private int mArtworkHeight = -1; private boolean mEnabled = true; // synchronized on mInfoLock, for USE_SESSION apis. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private MediaController mCurrentSession; /** diff --git a/media/java/android/media/RemoteDisplay.java b/media/java/android/media/RemoteDisplay.java index e529af9da935..2a0e54d1b767 100644 --- a/media/java/android/media/RemoteDisplay.java +++ b/media/java/android/media/RemoteDisplay.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.view.Surface; @@ -127,7 +128,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayConnected(final Surface surface, final int width, final int height, final int flags, final int session) { mHandler.post(new Runnable() { @@ -139,7 +140,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayDisconnected() { mHandler.post(new Runnable() { @Override @@ -150,7 +151,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayError(final int error) { mHandler.post(new Runnable() { @Override diff --git a/media/java/android/media/RemoteDisplayState.java b/media/java/android/media/RemoteDisplayState.java index fed361a960e6..370f5b1326f8 100644 --- a/media/java/android/media/RemoteDisplayState.java +++ b/media/java/android/media/RemoteDisplayState.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -41,10 +42,10 @@ public final class RemoteDisplayState implements Parcelable { /** * A list of all remote displays. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ArrayList displays; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RemoteDisplayState() { displays = new ArrayList(); } diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index d02b49697821..bd783ce9f6b2 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -26,6 +26,7 @@ import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.RemoteException; import android.provider.MediaStore; import android.provider.MediaStore.MediaColumns; @@ -73,7 +74,7 @@ public class Ringtone { private final IRingtonePlayer mRemotePlayer; private final Binder mRemoteToken; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private MediaPlayer mLocalPlayer; private final MyOnCompletionListener mCompletionListener = new MyOnCompletionListener(); diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 9deeb8fbab16..e2e13b048cf7 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -36,6 +36,7 @@ import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.database.StaleDataException; import android.net.Uri; +import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.IBinder; @@ -585,7 +586,7 @@ public class RingtoneManager { return new ExternalRingtonesCursorWrapper(res, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Cursor getMediaRingtones(Context context) { // MediaStore now returns ringtones on other storage devices, even when // we don't have storage or audio permissions @@ -728,7 +729,7 @@ public class RingtoneManager { * @param volumeShaperConfig config for volume shaper of the ringtone if applied. * @see #getRingtone(Context, Uri) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static Ringtone getRingtone( final Context context, Uri ringtoneUri, int streamType, @Nullable VolumeShaper.Configuration volumeShaperConfig) { diff --git a/media/java/android/media/TimedText.java b/media/java/android/media/TimedText.java index 120642a8e7cb..fd615472903d 100644 --- a/media/java/android/media/TimedText.java +++ b/media/java/android/media/TimedText.java @@ -18,6 +18,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Rect; +import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -736,7 +737,7 @@ public final class TimedText * List of CharPos, Karaoke, Font, Style, and HyperText, or 3) an instance of * Justification. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Object getObject(final int key) { if (containsKey(key)) { return mKeyObjectMap.get(key); diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index cc114a9092e1..140e70d32c78 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; @@ -895,6 +896,6 @@ public class ToneGenerator protected void finalize() { native_finalize(); } @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; // accessed by native methods } diff --git a/media/java/android/media/TtmlRenderer.java b/media/java/android/media/TtmlRenderer.java index e5782642f4eb..3a6c3909bbaf 100644 --- a/media/java/android/media/TtmlRenderer.java +++ b/media/java/android/media/TtmlRenderer.java @@ -18,6 +18,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; @@ -49,7 +50,7 @@ public class TtmlRenderer extends SubtitleController.Renderer { private TtmlRenderingWidget mRenderingWidget; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TtmlRenderer(Context context) { mContext = context; } diff --git a/media/java/android/media/VolumeShaper.java b/media/java/android/media/VolumeShaper.java index 99dfe1e8e32f..df8d08e8e846 100644 --- a/media/java/android/media/VolumeShaper.java +++ b/media/java/android/media/VolumeShaper.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -413,23 +414,23 @@ public final class VolumeShaper implements AutoCloseable { */ // type of VolumeShaper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mType; // valid when mType is TYPE_ID - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mId; // valid when mType is TYPE_SCALE - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mOptionFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final double mDurationMs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mInterpolatorType; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float[] mTimes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float[] mVolumes; @Override @@ -572,7 +573,7 @@ public final class VolumeShaper implements AutoCloseable { * Direct constructor for VolumeShaper. * Use the Builder instead. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Configuration(@Type int type, int id, @OptionFlag int optionFlags, @@ -1132,11 +1133,11 @@ public final class VolumeShaper implements AutoCloseable { private static final int FLAG_PUBLIC_ALL = FLAG_REVERSE | FLAG_TERMINATE; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mReplaceId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float mXOffset; @Override @@ -1198,7 +1199,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Operation(@Flag int flags, int replaceId, float xOffset) { mFlags = flags; mReplaceId = replaceId; @@ -1358,9 +1359,9 @@ public final class VolumeShaper implements AutoCloseable { * Not for public use. */ public static final class State implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mVolume; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mXOffset; @Override @@ -1411,7 +1412,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ State(float volume, float xOffset) { mVolume = volume; mXOffset = xOffset; diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index f4fd1fca2ff9..67a4a4b1f851 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -914,7 +914,7 @@ public class AudioEffect { * In case of success, the returns the number of meaningful integers in value array. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getParameter(int[] param, int[] value) throws IllegalStateException { if (param.length > 2 || value.length > 2) { @@ -983,7 +983,7 @@ public class AudioEffect { * @see #getParameter(byte[], byte[]) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getParameter(int[] param, byte[] value) throws IllegalStateException { if (param.length > 2) { diff --git a/media/java/android/media/audiopolicy/AudioMix.java b/media/java/android/media/audiopolicy/AudioMix.java index 4e451c6e42b1..221147dcad8f 100644 --- a/media/java/android/media/audiopolicy/AudioMix.java +++ b/media/java/android/media/audiopolicy/AudioMix.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioSystem; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -34,24 +35,24 @@ import java.util.Objects; @SystemApi public class AudioMix { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioMixingRule mRule; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioFormat mFormat; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mRouteFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMixType = MIX_TYPE_INVALID; // written by AudioPolicy int mMixState = MIX_STATE_DISABLED; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCallbackFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) String mDeviceAddress; // initialized in constructor, read by AudioPolicyConfig - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mDeviceSystemType; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_* /** diff --git a/media/java/android/media/audiopolicy/AudioMixingRule.java b/media/java/android/media/audiopolicy/AudioMixingRule.java index f6f982a4ebe2..de153135eeb9 100644 --- a/media/java/android/media/audiopolicy/AudioMixingRule.java +++ b/media/java/android/media/audiopolicy/AudioMixingRule.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioAttributes; +import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -109,11 +110,11 @@ public class AudioMixingRule { /** @hide */ public static final class AudioMixMatchCriterion { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final AudioAttributes mAttr; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mIntProp; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mRule; /** input parameters must be valid */ @@ -199,13 +200,13 @@ public class AudioMixingRule { private final int mTargetMixType; int getTargetMixType() { return mTargetMixType; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ArrayList mCriteria; /** @hide */ public ArrayList getCriteria() { return mCriteria; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mAllowPrivilegedPlaybackCapture = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mVoiceCommunicationCaptureAllowed = false; /** @hide */ diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index f582d2addf17..14b236890e4a 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -33,6 +33,7 @@ import android.media.VolumeProvider; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.net.Uri; import android.os.BadParcelableException; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -1390,7 +1391,7 @@ public final class MediaSession { public static final int UNKNOWN_ID = -1; private final MediaDescription mDescription; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final long mId; /** diff --git a/media/java/android/media/soundtrigger/SoundTriggerDetector.java b/media/java/android/media/soundtrigger/SoundTriggerDetector.java index 16a517b72119..0a1eefae59d6 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerDetector.java +++ b/media/java/android/media/soundtrigger/SoundTriggerDetector.java @@ -28,6 +28,7 @@ import android.hardware.soundtrigger.SoundTrigger; import android.hardware.soundtrigger.SoundTrigger.ModuleProperties; import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; import android.media.AudioFormat; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -192,7 +193,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] getData() { if (!mTriggerAvailable) { return mData; @@ -220,7 +221,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Integer getCaptureSession() { if (mCaptureAvailable) { return mCaptureSession; diff --git a/media/java/android/media/soundtrigger/SoundTriggerManager.java b/media/java/android/media/soundtrigger/SoundTriggerManager.java index 0ff8d9e96220..00e3bcebd0f3 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerManager.java +++ b/media/java/android/media/soundtrigger/SoundTriggerManager.java @@ -38,6 +38,7 @@ import android.media.permission.ClearCallingIdentityContext; import android.media.permission.Identity; import android.media.permission.SafeCloseable; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.ParcelUuid; @@ -382,7 +383,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int stopRecognition(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; @@ -399,7 +400,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int unloadSoundModel(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 377b2bc19c6b..195ad5bc10f9 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -38,6 +38,7 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiUtils; import android.hardware.hdmi.HdmiUtils.HdmiAddressRelativePosition; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -326,7 +327,7 @@ public final class TvInputInfo implements Parcelable { * Returns the component of the service that implements this TV input. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentName getComponent() { return new ComponentName(mService.serviceInfo.packageName, mService.serviceInfo.name); } diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 95c4f2a025d7..945fb3bff936 100755 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -34,6 +34,7 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.media.PlaybackParams; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -406,7 +407,7 @@ public abstract class TvInputService extends Service { private OverlayViewCleanUpTask mOverlayViewCleanUpTask; private boolean mOverlayViewEnabled; private IBinder mWindowToken; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Rect mOverlayFrame; private long mStartPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; private long mCurrentPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index 1386cba5f9ca..ee70714ce763 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -32,6 +32,7 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -87,7 +88,7 @@ public abstract class MediaBrowserService extends Service { * A key for passing the MediaItem to the ResultReceiver in getItem. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String KEY_MEDIA_ITEM = "media_item"; private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 1 << 0; diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 90b46fd5901a..80e64e01559a 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -20,6 +20,7 @@ package android.opengl; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; +import android.os.Build; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -164,7 +165,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native EGLDisplay eglGetDisplay( long display_id ); diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index ea571c7311a1..abdbd11828db 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -17,6 +17,7 @@ package javax.microedition.khronos.egl; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public interface EGL10 extends EGL { int EGL_SUCCESS = 0x3000; @@ -116,7 +117,7 @@ public interface EGL10 extends EGL { String eglQueryString(EGLDisplay display, int name); boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); /** @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean eglReleaseThread(); boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface); boolean eglTerminate(EGLDisplay display); diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index df9d8019f28d..e47ec4b31700 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -19,6 +19,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Environment; import java.io.File; @@ -237,7 +238,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); String fontPath = Environment.getRootDirectory().getAbsolutePath(); diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 826225a70d86..1a4d1fd5afbb 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -17,6 +17,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Vector; @@ -606,7 +607,7 @@ public class Mesh extends BaseObj { * channels are present in the mesh * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder(RenderScript rs, int vtxSize, int flags) { mRS = rs; mVtxCount = 0; @@ -663,7 +664,7 @@ public class Mesh extends BaseObj { * @return this * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder addVertex(float x, float y) { if (mVtxSize != 2) { throw new IllegalStateException("add mistmatch with declared components."); @@ -769,7 +770,7 @@ public class Mesh extends BaseObj { * * @return this **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder addTriangle(int idx1, int idx2, int idx3) { if((idx1 >= mMaxIndex) || (idx1 < 0) || (idx2 >= mMaxIndex) || (idx2 < 0) || @@ -802,7 +803,7 @@ public class Mesh extends BaseObj { * accessible memory * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Mesh create(boolean uploadToBufferObject) { Element.Builder b = new Element.Builder(mRS); b.add(Element.createVector(mRS, diff --git a/rs/java/android/renderscript/ProgramStore.java b/rs/java/android/renderscript/ProgramStore.java index 7e61347ee218..1952b8860033 100644 --- a/rs/java/android/renderscript/ProgramStore.java +++ b/rs/java/android/renderscript/ProgramStore.java @@ -17,6 +17,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** @@ -308,7 +309,7 @@ public class ProgramStore extends BaseObj { * * @param rs Context to which the program will belong. **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ProgramStore BLEND_ALPHA_DEPTH_NONE(RenderScript rs) { if(rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH == null) { ProgramStore.Builder builder = new ProgramStore.Builder(rs); diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index aff2f0183a3b..2983e6339d4b 100644 --- a/telecomm/java/android/telecom/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable; import android.location.Country; import android.location.CountryDetector; import android.net.Uri; +import android.os.Build; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; @@ -186,7 +187,7 @@ public class CallerInfo { private boolean mIsVoiceMail; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CallerInfo() { // TODO: Move all the basic initialization here? mIsEmergency = false; @@ -347,7 +348,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, Uri contactRef) { CallerInfo info = null; ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context); @@ -374,7 +375,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, String number) { if (VDBG) Log.v(TAG, "getCallerInfo() based on number..."); @@ -395,7 +396,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, String number, int subId) { if (TextUtils.isEmpty(number)) { diff --git a/telecomm/java/android/telecom/Log.java b/telecomm/java/android/telecom/Log.java index a90d0532b721..2a4fdcb1475d 100644 --- a/telecomm/java/android/telecom/Log.java +++ b/telecomm/java/android/telecom/Log.java @@ -102,7 +102,7 @@ public class Log { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void i(String prefix, String format, Object... args) { if (INFO) { android.util.Slog.i(TAG, buildMessage(prefix, format, args)); @@ -133,7 +133,7 @@ public class Log { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void w(String prefix, String format, Object... args) { if (WARN) { android.util.Slog.w(TAG, buildMessage(prefix, format, args)); diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index 7c6f1df972f3..a28a999e8d19 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -191,7 +191,7 @@ interface ITelecomService { /** * @see TelecomServiceImpl#getCallState */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCallState(); /** diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index c3cd01738b96..96996a1ae8ac 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -35,6 +35,7 @@ import android.content.pm.ServiceInfo; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; +import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.provider.Telephony; @@ -89,7 +90,7 @@ public final class SmsApplication { /** * Name of this SMS app for display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mApplicationName; /** @@ -580,7 +581,7 @@ public final class SmsApplication { * Sets the specified package as the default SMS/MMS application. The caller of this method * needs to have permission to set AppOps and write to secure settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setDefaultApplication(String packageName, Context context) { setDefaultApplicationAsUser(packageName, context, getIncomingUserId(context)); } @@ -849,7 +850,7 @@ public final class SmsApplication { sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void configurePreferredActivity(PackageManager packageManager, ComponentName componentName) { // Add the four activity preferences we want to direct to this app. @@ -887,7 +888,7 @@ public final class SmsApplication { * Returns SmsApplicationData for this package if this package is capable of being set as the * default SMS application. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SmsApplicationData getSmsApplicationData(String packageName, Context context) { Collection applications = getApplicationCollection(context); return getApplicationForPackage(applications, packageName); @@ -959,7 +960,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to direct Respond Via Message intent to */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ComponentName getDefaultRespondViaMessageApplication(Context context, boolean updateIfNeeded) { int userId = getIncomingUserId(context); @@ -1060,7 +1061,7 @@ public final class SmsApplication { *

* Caller must pass in the correct user context if calling from a singleton service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean shouldWriteMessageForPackage(String packageName, Context context) { return !isDefaultSmsApplication(context, packageName); } diff --git a/telephony/common/com/google/android/mms/ContentType.java b/telephony/common/com/google/android/mms/ContentType.java index 4a971dd34c8f..2aec86fe67e4 100644 --- a/telephony/common/com/google/android/mms/ContentType.java +++ b/telephony/common/com/google/android/mms/ContentType.java @@ -18,6 +18,7 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.ArrayList; @@ -176,17 +177,17 @@ public class ContentType { return (null != contentType) && sSupportedContentTypes.contains(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedImageType(String contentType) { return isImageType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedAudioType(String contentType) { return isAudioType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedVideoType(String contentType) { return isVideoType(contentType) && isSupportedType(contentType); } diff --git a/telephony/common/com/google/android/mms/MmsException.java b/telephony/common/com/google/android/mms/MmsException.java index 24bceb37f590..db6d1d1e3d8a 100644 --- a/telephony/common/com/google/android/mms/MmsException.java +++ b/telephony/common/com/google/android/mms/MmsException.java @@ -18,6 +18,7 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A generic exception that is thrown by the Mms client. @@ -59,7 +60,7 @@ public class MmsException extends Exception { * @param message the detail message. * @param cause the cause. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MmsException(String message, Throwable cause) { super(message, cause); } diff --git a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java index 8693385bb032..3eda60bfbf1f 100644 --- a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java +++ b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -68,7 +69,7 @@ public class AcknowledgeInd extends GenericPdu { * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java index 8fb6a7545abf..ca1f2ebeb044 100644 --- a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java +++ b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -53,7 +54,7 @@ public class DeliveryInd extends GenericPdu { * * @return the value */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getDate() { return mPduHeaders.getLongInteger(PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java index 8c0380f77cdd..8b01cb3c4405 100644 --- a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java +++ b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import java.io.ByteArrayOutputStream; @@ -237,7 +238,7 @@ public class EncodedStringValue implements Cloneable { /** * Extract an EncodedStringValue[] from a given String. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static EncodedStringValue[] extract(String src) { String[] values = src.split(";"); diff --git a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java index 42a89c69e873..45ba4819aa24 100644 --- a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java +++ b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -116,7 +117,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addTo(EncodedStringValue value) { mPduHeaders.appendEncodedStringValue(value, PduHeaders.TO); } @@ -137,7 +138,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPriority(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.PRIORITY); } @@ -157,7 +158,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * * @param value the value */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDate(long value) { mPduHeaders.setLongInteger(value, PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java index ebd81afc0173..16d83953e723 100644 --- a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java +++ b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -72,7 +73,7 @@ public class NotifyRespInd extends GenericPdu { * @throws InvalidHeaderValueException if the value is invalid. * RuntimeException if an undeclared error occurs. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/PduBody.java b/telephony/common/com/google/android/mms/pdu/PduBody.java index f7f285f653b9..e76738b5a42f 100644 --- a/telephony/common/com/google/android/mms/pdu/PduBody.java +++ b/telephony/common/com/google/android/mms/pdu/PduBody.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -113,7 +114,7 @@ public class PduBody { * @param index index of the part to return * @return part at the specified index */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PduPart removePart(int index) { return mParts.remove(index); } @@ -142,7 +143,7 @@ public class PduBody { * @param part the part object * @return index the index of the first occurrence of the part in this body */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPartIndex(PduPart part) { return mParts.indexOf(part); } diff --git a/telephony/common/com/google/android/mms/pdu/PduPart.java b/telephony/common/com/google/android/mms/pdu/PduPart.java index 8dd976b2569f..aead141634e8 100644 --- a/telephony/common/com/google/android/mms/pdu/PduPart.java +++ b/telephony/common/com/google/android/mms/pdu/PduPart.java @@ -19,6 +19,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; +import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -164,7 +165,7 @@ public class PduPart { /** * @return The length of the data, if this object have data, else 0. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDataLength() { if(mPartData != null){ return mPartData.length; diff --git a/telephony/common/com/google/android/mms/pdu/SendReq.java b/telephony/common/com/google/android/mms/pdu/SendReq.java index 6e2f2da01791..8b5a61701377 100644 --- a/telephony/common/com/google/android/mms/pdu/SendReq.java +++ b/telephony/common/com/google/android/mms/pdu/SendReq.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import com.google.android.mms.InvalidHeaderValueException; @@ -150,7 +151,7 @@ public class SendReq extends MultimediaMessagePdu { * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCc(EncodedStringValue[] value) { mPduHeaders.setEncodedStringValues(value, PduHeaders.CC); } diff --git a/telephony/common/com/google/android/mms/util/AbstractCache.java b/telephony/common/com/google/android/mms/util/AbstractCache.java index 25862e73581e..8b9ee43b0981 100644 --- a/telephony/common/com/google/android/mms/util/AbstractCache.java +++ b/telephony/common/com/google/android/mms/util/AbstractCache.java @@ -18,6 +18,7 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import java.util.HashMap; @@ -64,7 +65,7 @@ public abstract class AbstractCache { return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public V get(K key) { if (LOCAL_LOGV) { Log.v(TAG, "Trying to get " + key + " from cache."); diff --git a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java index 0f9390daa725..d0e33984e094 100644 --- a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java +++ b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java @@ -20,6 +20,7 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.drm.DrmManagerClient; +import android.os.Build; import android.util.Log; public class DownloadDrmHelper { @@ -73,7 +74,7 @@ public class DownloadDrmHelper { * Modifies the file extension for a DRM Forward Lock file NOTE: This * function shouldn't be called if the file shouldn't be DRM converted */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String modifyDrmFwLockFileExtension(String filename) { if (filename != null) { int extensionIndex; diff --git a/telephony/common/com/google/android/mms/util/SqliteWrapper.java b/telephony/common/com/google/android/mms/util/SqliteWrapper.java index 31fe4d7683d6..e2d62f868d52 100644 --- a/telephony/common/com/google/android/mms/util/SqliteWrapper.java +++ b/telephony/common/com/google/android/mms/util/SqliteWrapper.java @@ -25,6 +25,7 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; +import android.os.Build; import android.util.Log; import android.widget.Toast; @@ -79,7 +80,7 @@ public final class SqliteWrapper { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean requery(Context context, Cursor cursor) { try { return cursor.requery(); diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 92e419707970..8ec500b4d49d 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.carrier.CarrierIdentifier; @@ -146,7 +147,7 @@ public final class EuiccProfileInfo implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public EuiccProfileInfo(String iccid, @Nullable UiccAccessRule[] accessRules, @Nullable String nickname) { if (!TextUtils.isDigitsOnly(iccid)) { diff --git a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java index 2382f657c9ee..58e1d08a2009 100644 --- a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java +++ b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java @@ -18,6 +18,7 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -50,7 +51,7 @@ public final class GetDefaultDownloadableSubscriptionListResult implements Parce * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java index d0fb51180c1d..6417c0dfcf05 100644 --- a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java +++ b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java @@ -18,6 +18,7 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -47,7 +48,7 @@ public final class GetDownloadableSubscriptionMetadataResult implements Parcelab * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl index aff8f1b7b346..a55f019bec23 100644 --- a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IDeleteSubscriptionCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl index 34b53cc71dfb..da26045be3ac 100644 --- a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl +++ b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IEraseSubscriptionsCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl index ad69ef132428..db73f8e0f0f4 100644 --- a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDefaultDownloadableSubscriptionListResult; /** @hide */ oneway interface IGetDefaultDownloadableSubscriptionListCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetDefaultDownloadableSubscriptionListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl index 01f187ed11e2..102ee3096c34 100644 --- a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDownloadableSubscriptionMetadataResult; /** @hide */ oneway interface IGetDownloadableSubscriptionMetadataCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetDownloadableSubscriptionMetadataResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEidCallback.aidl b/telephony/java/android/service/euicc/IGetEidCallback.aidl index e405a981c85a..c47cf13f75c6 100644 --- a/telephony/java/android/service/euicc/IGetEidCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEidCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IGetEidCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSuccess(String eid); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl index c0611825ff0f..291c058dfd2e 100644 --- a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl @@ -20,6 +20,6 @@ import android.telephony.euicc.EuiccInfo; /** @hide */ oneway interface IGetEuiccInfoCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSuccess(in EuiccInfo euiccInfo); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl index 0485f7be29d3..eadddb1193e8 100644 --- a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetEuiccProfileInfoListResult; /** @hide */ oneway interface IGetEuiccProfileInfoListCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetEuiccProfileInfoListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl index 340401fe89cb..ade1ccdb6b06 100644 --- a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl +++ b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IRetainSubscriptionsForFactoryResetCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl index b8f984d1c28b..1b4b658f6211 100644 --- a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface ISwitchToSubscriptionCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl index 0aa66978bb91..fda73497674c 100644 --- a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl +++ b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IUpdateSubscriptionNicknameCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 157609130c1b..b806313e32f8 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -26,6 +26,7 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; +import android.os.Build; import android.os.PersistableBundle; import android.os.RemoteException; import android.service.carrier.CarrierService; @@ -2723,7 +2724,7 @@ public class CarrierConfigManager { * Key identifying if voice call barring notification is required to be shown to the user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL = "disable_voice_barring_notification_bool"; diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index cfb9099a1c42..a3bec339794b 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -21,6 +21,7 @@ import static android.text.TextUtils.formatSimple; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; @@ -58,7 +59,7 @@ public final class CellIdentityGsm extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellIdentityGsm() { super(TAG, CellInfo.TYPE_GSM, null, null, null, null); mLac = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index bbfab433be39..bd92d00a0321 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -67,7 +67,7 @@ public final class CellIdentityLte extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellIdentityLte() { super(TAG, CellInfo.TYPE_LTE, null, null, null, null); mCi = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 1bef681619ed..3ce99facfdb1 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -36,7 +36,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { private CellSignalStrengthCdma mCellSignalStrengthCdma; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoCdma() { super(); mCellIdentityCdma = new CellIdentityCdma(); diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index c19521fdfa99..e296e613362a 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +36,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { private CellSignalStrengthGsm mCellSignalStrengthGsm; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoGsm() { super(); mCellIdentityGsm = new CellIdentityGsm(); diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 320925ea63ae..6f812341756b 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -39,7 +39,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { private CellConfigLte mCellConfig; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoLte() { super(); mCellIdentityLte = new CellIdentityLte(); diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index 9d55f109f751..3ff859b55bdd 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java @@ -53,7 +53,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private int mLevel; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellSignalStrengthGsm() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index c26936e4bdd0..47a8f72a2337 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/telephony/java/android/telephony/CellSignalStrengthLte.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.IntRange; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; @@ -107,7 +108,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P private int mParametersUseForLevel; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellSignalStrengthLte() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java index d4ed860cdafd..24dfbd028d03 100644 --- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java +++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java @@ -17,6 +17,7 @@ package android.telephony; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.text.Editable; import android.text.Selection; import android.text.TextWatcher; @@ -50,7 +51,7 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher { */ private boolean mStopFormatting; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AsYouTypeFormatter mFormatter; /** diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 58e368bcc444..ed09d538a3b1 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -27,6 +27,7 @@ import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import android.os.PersistableBundle; import android.provider.Contacts; import android.provider.ContactsContract; @@ -1832,7 +1833,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static boolean isPotentialEmergencyNumber(int subId, String number) { // Check against the emergency numbers listed by the RIL / SIM, @@ -2108,7 +2109,7 @@ public class PhoneNumberUtils { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isPotentialLocalEmergencyNumber(Context context, String number) { return isPotentialLocalEmergencyNumber(context, getDefaultVoiceSubId(), number); } @@ -2138,7 +2139,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static boolean isPotentialLocalEmergencyNumber(Context context, int subId, String number) { diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index fd9f46011c7e..9ea624b60988 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -73,7 +73,7 @@ public final class PreciseDataConnectionState implements Parcelable { */ @TestApi @Deprecated - @UnsupportedAppUsage // (maxTargetSdk = Build.VERSION_CODES.Q) + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) // (maxTargetSdk = Build.VERSION_CODES.Q) // FIXME: figure out how to remove the UnsupportedAppUsage and delete this constructor public PreciseDataConnectionState(@DataState int state, @NetworkType int networkType, diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 90ddf2cd4730..f1e90118a559 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -92,7 +92,7 @@ public class RadioAccessFamily implements Parcelable { * {@link TelephonyManager.NetworkTypeBitMask}. It's a bit mask value to represent the support * type. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RadioAccessFamily(int phoneId, int radioAccessFamily) { mPhoneId = phoneId; mRadioAccessFamily = radioAccessFamily; @@ -103,7 +103,7 @@ public class RadioAccessFamily implements Parcelable { * * @return phone ID */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPhoneId() { return mPhoneId; } @@ -113,7 +113,7 @@ public class RadioAccessFamily implements Parcelable { * * @return radio access family */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @TelephonyManager.NetworkTypeBitMask int getRadioAccessFamily() { return mRadioAccessFamily; } @@ -168,7 +168,7 @@ public class RadioAccessFamily implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TelephonyManager.NetworkTypeBitMask public static int getRafFromNetworkType(@PrefNetworkMode int type) { switch (type) { diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 3e7464739f9f..41b3ee672f46 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -956,7 +956,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String rilRadioTechnologyToString(int rt) { String rtString; @@ -1167,7 +1167,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVoiceRegState(int state) { mVoiceRegState = state; if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setVoiceRegState=" + mVoiceRegState); @@ -1198,7 +1198,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVoiceRoaming(boolean roaming) { setVoiceRoamingType(roaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1219,7 +1219,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataRoaming(boolean dataRoaming) { setDataRoamingType(dataRoaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1291,7 +1291,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOperatorAlphaLong(@Nullable String longName) { mOperatorAlphaLong = longName; } @@ -1476,7 +1476,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRilVoiceRadioTechnology() { NetworkRegistrationInfo wwanRegInfo = getNetworkRegistrationInfo( NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); @@ -1486,7 +1486,7 @@ public class ServiceState implements Parcelable { return RIL_RADIO_TECHNOLOGY_UNKNOWN; } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRilDataRadioTechnology() { return networkTypeToRilRadioTechnology(getDataNetworkType()); } @@ -1763,7 +1763,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean bitmaskHasTech(int bearerBitmask, int radioTech) { if (bearerBitmask == 0) { return true; @@ -1849,7 +1849,7 @@ public class ServiceState implements Parcelable { * voice SS. The voice SS is only used if it is IN_SERVICE (otherwise the base SS is returned). * @hide * */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ServiceState mergeServiceStates(ServiceState baseSs, ServiceState voiceSs) { if (voiceSs.mVoiceRegState != STATE_IN_SERVICE) { return baseSs; diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 2b17de64dae9..964cf76d17f6 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -591,7 +591,7 @@ public final class SmsManager { * @throws IllegalArgumentException if destinationAddress or text are empty * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendTextMessage( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 717a9b155cbf..cfb29f124b43 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -29,6 +29,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Binder; +import android.os.Build; import android.text.TextUtils; import com.android.internal.telephony.GsmAlphabet; @@ -133,7 +134,7 @@ public class SmsMessage { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mSubId = 0; /** set Subscription information @@ -1054,7 +1055,7 @@ public class SmsMessage { * * @return true if Cdma format should be used for MO SMS, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static boolean useCdmaFormatForMoSms(int subId) { SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId); if (!smsManager.isImsSmsSupported()) { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 2547392d2c1f..6441565d731b 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -32,6 +32,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Typeface; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -356,7 +357,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the name displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisplayName(CharSequence name) { this.mDisplayName = name; } @@ -381,7 +382,7 @@ public class SubscriptionInfo implements Parcelable { * NAME_SOURCE_USER_INPUT. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNameSource() { return this.mNameSource; } @@ -448,7 +449,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the color displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIconTint(int iconTint) { this.mIconTint = iconTint; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 2e51ef16baf1..7f87019dbbe2 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -127,7 +127,7 @@ public class SubscriptionManager { public static final int MAX_SUBSCRIPTION_ID_VALUE = DEFAULT_SUBSCRIPTION_ID - 1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = SimInfo.CONTENT_URI; /** @hide */ @@ -1826,7 +1826,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int setDisplayNumber(String number, int subId) { if (number == null) { logd("[setDisplayNumber]- fail"); @@ -1844,7 +1844,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int setDataRoaming(int roaming, int subId) { if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId); return setSubscriptionPropertyHelper(subId, "setDataRoaming", @@ -1989,13 +1989,13 @@ public class SubscriptionManager { * @return the SubscriptionInfo for the default voice subscription. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SubscriptionInfo getDefaultVoiceSubscriptionInfo() { return getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId()); } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getDefaultVoicePhoneId() { return getPhoneId(getDefaultVoiceSubscriptionId()); } @@ -2047,7 +2047,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDefaultSmsPhoneId() { return getPhoneId(getDefaultSmsSubscriptionId()); } @@ -2181,7 +2181,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isValidPhoneId(int phoneId) { return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount(); } @@ -2200,7 +2200,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(EXTRA_SLOT_INDEX, phoneId); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index aa68dcf5a88e..a27170d476d0 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2807,7 +2807,7 @@ public class TelephonyManager { /** Current network is IWLAN */ public static final int NETWORK_TYPE_IWLAN = TelephonyProtoEnums.NETWORK_TYPE_IWLAN; // = 18. /** Current network is LTE_CA {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NETWORK_TYPE_LTE_CA = TelephonyProtoEnums.NETWORK_TYPE_LTE_CA; // = 19. /** * Current network is NR (New Radio) 5G. @@ -6772,7 +6772,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean nvResetConfig(int resetType) { try { ITelephony telephony = getITelephony(); @@ -7041,7 +7041,7 @@ public class TelephonyManager { * @return The value at the given index of settings. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getIntAtIndex(android.content.ContentResolver cr, String name, int index) throws android.provider.Settings.SettingNotFoundException { @@ -7074,7 +7074,7 @@ public class TelephonyManager { * @return true if the value was set, false on database errors * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putIntAtIndex(android.content.ContentResolver cr, String name, int index, int value) { String data = ""; @@ -7146,7 +7146,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getTelephonyProperty(String property, String defaultVal) { String propVal = SystemProperties.get(property); return TextUtils.isEmpty(propVal) ? defaultVal : propVal; @@ -7445,7 +7445,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable IImsRegistration getImsRegistration(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7465,7 +7465,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable IImsConfig getImsConfig(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7484,7 +7484,7 @@ public class TelephonyManager { * @param Registration state * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setImsRegistrationState(boolean registered) { try { ITelephony telephony = getITelephony(); @@ -8151,7 +8151,7 @@ public class TelephonyManager { * @deprecated Use {@link #setPreferredNetworkTypeBitmask} instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setPreferredNetworkType(int subId, @PrefNetworkMode int networkType) { try { ITelephony telephony = getITelephony(); @@ -8525,7 +8525,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setRoamingOverride(List gsmRoamingList, List gsmNonRoamingList, List cdmaRoamingList, List cdmaNonRoamingList) { @@ -9815,7 +9815,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSimOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10187,7 +10187,7 @@ public class TelephonyManager { * @param name the alphabetic name of current registered operator. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkOperatorNameForPhone(int phoneId, String name) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10212,7 +10212,7 @@ public class TelephonyManager { * @param operator the numeric name (MCC+MNC) of current registered operator * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10237,7 +10237,7 @@ public class TelephonyManager { * @param isRoaming is network in romaing state or not * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkRoamingForPhone(int phoneId, boolean isRoaming) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10266,7 +10266,7 @@ public class TelephonyManager { * @param type the network type currently in use on the device for data transmission * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataNetworkTypeForPhone(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( diff --git a/telephony/java/android/telephony/euicc/DownloadableSubscription.java b/telephony/java/android/telephony/euicc/DownloadableSubscription.java index 23d46ba09599..52b31d7f9611 100644 --- a/telephony/java/android/telephony/euicc/DownloadableSubscription.java +++ b/telephony/java/android/telephony/euicc/DownloadableSubscription.java @@ -19,6 +19,7 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.UiccAccessRule; @@ -61,7 +62,7 @@ public final class DownloadableSubscription implements Parcelable { */ @Nullable @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final String encodedActivationCode; @Nullable private String confirmationCode; @@ -191,7 +192,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCarrierName(String carrierName) { this.carrierName = carrierName; } @@ -238,7 +239,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAccessRules(UiccAccessRule[] accessRules) { this.accessRules = Arrays.asList(accessRules); } diff --git a/telephony/java/android/telephony/euicc/EuiccInfo.java b/telephony/java/android/telephony/euicc/EuiccInfo.java index 467d2689cd3c..08de2051975e 100644 --- a/telephony/java/android/telephony/euicc/EuiccInfo.java +++ b/telephony/java/android/telephony/euicc/EuiccInfo.java @@ -17,6 +17,7 @@ package android.telephony.euicc; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +45,7 @@ public final class EuiccInfo implements Parcelable { }; @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final String osVersion; /** diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index 3f9c8d26ca91..1c2cac27eb37 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -128,26 +129,26 @@ public final class ImsCallForwardInfo implements Parcelable { public @interface TypeOfAddress{} /**@hide*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallForwardReasons int mCondition; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallForwardStatus int mStatus; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @TypeOfAddress int mToA; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @ImsSsData.ServiceClassFlags int mServiceClass; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String mNumber; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mTimeSeconds; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsCallForwardInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 47a0ab61f970..5b54719afbfb 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -356,10 +357,10 @@ public final class ImsCallProfile implements Parcelable { /** @hide */ public int mServiceType; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mCallType; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallRestrictCause int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; /** @@ -467,10 +468,10 @@ public final class ImsCallProfile implements Parcelable { * a {@link android.os.Binder}. */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle mCallExtras; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsStreamMediaProfile mMediaProfile; /** @hide */ @@ -823,7 +824,7 @@ public final class ImsCallProfile implements Parcelable { * See {@link #presentationToOir(int)}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int presentationToOIR(int presentation) { switch (presentation) { case PhoneConstants.PRESENTATION_RESTRICTED: diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index 30389a290368..184477af0b46 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -1353,7 +1353,7 @@ public final class ImsReasonInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsReasonInfo(int code, int extraCode) { mCode = code; mExtraCode = extraCode; diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index 27b56b8c5b47..bc53b628131e 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -155,10 +156,10 @@ public final class ImsSsInfo implements Parcelable { // 0: disabled, 1: enabled /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mStatus; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String mIcbNum; /** @hide */ public int mProvisionStatus = SERVICE_PROVISIONING_UNKNOWN; @@ -166,7 +167,7 @@ public final class ImsSsInfo implements Parcelable { private int mClirOutgoingState = CLIR_OUTGOING_DEFAULT; /**@hide*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsSsInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index 131cb1a505fb..2792f790e13b 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -19,6 +19,7 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -84,16 +85,16 @@ public final class ImsStreamMediaProfile implements Parcelable { // Audio related information /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mAudioQuality; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mAudioDirection; // Video related information /** @hide */ public int mVideoQuality; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mVideoDirection; // Rtt related information /** @hide */ @@ -164,7 +165,7 @@ public final class ImsStreamMediaProfile implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsStreamMediaProfile() { mAudioQuality = AUDIO_QUALITY_NONE; mAudioDirection = DIRECTION_SEND_RECEIVE; diff --git a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java index 2fca4096f447..64bdcbba265a 100644 --- a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java +++ b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java @@ -19,6 +19,7 @@ package android.telephony.ims; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -179,7 +180,7 @@ public abstract class ImsVideoCallProvider { * Returns binder object which can be used across IPC methods. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final IImsVideoCallProvider getInterface() { return mBinder; } diff --git a/telephony/java/android/telephony/ims/compat/ImsService.java b/telephony/java/android/telephony/ims/compat/ImsService.java index 41d1d726b3f4..303ba183c12e 100644 --- a/telephony/java/android/telephony/ims/compat/ImsService.java +++ b/telephony/java/android/telephony/ims/compat/ImsService.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.app.Service; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; +import android.os.Build; import android.os.IBinder; import android.telephony.CarrierConfigManager; import android.telephony.ims.compat.feature.ImsFeature; @@ -86,7 +87,7 @@ public class ImsService extends Service { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected final IBinder mImsServiceController = new IImsServiceController.Stub() { @Override @@ -122,7 +123,7 @@ public class ImsService extends Service { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsService() { } diff --git a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java index 5a9e8e2dafc4..6038a18a28b1 100644 --- a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.feature; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.IInterface; import android.os.RemoteException; import android.telephony.SubscriptionManager; @@ -78,12 +79,12 @@ public abstract class ImsFeature { mSlotId = slotId; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getFeatureState() { return mState; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected final void setFeatureState(@ImsState int state) { if (mState != state) { mState = state; diff --git a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java index b52c37106049..d32e9b7f5122 100644 --- a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java @@ -18,6 +18,7 @@ package android.telephony.ims.compat.feature; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.ims.ImsCallProfile; @@ -48,7 +49,7 @@ public class MMTelFeature extends ImsFeature { // Lock for feature synchronization private final Object mLock = new Object(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MMTelFeature() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java index 06aa6428b1b2..4b8f39817f88 100755 --- a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.stub; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.CallQuality; @@ -45,7 +46,7 @@ import com.android.ims.internal.IImsVideoCallProvider; public class ImsCallSessionImplBase extends IImsCallSession.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsCallSessionImplBase() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java index 0c7264697cd3..a8278ae0d734 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.RemoteException; import android.util.Log; @@ -59,7 +60,7 @@ public class ImsConfigImplBase { ImsConfigStub mImsConfigStub; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsConfigImplBase(Context context) { mImsConfigStub = new ImsConfigStub(this, context); } @@ -164,7 +165,7 @@ public class ImsConfigImplBase { public void setVideoQuality(int quality, ImsConfigListener listener) throws RemoteException { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IImsConfig getIImsConfig() { return mImsConfigStub; } /** diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java index ce291d4d14c6..c689460a5cec 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java @@ -17,6 +17,7 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.ImsCallForwardInfo; @@ -40,7 +41,7 @@ import com.android.ims.internal.IImsUtListener; public class ImsUtListenerImplBase extends IImsUtListener.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsUtListenerImplBase() { } diff --git a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl index c140127237d4..a4abfac74177 100755 --- a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl +++ b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl @@ -26,17 +26,17 @@ import android.telephony.mbms.StreamingServiceInfo; */ interface IMbmsStreamingService { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int initialize(IMbmsStreamingSessionCallback callback, int subId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int requestUpdateStreamingServices(int subId, in List serviceClasses); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int startStreaming(int subId, String serviceId, IStreamingServiceCallback callback); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Uri getPlaybackUri(int subId, String serviceId); void stopStreaming(int subId, String serviceId); diff --git a/telephony/java/com/android/ims/ImsConfigListener.aidl b/telephony/java/com/android/ims/ImsConfigListener.aidl index 4f229df252a6..df8144c15d77 100644 --- a/telephony/java/com/android/ims/ImsConfigListener.aidl +++ b/telephony/java/com/android/ims/ImsConfigListener.aidl @@ -47,7 +47,7 @@ oneway interface ImsConfigListener { * * @return void. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSetFeatureResponse(int feature, int network, int value, int status); /** diff --git a/telephony/java/com/android/ims/ImsUtInterface.java b/telephony/java/com/android/ims/ImsUtInterface.java index 4a5380e4551b..5dfbce3dd65f 100644 --- a/telephony/java/com/android/ims/ImsUtInterface.java +++ b/telephony/java/com/android/ims/ImsUtInterface.java @@ -17,6 +17,7 @@ package com.android.ims; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.telephony.ims.ImsCallForwardInfo; @@ -124,7 +125,7 @@ public interface ImsUtInterface { * Retrieves the configuration of the call forward. * The return value of ((AsyncResult)result.obj) is an array of {@link ImsCallForwardInfo}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void queryCallForward(int condition, String number, Message result); /** diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 1c62cc48093c..8afd85633322 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -34,47 +34,47 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the basic session operation (setup / terminate). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionProgressing(in IImsCallSession session, in ImsStreamMediaProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionStarted(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionStartFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionTerminated(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of the call hold/resume operation. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHeld(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHoldFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHoldReceived(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumed(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile); /** * Notifies the result of call merge operation. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeStarted(in IImsCallSession session, in IImsCallSession newSession, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeComplete(in IImsCallSession session); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of call upgrade / downgrade or any other call updates. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionUpdated(in IImsCallSession session, in ImsCallProfile profile); void callSessionUpdateFailed(in IImsCallSession session, @@ -95,9 +95,9 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the participant invitation / removal to/from the conference session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionInviteParticipantsRequestDelivered(in IImsCallSession session); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionInviteParticipantsRequestFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); void callSessionRemoveParticipantsRequestDelivered(in IImsCallSession session); @@ -107,7 +107,7 @@ oneway interface IImsCallSessionListener { /** * Notifies the changes of the conference info. in the conference session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionConferenceStateUpdated(in IImsCallSession session, in ImsConferenceState state); @@ -120,10 +120,10 @@ oneway interface IImsCallSessionListener { /** * Notifies of handover information for this call */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHandover(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHandoverFailed(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); void callSessionMayHandover(in IImsCallSession session, @@ -137,7 +137,7 @@ oneway interface IImsCallSessionListener { * - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO} * - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionTtyModeReceived(in IImsCallSession session, in int mode); /** @@ -146,13 +146,13 @@ oneway interface IImsCallSessionListener { * @param session The call session. * @param isMultiParty {@code true} if the session became multiparty, {@code false} otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMultipartyStateChanged(in IImsCallSession session, in boolean isMultiParty); /** * Notifies the supplementary service information for the current session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionSuppServiceReceived(in IImsCallSession session, in ImsSuppServiceNotification suppSrvNotification); diff --git a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl index a7a62a625478..216b45c37458 100644 --- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl @@ -32,7 +32,7 @@ oneway interface IImsRegistrationListener { * * @deprecated see {@link registrationConnectedWithRadioTech} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationConnected(); /** @@ -48,7 +48,7 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationConnectedWithRadioTech(int imsRadioTech); /** @@ -57,14 +57,14 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationProgressingWithRadioTech(int imsRadioTech); /** * Notifies the application when the device is disconnected from the IMS network. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationDisconnected(in ImsReasonInfo imsReasonInfo); /** @@ -98,7 +98,7 @@ oneway interface IImsRegistrationListener { * @param enabledFeatures features enabled as defined in com.android.ims.ImsConfig#FeatureConstants. * @param disabledFeatures features disabled as defined in com.android.ims.ImsConfig#FeatureConstants. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationFeatureCapabilityChanged(int serviceClass, in int[] enabledFeatures, in int[] disabledFeatures); @@ -106,13 +106,13 @@ oneway interface IImsRegistrationListener { * Updates the application with the waiting voice message count. * @param count The number of waiting voice messages. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void voiceMessageCountUpdate(int count); /** * Notifies the application when the list of URIs associated with IMS client is updated. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationAssociatedUriChanged(in Uri[] uris); /** @@ -123,6 +123,6 @@ oneway interface IImsRegistrationListener { * attempted. * @param imsReasonInfo Reason for the failure. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationChangeFailed(in int targetAccessTech, in ImsReasonInfo imsReasonInfo); } diff --git a/telephony/java/com/android/ims/internal/IImsUtListener.aidl b/telephony/java/com/android/ims/internal/IImsUtListener.aidl index 9a12ceee5212..604adf84817b 100644 --- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl @@ -31,38 +31,38 @@ oneway interface IImsUtListener { /** * Notifies the result of the supplementary service configuration udpate. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationUpdated(in IImsUt ut, int id); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationUpdateFailed(in IImsUt ut, int id, in ImsReasonInfo error); /** * Notifies the result of the supplementary service configuration query. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationQueried(in IImsUt ut, int id, in Bundle ssInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationQueryFailed(in IImsUt ut, int id, in ImsReasonInfo error); void lineIdentificationSupplementaryServiceResponse(int id, in ImsSsInfo config); /** * Notifies the status of the call barring supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallBarringQueried(in IImsUt ut, int id, in ImsSsInfo[] cbInfo); /** * Notifies the status of the call forwarding supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallForwardQueried(in IImsUt ut, int id, in ImsCallForwardInfo[] cfInfo); /** * Notifies the status of the call waiting supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallWaitingQueried(in IImsUt ut, int id, in ImsSsInfo[] cwInfo); diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl index cf8d63794546..5d575abda979 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl @@ -31,25 +31,25 @@ import android.telecom.VideoProfile; * {@hide} */ oneway interface IImsVideoCallCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void receiveSessionModifyRequest(in VideoProfile videoProfile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void receiveSessionModifyResponse(int status, in VideoProfile requestedProfile, in VideoProfile responseProfile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void handleCallSessionEvent(int event); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changePeerDimensions(int width, int height); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeCallDataUsage(long dataUsage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeCameraCapabilities(in VideoProfile.CameraCapabilities cameraCapabilities); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeVideoQuality(int videoQuality); } diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl index 4d20bd675628..44d83897390a 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl @@ -41,7 +41,7 @@ import com.android.ims.internal.IImsVideoCallCallback; * @hide */ oneway interface IImsVideoCallProvider { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setCallback(IImsVideoCallCallback callback); void setCamera(String cameraId, int uid); diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl index 76ebc0f3ac2f..89620eaaf609 100644 --- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl @@ -24,7 +24,7 @@ import android.os.PersistableBundle; interface ICarrierConfigLoader { /** @deprecated Use {@link #getConfigForSubIdWithFeature(int, String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) PersistableBundle getConfigForSubId(int subId, String callingPackage); PersistableBundle getConfigForSubIdWithFeature(int subId, String callingPackage, diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index 28ef235bf398..09f9b4212c03 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -25,7 +25,7 @@ import android.telephony.ImsiEncryptionInfo; interface IPhoneSubInfo { /** @deprecated Use {@link #getDeviceIdWithFeature(String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getDeviceId(String callingPackage); /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index d33835f27053..a38d5b6f2141 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -96,7 +96,7 @@ interface ITelephony { void call(String callingPackage, String number); /** @deprecated Use {@link #isRadioOnWithFeature(String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isRadioOn(String callingPackage); /** @@ -110,7 +110,7 @@ interface ITelephony { /** * @deprecated Use {@link #isRadioOnForSubscriberWithFeature(int, String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isRadioOnForSubscriber(int subId, String callingPackage); /** @@ -190,7 +190,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if MMI command is executed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean handlePinMmiForSubscriber(int subId, String dialString); /** @@ -614,7 +614,7 @@ interface ITelephony { * successful iccOpenLogicalChannel. * @return true if the channel was closed successfully. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean iccCloseLogicalChannel(int subId, int channel); /** @@ -656,7 +656,7 @@ interface ITelephony { * @return The APDU response from the ICC card with the status appended at * the end. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String iccTransmitApduLogicalChannel(int subId, int channel, int cla, int instruction, int p1, int p2, int p3, String data); diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index 2ca459811e04..a6f0f667d0cd 100644 --- a/telephony/java/com/android/internal/telephony/OperatorInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -35,37 +35,37 @@ public class OperatorInfo implements Parcelable { FORBIDDEN; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorAlphaLong; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorAlphaShort; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorNumeric; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private State mState = State.UNKNOWN; private int mRan = AccessNetworkType.UNKNOWN; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorAlphaLong() { return mOperatorAlphaLong; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorAlphaShort() { return mOperatorAlphaShort; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorNumeric() { return mOperatorNumeric; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public State getState() { return mState; @@ -75,7 +75,7 @@ public class OperatorInfo implements Parcelable { return mRan; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -97,7 +97,7 @@ public class OperatorInfo implements Parcelable { mRan = ran; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -124,7 +124,7 @@ public class OperatorInfo implements Parcelable { /** * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static State rilStateToState(String s) { if (s.equals("unknown")) { return State.UNKNOWN; @@ -180,7 +180,7 @@ public class OperatorInfo implements Parcelable { * Implement the Parcelable interface * Method to deserialize a OperatorInfo object, or an array thereof. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Creator CREATOR = new Creator() { @Override diff --git a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java index f8ab87d042eb..2109c6a4739c 100644 --- a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java +++ b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java @@ -19,6 +19,7 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.XmlResourceParser; +import android.os.Build; import android.util.SparseIntArray; import com.android.internal.telephony.cdma.sms.UserData; @@ -28,15 +29,15 @@ import com.android.telephony.Rlog; public class Sms7BitEncodingTranslator { private static final String TAG = "Sms7BitEncodingTranslator"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE; private static boolean mIs7BitTranslationTableLoaded = false; private static SparseIntArray mTranslationTable = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableCommon = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableGSM = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableCDMA = null; // Parser variables diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index 084882b10c9b..6d46ed3b8416 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -39,18 +39,18 @@ public abstract class SmsMessageBase { Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*"); /** {@hide} The address of the SMSC. May be null */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mScAddress; /** {@hide} The address of the sender */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected SmsAddress mOriginatingAddress; /** {@hide} The address of the receiver */ protected SmsAddress mRecipientAddress; /** {@hide} The message body as a string. May be null if the message isn't text */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mMessageBody; /** {@hide} */ @@ -76,21 +76,21 @@ public abstract class SmsMessageBase { protected byte[] mUserData; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected SmsHeader mUserDataHeader; // "Message Waiting Indication Group" // 23.038 Section 4 /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mIsMwi; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mMwiSense; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mMwiDontStore; /** @@ -104,7 +104,7 @@ public abstract class SmsMessageBase { protected int mIndexOnIcc = -1; /** TP-Message-Reference - Message Reference of sent message. @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mMessageRef; @UnsupportedAppUsage diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index a34e474e666e..f636276f11b8 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -233,7 +233,7 @@ public class SmsMessage extends SmsMessageBase { * null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, String message, boolean statusReportRequested, SmsHeader smsHeader, int priority) { @@ -316,7 +316,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing null SC address and the encoded message. Returns * null on encode error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String destAddr, UserData userData, boolean statusReportRequested, int priority) { return privateGetSubmitPdu(destAddr, statusReportRequested, userData, priority); diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index d186fcf63cfe..851bc020a1da 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -18,6 +18,7 @@ package com.android.internal.telephony.cdma.sms; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; +import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; @@ -1919,7 +1920,7 @@ public final class BearerData { * @return the number of bits to read from the stream * @throws CodingException if the specified encoding is not supported */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static int getBitsForNumFields(int msgEncoding, int numFields) throws CodingException { switch (msgEncoding) { diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java index d1903450261b..7e2cc6af4182 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java @@ -17,6 +17,7 @@ package com.android.internal.telephony.gsm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbEtwsInfo; @@ -111,7 +112,7 @@ public class SmsCbHeader { private final int mSerialNumber; /** The Message Identifier in 3GPP is the same as the Service Category in CDMA. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMessageIdentifier; private final int mDataCodingScheme; @@ -130,7 +131,7 @@ public class SmsCbHeader { /** CMAS warning notification info. */ private final SmsCbCmasInfo mCmasInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SmsCbHeader(byte[] pdu) throws IllegalArgumentException { if (pdu == null || pdu.length < PDU_HEADER_LENGTH) { throw new IllegalArgumentException("Illegal PDU"); @@ -228,17 +229,17 @@ public class SmsCbHeader { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getGeographicalScope() { return mGeographicalScope; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSerialNumber() { return mSerialNumber; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getServiceCategory() { return mMessageIdentifier; } @@ -251,12 +252,12 @@ public class SmsCbHeader { return mDataCodingSchemeStructedData; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPageIndex() { return mPageIndex; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNumberOfPages() { return mNrOfPages; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index e3df903b7f4f..b51e8d3d3c5d 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -266,7 +266,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -292,7 +292,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -491,7 +491,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing the encoded SC address if applicable and the * encoded message. Returns null on encode error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, int validityPeriod) { @@ -774,9 +774,9 @@ public class SmsMessage extends SmsMessageBase { } private static class PduParser { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) byte mPdu[]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCur; SmsHeader mUserDataHeader; byte[] mUserData; @@ -1168,14 +1168,14 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public int getStatus() { return mStatus; } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public boolean isStatusReportMessage() { return mIsStatusReportMessage; diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java index 1d136924aa2c..d79225fe5369 100644 --- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java @@ -21,6 +21,7 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.graphics.Bitmap; import android.graphics.Color; +import android.os.Build; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet; @@ -385,7 +386,7 @@ public class IccUtils { return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int hexCharToInt(char c) { if (c >= '0' && c <= '9') return (c - '0'); diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index b3ed8ac09034..7329c16d68d0 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -187,7 +187,7 @@ interface IWifiManager void factoryReset(String packageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Network getCurrentNetwork(); byte[] retrieveBackupData(); diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index 329ca37407de..4c23286258d8 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -22,6 +22,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.wifi.WifiAnnotations.ChannelWidth; import android.net.wifi.WifiAnnotations.WifiStandard; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -381,7 +382,7 @@ public final class ScanResult implements Parcelable { * @deprecated use is80211mcResponder() instead * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean is80211McRTTResponder; /** @@ -772,47 +773,47 @@ public final class ScanResult implements Parcelable { */ public static class InformationElement { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_SSID = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_SUPPORTED_RATES = 1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_TIM = 5; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_BSS_LOAD = 11; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_ERP = 42; /** @hide */ public static final int EID_HT_CAPABILITIES = 45; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_RSN = 48; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_EXTENDED_SUPPORTED_RATES = 50; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_HT_OPERATION = 61; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_INTERWORKING = 107; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_ROAMING_CONSORTIUM = 111; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_EXTENDED_CAPS = 127; /** @hide */ public static final int EID_VHT_CAPABILITIES = 191; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_VHT_OPERATION = 192; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_VSA = 221; /** @hide */ public static final int EID_EXTENSION_PRESENT = 255; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index fd4e1ddac3a2..9a8a5ad4b41f 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -906,7 +906,7 @@ public class WifiConfiguration implements Parcelable { * @hide * Number of reports indicating no Internet Access */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int numNoInternetAccessReports; /** @@ -926,7 +926,7 @@ public class WifiConfiguration implements Parcelable { * this configuration and selects "don't ask again". * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean noInternetAccessExpected; /** @@ -966,7 +966,7 @@ public class WifiConfiguration implements Parcelable { * @deprecated only kept for @UnsupportedAppUsage * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean selfAdded; /** diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 2ca2d1e39049..78bf88b7ca78 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1055,7 +1055,7 @@ public class WifiManager { * @see #ACTION_LINK_CONFIGURATION_CHANGED * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LINK_CONFIGURATION_CHANGED_ACTION = "android.net.wifi.LINK_CONFIGURATION_CHANGED"; @@ -1265,7 +1265,7 @@ public class WifiManager { * change is significant enough to change the RSSI signal level. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int RSSI_LEVELS = 5; //TODO (b/146346676): This needs to be removed, not used in the code. diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java index d47989235f0b..d3a6bac2513f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.MacAddress; import android.net.wifi.WpsInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -138,7 +139,7 @@ public class WifiP2pConfig implements Parcelable { public int groupOwnerIntent = GROUP_OWNER_INTENT_AUTO; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int netId = WifiP2pGroup.NETWORK_ID_PERSISTENT; /** diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java index 710175fee747..567637af02c7 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java @@ -19,6 +19,7 @@ package android.net.wifi.p2p; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -185,7 +186,7 @@ public class WifiP2pDevice implements Parcelable { * Note: The events formats can be looked up in the wpa_supplicant code * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public WifiP2pDevice(String string) throws IllegalArgumentException { String[] tokens = string.split("[ \n]"); Matcher match; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java index ededf67fec7f..e7866e618089 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java @@ -17,6 +17,7 @@ package android.net.wifi.p2p; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -83,7 +84,7 @@ public class WifiP2pDeviceList implements Parcelable { * @param device to be updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void update(WifiP2pDevice device) { updateSupplicantDetails(device); mDevices.get(device.deviceAddress).status = device.status; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index ad38c5af07fc..13ac7a0bf966 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -399,7 +399,7 @@ public class WifiP2pManager { public static final int CANCEL_CONNECT_SUCCEEDED = BASE + 12; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CREATE_GROUP = BASE + 13; /** @hide */ public static final int CREATE_GROUP_FAILED = BASE + 14; @@ -1105,7 +1105,7 @@ public class WifiP2pManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int putListener(Object listener) { if (listener == null) return INVALID_LISTENER_KEY; int key; @@ -1417,7 +1417,7 @@ public class WifiP2pManager { * {@link ActionListener#onSuccess} or {@link ActionListener#onFailure}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startWps(Channel c, WpsInfo wps, ActionListener listener) { checkChannel(c); c.mAsyncChannel.sendMessage(START_WPS, 0, c.putListener(listener), wps); @@ -1698,7 +1698,7 @@ public class WifiP2pManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWFDInfo(@NonNull Channel c, @NonNull WifiP2pWfdInfo wfdInfo, @Nullable ActionListener listener) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java index 37b442baeb3f..5d018e75488e 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java @@ -170,7 +170,7 @@ public class WifiP2pServiceInfo implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceInfo createFromParcel(Parcel in) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java index 68cbb88037b0..dea0477cf09b 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java @@ -265,7 +265,7 @@ public class WifiP2pServiceRequest implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceRequest createFromParcel(Parcel in) { -- cgit v1.2.3-59-g8ed1b From 050275cd83f4a66dc3705714ccbe8db025626ce8 Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Wed, 28 Oct 2020 19:38:11 +0000 Subject: Revert "Add maxTargetSdk restriction to unused APIs." This reverts commit 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6. Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397 Bug: 171886397 Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672 --- .../framework/java/android/app/IAlarmManager.aidl | 6 +- .../framework/java/android/app/job/JobInfo.java | 10 +- .../java/android/os/IDeviceIdleController.aidl | 4 +- .../AccessibilityServiceInfo.java | 2 +- core/java/android/accounts/Account.java | 5 +- core/java/android/accounts/AccountManager.java | 6 +- core/java/android/animation/Animator.java | 3 +- core/java/android/app/Activity.java | 16 +-- core/java/android/app/ActivityManager.java | 32 +++--- core/java/android/app/ActivityThread.java | 10 +- core/java/android/app/AppOpsManager.java | 10 +- core/java/android/app/Application.java | 29 +++-- .../android/app/ApplicationPackageManager.java | 4 +- core/java/android/app/ContextImpl.java | 2 +- core/java/android/app/DialogFragment.java | 5 +- core/java/android/app/DownloadManager.java | 6 +- core/java/android/app/Fragment.java | 2 +- core/java/android/app/FragmentController.java | 3 +- core/java/android/app/FragmentManager.java | 2 +- core/java/android/app/IActivityManager.aidl | 48 ++++---- core/java/android/app/IAppTask.aidl | 2 +- core/java/android/app/IAssistDataReceiver.aidl | 4 +- core/java/android/app/INotificationManager.aidl | 2 +- core/java/android/app/IStopUserCallback.aidl | 2 +- core/java/android/app/ITransientNotification.aidl | 2 +- core/java/android/app/IWallpaperManager.aidl | 2 +- core/java/android/app/Instrumentation.java | 8 +- core/java/android/app/KeyguardManager.java | 2 +- core/java/android/app/LoadedApk.java | 14 +-- core/java/android/app/NativeActivity.java | 12 +- core/java/android/app/Notification.java | 2 +- core/java/android/app/NotificationManager.java | 2 +- core/java/android/app/PackageDeleteObserver.java | 3 +- core/java/android/app/PendingIntent.java | 2 +- core/java/android/app/QueuedWork.java | 3 +- core/java/android/app/SearchManager.java | 3 +- core/java/android/app/SharedPreferencesImpl.java | 2 +- core/java/android/app/StatusBarManager.java | 11 +- core/java/android/app/TaskInfo.java | 3 +- core/java/android/app/TaskStackListener.java | 29 +++-- core/java/android/app/UiAutomationConnection.java | 3 +- core/java/android/app/VrManager.java | 3 +- core/java/android/app/WallpaperManager.java | 2 +- core/java/android/app/admin/DeviceAdminInfo.java | 2 +- .../android/app/admin/DevicePolicyManager.java | 16 +-- core/java/android/app/admin/SecurityLog.java | 3 +- core/java/android/app/backup/BackupDataOutput.java | 3 +- core/java/android/app/backup/FullBackup.java | 3 +- .../android/app/backup/FullBackupDataOutput.java | 3 +- core/java/android/app/backup/IBackupManager.aidl | 16 +-- .../app/servertransaction/ActivityResultItem.java | 3 +- .../app/servertransaction/NewIntentItem.java | 3 +- .../java/android/app/usage/IUsageStatsManager.aidl | 8 +- .../android/app/usage/NetworkStatsManager.java | 5 +- core/java/android/appwidget/AppWidgetHost.java | 5 +- core/java/android/appwidget/AppWidgetHostView.java | 3 +- core/java/android/appwidget/AppWidgetManager.java | 5 +- core/java/android/bluetooth/BluetoothA2dp.java | 22 ++-- core/java/android/bluetooth/BluetoothA2dpSink.java | 3 +- core/java/android/bluetooth/BluetoothAdapter.java | 7 +- .../android/bluetooth/BluetoothCodecStatus.java | 9 +- core/java/android/bluetooth/BluetoothDevice.java | 25 ++--- core/java/android/bluetooth/BluetoothGatt.java | 6 +- .../android/bluetooth/BluetoothGattService.java | 3 +- core/java/android/bluetooth/BluetoothHeadset.java | 13 +-- .../android/bluetooth/BluetoothHeadsetClient.java | 11 +- .../bluetooth/BluetoothHeadsetClientCall.java | 11 +- .../android/bluetooth/BluetoothHearingAid.java | 7 +- core/java/android/bluetooth/BluetoothMap.java | 3 +- .../java/android/bluetooth/BluetoothMapClient.java | 3 +- core/java/android/bluetooth/BluetoothPan.java | 3 +- core/java/android/bluetooth/BluetoothPbap.java | 3 +- core/java/android/bluetooth/BluetoothProfile.java | 3 +- core/java/android/bluetooth/BluetoothSap.java | 3 +- core/java/android/bluetooth/BluetoothSocket.java | 3 +- core/java/android/bluetooth/le/ScanRecord.java | 3 +- .../java/android/companion/AssociationRequest.java | 5 +- .../android/companion/BluetoothDeviceFilter.java | 3 +- .../companion/BluetoothDeviceFilterUtils.java | 7 +- .../android/companion/BluetoothLeDeviceFilter.java | 3 +- core/java/android/companion/DeviceFilter.java | 5 +- .../android/companion/IFindDeviceCallback.aidl | 2 +- core/java/android/content/ComponentName.java | 5 +- core/java/android/content/ContentProvider.java | 4 +- core/java/android/content/ContentResolver.java | 7 +- core/java/android/content/Context.java | 8 +- core/java/android/content/ContextWrapper.java | 5 +- core/java/android/content/CursorLoader.java | 5 +- core/java/android/content/IContentProvider.java | 2 +- core/java/android/content/IContentService.aidl | 4 +- core/java/android/content/ISyncAdapter.aidl | 2 +- core/java/android/content/Intent.java | 14 +-- core/java/android/content/IntentFilter.java | 10 +- core/java/android/content/SyncAdapterType.java | 6 +- core/java/android/content/UndoManager.java | 35 +++--- core/java/android/content/UndoOperation.java | 5 +- core/java/android/content/om/IOverlayManager.aidl | 4 +- core/java/android/content/om/OverlayInfo.java | 3 +- core/java/android/content/pm/ActivityInfo.java | 7 +- core/java/android/content/pm/ApplicationInfo.java | 4 +- .../android/content/pm/BaseParceledListSlice.java | 5 +- core/java/android/content/pm/ComponentInfo.java | 3 +- .../java/android/content/pm/IPackageInstaller.aidl | 2 +- core/java/android/content/pm/IPackageManager.aidl | 24 ++-- core/java/android/content/pm/PackageInstaller.java | 12 +- core/java/android/content/pm/PackageManager.java | 16 +-- core/java/android/content/pm/PackageParser.java | 10 +- .../java/android/content/pm/ParceledListSlice.java | 2 +- core/java/android/content/pm/PermissionInfo.java | 3 +- core/java/android/content/pm/ResolveInfo.java | 3 +- core/java/android/content/pm/VerifierInfo.java | 3 +- core/java/android/content/res/AssetManager.java | 13 +-- core/java/android/content/res/ColorStateList.java | 5 +- .../android/content/res/CompatibilityInfo.java | 2 +- core/java/android/content/res/Configuration.java | 4 +- core/java/android/content/res/DrawableCache.java | 3 +- core/java/android/content/res/ObbInfo.java | 3 +- core/java/android/content/res/Resources.java | 8 +- core/java/android/content/res/ResourcesImpl.java | 14 +-- core/java/android/content/res/TypedArray.java | 9 +- core/java/android/content/res/XmlBlock.java | 3 +- .../android/database/AbstractWindowedCursor.java | 3 +- core/java/android/database/CursorWindow.java | 3 +- .../database/sqlite/SQLiteCustomFunction.java | 4 +- .../android/database/sqlite/SQLiteDatabase.java | 3 +- core/java/android/database/sqlite/SQLiteDebug.java | 2 +- .../android/database/sqlite/SQLiteProgram.java | 3 +- .../android/database/sqlite/SQLiteStatement.java | 3 +- core/java/android/ddm/DdmHandleAppName.java | 5 +- core/java/android/hardware/Camera.java | 6 +- core/java/android/hardware/HardwareBuffer.java | 2 +- core/java/android/hardware/Sensor.java | 4 +- core/java/android/hardware/SerialManager.java | 5 +- core/java/android/hardware/SerialPort.java | 7 +- .../java/android/hardware/SystemSensorManager.java | 7 +- .../hardware/biometrics/BiometricConstants.java | 3 +- .../biometrics/BiometricFingerprintConstants.java | 3 +- .../hardware/camera2/CameraCharacteristics.java | 5 +- .../android/hardware/camera2/CaptureRequest.java | 5 +- .../android/hardware/camera2/CaptureResult.java | 3 +- .../camera2/impl/CameraMetadataNative.java | 13 +-- .../hardware/camera2/utils/HashCodeHelpers.java | 3 +- .../android/hardware/display/DisplayManager.java | 5 +- .../hardware/display/WifiDisplayStatus.java | 15 ++- .../hardware/fingerprint/FingerprintManager.java | 3 +- core/java/android/hardware/input/InputManager.java | 2 +- .../hardware/location/GeofenceHardware.java | 2 +- .../IActivityRecognitionHardwareClient.aidl | 2 +- .../hardware/soundtrigger/SoundTrigger.java | 17 ++- .../hardware/soundtrigger/SoundTriggerModule.java | 3 +- .../android/hardware/usb/UsbDeviceConnection.java | 2 +- core/java/android/hardware/usb/UsbManager.java | 4 +- core/java/android/hardware/usb/UsbRequest.java | 2 +- .../inputmethodservice/InputMethodService.java | 4 +- core/java/android/net/ConnectivityManager.java | 40 +++---- core/java/android/net/DhcpResults.java | 17 ++- core/java/android/net/EthernetManager.java | 17 ++- core/java/android/net/IConnectivityManager.aidl | 4 +- core/java/android/net/INetworkPolicyManager.aidl | 2 +- core/java/android/net/INetworkStatsService.aidl | 2 +- core/java/android/net/IpConfiguration.java | 3 +- core/java/android/net/LinkProperties.java | 6 +- core/java/android/net/LinkQualityInfo.java | 9 +- core/java/android/net/LocalSocketImpl.java | 3 +- core/java/android/net/MacAddress.java | 3 +- core/java/android/net/MobileLinkQualityInfo.java | 31 +++--- core/java/android/net/Network.java | 3 +- core/java/android/net/NetworkCapabilities.java | 6 +- core/java/android/net/NetworkPolicyManager.java | 6 +- core/java/android/net/NetworkQuotaInfo.java | 7 +- core/java/android/net/NetworkRequest.java | 4 +- core/java/android/net/NetworkStats.java | 33 +++--- core/java/android/net/NetworkStatsHistory.java | 17 ++- core/java/android/net/NetworkTemplate.java | 3 +- core/java/android/net/NetworkUtils.java | 6 +- core/java/android/net/Proxy.java | 3 +- core/java/android/net/RouteInfo.java | 4 +- .../android/net/SSLCertificateSocketFactory.java | 20 ++-- core/java/android/net/StaticIpConfiguration.java | 9 +- core/java/android/net/TrafficStats.java | 4 +- core/java/android/net/WebAddress.java | 4 +- core/java/android/net/metrics/ApfProgramEvent.java | 15 ++- core/java/android/net/metrics/ApfStats.java | 21 ++-- core/java/android/net/metrics/DhcpClientEvent.java | 3 +- core/java/android/net/nsd/INsdManager.aidl | 2 +- core/java/android/nfc/INfcAdapterExtras.aidl | 14 +-- core/java/android/nfc/NdefRecord.java | 3 +- core/java/android/nfc/NfcAdapter.java | 3 +- core/java/android/nfc/Tag.java | 3 +- core/java/android/os/BaseBundle.java | 2 +- core/java/android/os/BatteryManager.java | 6 +- core/java/android/os/BatteryStats.java | 4 +- core/java/android/os/Broadcaster.java | 8 +- core/java/android/os/Bundle.java | 6 +- core/java/android/os/Debug.java | 18 +-- core/java/android/os/Environment.java | 4 +- core/java/android/os/FileObserver.java | 2 +- core/java/android/os/FileUtils.java | 10 +- core/java/android/os/Handler.java | 4 +- core/java/android/os/HwBinder.java | 2 +- core/java/android/os/IBinder.java | 2 +- .../java/android/os/INetworkManagementService.aidl | 12 +- core/java/android/os/IPowerManager.aidl | 2 +- core/java/android/os/LocaleList.java | 2 +- core/java/android/os/MemoryFile.java | 2 +- core/java/android/os/MessageQueue.java | 4 +- core/java/android/os/Parcel.java | 14 +-- core/java/android/os/ParcelableParcel.java | 8 +- core/java/android/os/PerformanceCollector.java | 4 +- core/java/android/os/PowerManager.java | 4 +- core/java/android/os/Process.java | 36 +++--- core/java/android/os/ServiceManager.java | 2 +- core/java/android/os/SharedMemory.java | 2 +- core/java/android/os/ShellCommand.java | 2 +- core/java/android/os/StatFs.java | 2 +- core/java/android/os/StrictMode.java | 4 +- core/java/android/os/SystemClock.java | 2 +- core/java/android/os/SystemProperties.java | 4 +- core/java/android/os/SystemService.java | 2 +- core/java/android/os/Trace.java | 2 +- core/java/android/os/UpdateLock.java | 12 +- core/java/android/os/UserHandle.java | 14 +-- core/java/android/os/UserManager.java | 12 +- core/java/android/os/VibrationEffect.java | 8 +- .../android/os/health/HealthStatsParceler.java | 3 +- .../android/os/health/SystemHealthManager.java | 2 +- .../android/os/storage/StorageEventListener.java | 11 +- core/java/android/os/storage/StorageManager.java | 25 ++--- core/java/android/os/storage/StorageVolume.java | 2 +- core/java/android/os/storage/VolumeInfo.java | 11 +- core/java/android/os/storage/VolumeRecord.java | 5 +- .../android/preference/PreferenceActivity.java | 3 +- .../android/preference/PreferenceFragment.java | 3 +- core/java/android/preference/PreferenceScreen.java | 3 +- .../java/android/preference/SeekBarPreference.java | 3 +- core/java/android/preference/SwitchPreference.java | 3 +- core/java/android/provider/BrowserContract.java | 15 ++- core/java/android/provider/CalendarContract.java | 11 +- core/java/android/provider/ContactsContract.java | 5 +- core/java/android/provider/DocumentsContract.java | 6 +- core/java/android/provider/Downloads.java | 45 ++++---- core/java/android/provider/Settings.java | 121 ++++++++++----------- core/java/android/provider/Telephony.java | 8 +- core/java/android/security/KeystoreArguments.java | 5 +- .../android/security/keymaster/ExportResult.java | 3 +- .../security/keymaster/KeyCharacteristics.java | 5 +- .../security/keymaster/KeymasterArguments.java | 13 +-- .../android/security/keymaster/KeymasterBlob.java | 3 +- .../security/keymaster/KeymasterBlobArgument.java | 7 +- .../keymaster/KeymasterBooleanArgument.java | 3 +- .../security/keymaster/KeymasterDateArgument.java | 3 +- .../security/keymaster/KeymasterIntArgument.java | 7 +- .../security/keymaster/KeymasterLongArgument.java | 7 +- .../security/keymaster/OperationResult.java | 3 +- core/java/android/service/dreams/DreamService.java | 2 +- .../java/android/service/dreams/IDreamManager.aidl | 4 +- .../notification/NotificationListenerService.java | 2 +- .../notification/StatusBarNotification.java | 2 +- .../service/notification/ZenModeConfig.java | 7 +- core/java/android/service/vr/IVrManager.aidl | 2 +- .../java/android/service/vr/VrListenerService.java | 3 +- .../service/wallpaper/WallpaperService.java | 2 +- core/java/android/speech/IRecognitionListener.aidl | 2 +- .../java/android/telephony/PhoneStateListener.java | 4 +- core/java/android/telephony/Rlog.java | 2 +- core/java/android/text/AndroidBidi.java | 3 +- core/java/android/text/DynamicLayout.java | 4 +- core/java/android/text/FontConfig.java | 17 ++- core/java/android/text/Html.java | 3 +- core/java/android/text/Layout.java | 13 +-- core/java/android/text/SpanSet.java | 3 +- core/java/android/text/SpannableStringBuilder.java | 3 +- .../java/android/text/SpannableStringInternal.java | 21 ++-- core/java/android/text/StaticLayout.java | 10 +- core/java/android/text/TextLine.java | 8 +- core/java/android/text/format/DateFormat.java | 2 +- core/java/android/text/format/DateUtils.java | 3 +- core/java/android/text/method/WordIterator.java | 23 ++-- core/java/android/text/style/EasyEditSpan.java | 7 +- core/java/android/text/style/SuggestionSpan.java | 7 +- core/java/android/text/util/Linkify.java | 3 +- core/java/android/transition/Transition.java | 7 +- .../java/android/transition/TransitionManager.java | 3 +- core/java/android/util/EventLog.java | 3 +- core/java/android/util/IconDrawableFactory.java | 3 +- core/java/android/util/LocalLog.java | 5 +- core/java/android/util/LogWriter.java | 3 +- core/java/android/util/LongArray.java | 7 +- core/java/android/util/NtpTrustedTime.java | 11 +- core/java/android/util/PathParser.java | 3 +- core/java/android/util/Rational.java | 5 +- core/java/android/util/RecurrenceRule.java | 5 +- core/java/android/util/Slog.java | 4 +- core/java/android/util/TimeUtils.java | 2 +- core/java/android/util/TrustedTime.java | 3 +- core/java/android/view/AccessibilityIterators.java | 5 +- core/java/android/view/Choreographer.java | 4 +- core/java/android/view/Display.java | 6 +- core/java/android/view/DisplayEventReceiver.java | 3 +- core/java/android/view/DragEvent.java | 7 +- core/java/android/view/FrameMetrics.java | 3 +- .../java/android/view/IRecentsAnimationRunner.aidl | 4 +- core/java/android/view/IRemoteAnimationRunner.aidl | 4 +- core/java/android/view/IWindowManager.aidl | 12 +- core/java/android/view/IWindowSession.aidl | 2 +- core/java/android/view/InputChannel.java | 3 +- core/java/android/view/InputDevice.java | 4 +- core/java/android/view/InputEventReceiver.java | 5 +- core/java/android/view/InputEventSender.java | 3 +- core/java/android/view/InputFilter.java | 5 +- core/java/android/view/InputQueue.java | 3 +- core/java/android/view/KeyCharacterMap.java | 7 +- core/java/android/view/KeyEvent.java | 40 +++---- core/java/android/view/LayoutInflater.java | 4 +- core/java/android/view/MotionEvent.java | 2 +- core/java/android/view/NotificationHeaderView.java | 3 +- core/java/android/view/PointerIcon.java | 10 +- core/java/android/view/RemoteAnimationAdapter.java | 3 +- core/java/android/view/RemoteAnimationTarget.java | 5 +- core/java/android/view/Surface.java | 7 +- core/java/android/view/SurfaceControl.java | 4 +- core/java/android/view/SurfaceSession.java | 3 +- core/java/android/view/TextureView.java | 15 ++- core/java/android/view/VelocityTracker.java | 9 +- core/java/android/view/View.java | 78 ++++++------- core/java/android/view/ViewConfiguration.java | 2 +- core/java/android/view/ViewDebug.java | 5 +- core/java/android/view/ViewGroup.java | 12 +- core/java/android/view/ViewOverlay.java | 5 +- core/java/android/view/ViewRootImpl.java | 28 ++--- core/java/android/view/ViewTreeObserver.java | 6 +- core/java/android/view/Window.java | 6 +- .../android/view/WindowAnimationFrameStats.java | 3 +- .../java/android/view/WindowContentFrameStats.java | 3 +- core/java/android/view/WindowManager.java | 9 +- core/java/android/view/WindowManagerGlobal.java | 4 +- .../AccessibilityInteractionClient.java | 6 +- .../view/accessibility/AccessibilityManager.java | 2 +- .../view/accessibility/AccessibilityNodeInfo.java | 8 +- ...AccessibilityInteractionConnectionCallback.aidl | 6 +- .../view/accessibility/IAccessibilityManager.aidl | 2 +- .../view/inputmethod/InputMethodManager.java | 4 +- .../textclassifier/TextClassificationManager.java | 3 +- .../view/textservice/SpellCheckerSession.java | 3 +- .../view/textservice/TextServicesManager.java | 3 +- .../java/android/webkit/IWebViewUpdateService.aidl | 4 +- core/java/android/webkit/PluginData.java | 9 +- core/java/android/webkit/UrlInterceptRegistry.java | 3 +- core/java/android/webkit/WebResourceResponse.java | 3 +- core/java/android/webkit/WebView.java | 6 +- core/java/android/webkit/WebViewFactory.java | 3 +- core/java/android/widget/AbsListView.java | 16 +-- core/java/android/widget/AbsSeekBar.java | 3 +- core/java/android/widget/ActionMenuPresenter.java | 9 +- core/java/android/widget/ActionMenuView.java | 17 ++- core/java/android/widget/ActivityChooserModel.java | 5 +- core/java/android/widget/AutoCompleteTextView.java | 6 +- .../android/widget/DatePickerSpinnerDelegate.java | 11 +- core/java/android/widget/DateTimeView.java | 3 +- core/java/android/widget/EdgeEffect.java | 2 +- core/java/android/widget/Editor.java | 4 +- core/java/android/widget/FastScroller.java | 2 +- core/java/android/widget/GridLayout.java | 3 +- core/java/android/widget/GridView.java | 2 +- core/java/android/widget/HorizontalScrollView.java | 4 +- core/java/android/widget/ImageView.java | 2 +- core/java/android/widget/LinearLayout.java | 4 +- core/java/android/widget/ListPopupWindow.java | 8 +- core/java/android/widget/ListView.java | 4 +- core/java/android/widget/NumberPicker.java | 14 +-- core/java/android/widget/OverScroller.java | 3 +- core/java/android/widget/PopupMenu.java | 3 +- core/java/android/widget/PopupWindow.java | 2 +- core/java/android/widget/ProgressBar.java | 4 +- core/java/android/widget/RemoteViews.java | 16 +-- core/java/android/widget/RemoteViewsAdapter.java | 15 ++- core/java/android/widget/ScrollView.java | 2 +- core/java/android/widget/SearchView.java | 2 +- core/java/android/widget/SeekBar.java | 3 +- core/java/android/widget/Spinner.java | 4 +- core/java/android/widget/Switch.java | 3 +- core/java/android/widget/TextClock.java | 3 +- core/java/android/widget/TextView.java | 14 +-- core/java/android/widget/ViewAnimator.java | 3 +- core/java/android/widget/ViewFlipper.java | 3 +- .../android/ims/internal/uce/common/CapInfo.java | 89 ++++++++------- .../ims/internal/uce/common/StatusCode.java | 7 +- .../android/ims/internal/uce/common/UceLong.java | 11 +- .../ims/internal/uce/options/IOptionsListener.aidl | 12 +- .../ims/internal/uce/options/IOptionsService.aidl | 16 +-- .../ims/internal/uce/options/OptionsCapInfo.java | 11 +- .../ims/internal/uce/options/OptionsCmdId.java | 5 +- .../ims/internal/uce/options/OptionsCmdStatus.java | 11 +- .../internal/uce/options/OptionsSipResponse.java | 13 +-- .../internal/uce/presence/IPresenceListener.aidl | 18 +-- .../internal/uce/presence/IPresenceService.aidl | 16 +-- .../ims/internal/uce/presence/PresCapInfo.java | 7 +- .../ims/internal/uce/presence/PresCmdId.java | 5 +- .../ims/internal/uce/presence/PresCmdStatus.java | 11 +- .../uce/presence/PresPublishTriggerType.java | 5 +- .../ims/internal/uce/presence/PresResInfo.java | 9 +- .../internal/uce/presence/PresResInstanceInfo.java | 13 +-- .../ims/internal/uce/presence/PresRlmiInfo.java | 19 ++-- .../ims/internal/uce/presence/PresServiceInfo.java | 9 +- .../ims/internal/uce/presence/PresSipResponse.java | 23 ++-- .../uce/presence/PresSubscriptionState.java | 5 +- .../ims/internal/uce/presence/PresTupleInfo.java | 9 +- .../ims/internal/uce/uceservice/IUceListener.aidl | 2 +- .../ims/internal/uce/uceservice/IUceService.aidl | 20 ++-- .../com/android/internal/app/AlertController.java | 3 +- .../com/android/internal/app/IAppOpsService.aidl | 2 +- .../com/android/internal/app/IBatteryStats.aidl | 6 +- .../app/IVoiceInteractionManagerService.aidl | 2 +- .../internal/app/IntentForwarderActivity.java | 3 +- .../com/android/internal/app/LocalePicker.java | 3 +- .../android/internal/app/WindowDecorActionBar.java | 7 +- .../internal/appwidget/IAppWidgetService.aidl | 6 +- .../android/internal/logging/MetricsLogger.java | 2 +- core/java/com/android/internal/net/VpnProfile.java | 2 +- core/java/com/android/internal/os/BaseCommand.java | 5 +- .../com/android/internal/os/BatterySipper.java | 3 +- .../android/internal/os/BatteryStatsHelper.java | 5 +- .../com/android/internal/os/BatteryStatsImpl.java | 4 +- .../android/internal/os/ClassLoaderFactory.java | 3 +- core/java/com/android/internal/os/FuseAppLoop.java | 5 +- .../com/android/internal/os/ProcessCpuTracker.java | 13 +-- core/java/com/android/internal/os/SomeArgs.java | 15 ++- .../internal/telephony/ITelephonyRegistry.aidl | 2 +- .../java/com/android/internal/util/ArrayUtils.java | 9 +- .../com/android/internal/util/AsyncChannel.java | 14 +-- .../android/internal/util/GrowingArrayUtils.java | 5 +- core/java/com/android/internal/util/HexDump.java | 2 +- .../internal/util/IndentingPrintWriter.java | 7 +- .../com/android/internal/util/MemInfoReader.java | 5 +- .../com/android/internal/util/Preconditions.java | 7 +- core/java/com/android/internal/util/State.java | 3 +- .../com/android/internal/util/StateMachine.java | 19 ++-- .../internal/view/IInputConnectionWrapper.java | 2 +- .../com/android/internal/view/menu/ActionMenu.java | 3 +- .../android/internal/view/menu/ActionMenuItem.java | 3 +- .../internal/view/menu/ActionMenuItemView.java | 3 +- .../android/internal/view/menu/MenuBuilder.java | 13 +-- .../android/internal/view/menu/MenuItemImpl.java | 7 +- .../internal/view/menu/MenuPopupHelper.java | 13 +-- .../android/internal/view/menu/MenuPresenter.java | 3 +- .../android/internal/widget/AbsActionBarView.java | 3 +- .../internal/widget/ActionBarContextView.java | 3 +- .../internal/widget/ActionBarOverlayLayout.java | 2 +- .../android/internal/widget/CachingIconView.java | 3 +- .../internal/widget/IRemoteViewsFactory.aidl | 16 +-- .../LinearLayoutWithDefaultTouchRecepient.java | 3 +- .../android/internal/widget/LockPatternUtils.java | 7 +- .../android/internal/widget/NumericTextView.java | 3 +- .../internal/widget/PreferenceImageView.java | 3 +- .../com/android/internal/widget/RecyclerView.java | 2 +- .../android/internal/widget/ScrollBarUtils.java | 3 +- .../internal/widget/ScrollingTabContainerView.java | 7 +- .../com/android/server/net/NetlinkTracker.java | 7 +- core/java/com/google/android/collect/Sets.java | 3 +- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 6 +- graphics/java/android/graphics/Bitmap.java | 4 +- graphics/java/android/graphics/BitmapFactory.java | 3 +- graphics/java/android/graphics/Canvas.java | 4 +- graphics/java/android/graphics/CanvasProperty.java | 5 +- .../android/graphics/ColorMatrixColorFilter.java | 3 +- graphics/java/android/graphics/FontListParser.java | 3 +- graphics/java/android/graphics/GraphicBuffer.java | 5 +- .../java/android/graphics/LightingColorFilter.java | 5 +- graphics/java/android/graphics/LinearGradient.java | 15 ++- graphics/java/android/graphics/Movie.java | 2 +- graphics/java/android/graphics/Paint.java | 2 +- graphics/java/android/graphics/Path.java | 5 +- .../android/graphics/PorterDuffColorFilter.java | 3 +- graphics/java/android/graphics/RadialGradient.java | 17 ++- graphics/java/android/graphics/Region.java | 7 +- graphics/java/android/graphics/SurfaceTexture.java | 11 +- graphics/java/android/graphics/SweepGradient.java | 13 +-- graphics/java/android/graphics/Typeface.java | 2 +- graphics/java/android/graphics/Xfermode.java | 3 +- .../drawable/AnimatedStateListDrawable.java | 4 +- .../graphics/drawable/AnimatedVectorDrawable.java | 4 +- .../android/graphics/drawable/ColorDrawable.java | 3 +- .../java/android/graphics/drawable/Drawable.java | 3 +- .../graphics/drawable/DrawableInflater.java | 3 +- .../android/graphics/drawable/DrawableWrapper.java | 3 +- graphics/java/android/graphics/drawable/Icon.java | 6 +- .../android/graphics/drawable/InsetDrawable.java | 3 +- .../android/graphics/drawable/LayerDrawable.java | 3 +- .../android/graphics/drawable/RippleDrawable.java | 7 +- .../android/graphics/drawable/ScaleDrawable.java | 3 +- .../graphics/drawable/StateListDrawable.java | 5 +- .../android/graphics/drawable/VectorDrawable.java | 3 +- .../android/graphics/fonts/FontVariationAxis.java | 2 +- .../java/android/graphics/pdf/PdfRenderer.java | 5 +- keystore/java/android/security/Credentials.java | 3 +- keystore/java/android/security/KeyStore.java | 14 +-- .../java/android/location/IGeofenceProvider.aidl | 2 +- location/java/android/location/Location.java | 2 +- media/java/android/media/AudioAttributes.java | 4 +- media/java/android/media/AudioDevicePort.java | 3 +- .../java/android/media/AudioDevicePortConfig.java | 3 +- media/java/android/media/AudioFormat.java | 9 +- media/java/android/media/AudioGain.java | 3 +- media/java/android/media/AudioHandle.java | 3 +- media/java/android/media/AudioManager.java | 18 +-- media/java/android/media/AudioMixPort.java | 5 +- media/java/android/media/AudioMixPortConfig.java | 3 +- media/java/android/media/AudioPatch.java | 3 +- media/java/android/media/AudioPort.java | 5 +- media/java/android/media/AudioPortConfig.java | 3 +- .../java/android/media/AudioPortEventHandler.java | 5 +- media/java/android/media/AudioRecord.java | 9 +- .../android/media/AudioRecordingConfiguration.java | 3 +- media/java/android/media/AudioSystem.java | 9 +- media/java/android/media/AudioTrack.java | 7 +- media/java/android/media/CamcorderProfile.java | 2 +- media/java/android/media/EncoderCapabilities.java | 13 +-- media/java/android/media/IAudioService.aidl | 2 +- .../java/android/media/IRemoteDisplayCallback.aidl | 2 +- media/java/android/media/JetPlayer.java | 5 +- media/java/android/media/MediaMetadata.java | 3 +- media/java/android/media/MediaMuxer.java | 17 ++- media/java/android/media/MediaPlayer.java | 9 +- media/java/android/media/MediaRecorder.java | 2 +- media/java/android/media/MediaRouter.java | 4 +- media/java/android/media/MicrophoneInfo.java | 3 +- media/java/android/media/PlaybackParams.java | 14 +-- media/java/android/media/RemoteControlClient.java | 5 +- media/java/android/media/RemoteController.java | 3 +- media/java/android/media/RemoteDisplay.java | 7 +- media/java/android/media/RemoteDisplayState.java | 5 +- media/java/android/media/Ringtone.java | 3 +- media/java/android/media/RingtoneManager.java | 5 +- media/java/android/media/TimedText.java | 3 +- media/java/android/media/ToneGenerator.java | 3 +- media/java/android/media/TtmlRenderer.java | 3 +- media/java/android/media/VolumeShaper.java | 31 +++--- media/java/android/media/audiofx/AudioEffect.java | 4 +- media/java/android/media/audiopolicy/AudioMix.java | 15 ++- .../android/media/audiopolicy/AudioMixingRule.java | 13 +-- media/java/android/media/session/MediaSession.java | 3 +- .../media/soundtrigger/SoundTriggerDetector.java | 5 +- .../media/soundtrigger/SoundTriggerManager.java | 5 +- media/java/android/media/tv/TvInputInfo.java | 3 +- media/java/android/media/tv/TvInputService.java | 3 +- .../android/service/media/MediaBrowserService.java | 3 +- opengl/java/android/opengl/EGL14.java | 3 +- .../java/javax/microedition/khronos/egl/EGL10.java | 3 +- rs/java/android/renderscript/Font.java | 3 +- rs/java/android/renderscript/Mesh.java | 9 +- rs/java/android/renderscript/ProgramStore.java | 3 +- telecomm/java/android/telecom/CallerInfo.java | 9 +- telecomm/java/android/telecom/Log.java | 4 +- .../android/internal/telecom/ITelecomService.aidl | 2 +- .../android/internal/telephony/SmsApplication.java | 13 +-- .../common/com/google/android/mms/ContentType.java | 7 +- .../com/google/android/mms/MmsException.java | 3 +- .../com/google/android/mms/pdu/AcknowledgeInd.java | 3 +- .../com/google/android/mms/pdu/DeliveryInd.java | 3 +- .../google/android/mms/pdu/EncodedStringValue.java | 3 +- .../android/mms/pdu/MultimediaMessagePdu.java | 7 +- .../com/google/android/mms/pdu/NotifyRespInd.java | 3 +- .../common/com/google/android/mms/pdu/PduBody.java | 5 +- .../common/com/google/android/mms/pdu/PduPart.java | 3 +- .../common/com/google/android/mms/pdu/SendReq.java | 3 +- .../com/google/android/mms/util/AbstractCache.java | 3 +- .../google/android/mms/util/DownloadDrmHelper.java | 3 +- .../com/google/android/mms/util/SqliteWrapper.java | 3 +- .../android/service/euicc/EuiccProfileInfo.java | 3 +- ...tDefaultDownloadableSubscriptionListResult.java | 3 +- .../GetDownloadableSubscriptionMetadataResult.java | 3 +- .../service/euicc/IDeleteSubscriptionCallback.aidl | 2 +- .../service/euicc/IEraseSubscriptionsCallback.aidl | 2 +- ...efaultDownloadableSubscriptionListCallback.aidl | 2 +- ...etDownloadableSubscriptionMetadataCallback.aidl | 2 +- .../android/service/euicc/IGetEidCallback.aidl | 2 +- .../service/euicc/IGetEuiccInfoCallback.aidl | 2 +- .../euicc/IGetEuiccProfileInfoListCallback.aidl | 2 +- ...RetainSubscriptionsForFactoryResetCallback.aidl | 2 +- .../euicc/ISwitchToSubscriptionCallback.aidl | 2 +- .../euicc/IUpdateSubscriptionNicknameCallback.aidl | 2 +- .../android/telephony/CarrierConfigManager.java | 3 +- .../java/android/telephony/CellIdentityGsm.java | 3 +- .../java/android/telephony/CellIdentityLte.java | 2 +- telephony/java/android/telephony/CellInfoCdma.java | 2 +- telephony/java/android/telephony/CellInfoGsm.java | 3 +- telephony/java/android/telephony/CellInfoLte.java | 2 +- .../android/telephony/CellSignalStrengthGsm.java | 2 +- .../android/telephony/CellSignalStrengthLte.java | 3 +- .../PhoneNumberFormattingTextWatcher.java | 3 +- .../java/android/telephony/PhoneNumberUtils.java | 7 +- .../telephony/PreciseDataConnectionState.java | 2 +- .../java/android/telephony/RadioAccessFamily.java | 8 +- telephony/java/android/telephony/ServiceState.java | 18 +-- telephony/java/android/telephony/SmsManager.java | 2 +- telephony/java/android/telephony/SmsMessage.java | 5 +- .../java/android/telephony/SubscriptionInfo.java | 7 +- .../android/telephony/SubscriptionManager.java | 16 +-- .../java/android/telephony/TelephonyManager.java | 30 ++--- .../telephony/euicc/DownloadableSubscription.java | 7 +- .../java/android/telephony/euicc/EuiccInfo.java | 3 +- .../android/telephony/ims/ImsCallForwardInfo.java | 15 ++- .../java/android/telephony/ims/ImsCallProfile.java | 11 +- .../java/android/telephony/ims/ImsReasonInfo.java | 2 +- .../java/android/telephony/ims/ImsSsInfo.java | 7 +- .../telephony/ims/ImsStreamMediaProfile.java | 9 +- .../telephony/ims/ImsVideoCallProvider.java | 3 +- .../android/telephony/ims/compat/ImsService.java | 5 +- .../telephony/ims/compat/feature/ImsFeature.java | 5 +- .../telephony/ims/compat/feature/MMTelFeature.java | 3 +- .../ims/compat/stub/ImsCallSessionImplBase.java | 3 +- .../ims/compat/stub/ImsConfigImplBase.java | 5 +- .../ims/compat/stub/ImsUtListenerImplBase.java | 3 +- .../mbms/vendor/IMbmsStreamingService.aidl | 8 +- .../java/com/android/ims/ImsConfigListener.aidl | 2 +- telephony/java/com/android/ims/ImsUtInterface.java | 3 +- .../ims/internal/IImsCallSessionListener.aidl | 44 ++++---- .../ims/internal/IImsRegistrationListener.aidl | 16 +-- .../com/android/ims/internal/IImsUtListener.aidl | 14 +-- .../ims/internal/IImsVideoCallCallback.aidl | 14 +-- .../ims/internal/IImsVideoCallProvider.aidl | 2 +- .../internal/telephony/ICarrierConfigLoader.aidl | 2 +- .../android/internal/telephony/IPhoneSubInfo.aidl | 2 +- .../com/android/internal/telephony/ITelephony.aidl | 10 +- .../android/internal/telephony/OperatorInfo.java | 24 ++-- .../telephony/Sms7BitEncodingTranslator.java | 9 +- .../android/internal/telephony/SmsMessageBase.java | 16 +-- .../internal/telephony/cdma/SmsMessage.java | 4 +- .../internal/telephony/cdma/sms/BearerData.java | 3 +- .../internal/telephony/gsm/SmsCbHeader.java | 15 ++- .../android/internal/telephony/gsm/SmsMessage.java | 14 +-- .../android/internal/telephony/uicc/IccUtils.java | 3 +- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/ScanResult.java | 29 +++-- wifi/java/android/net/wifi/WifiConfiguration.java | 6 +- wifi/java/android/net/wifi/WifiManager.java | 4 +- wifi/java/android/net/wifi/p2p/WifiP2pConfig.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pDevice.java | 3 +- .../android/net/wifi/p2p/WifiP2pDeviceList.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pManager.java | 8 +- .../net/wifi/p2p/nsd/WifiP2pServiceInfo.java | 2 +- .../net/wifi/p2p/nsd/WifiP2pServiceRequest.java | 2 +- 642 files changed, 2030 insertions(+), 2403 deletions(-) (limited to 'telecomm/java') diff --git a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl index 2c51935dc446..6f624ee672e6 100644 --- a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl +++ b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl @@ -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(); } diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index c2d530d00058..9f98f8efc774 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -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; diff --git a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl index 7d02d2d6cd29..643d47ca5c6a 100644 --- a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl +++ b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl @@ -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); diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index b1b9f4161ee5..f953da48c217 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -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; } diff --git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 0d6a07938e95..b960a7f835d8 100644 --- a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java @@ -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) { diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 007b0a8ab960..9bb02cdcce73 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -546,7 +546,7 @@ public class AccountManager { /** * @hide used for testing only */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AccountManager(Context context, IAccountManager service, Handler handler) { mContext = context; mService = service; @@ -831,7 +831,7 @@ public class AccountManager { /** @hide Same as {@link #getAccountsByType(String)} but for a specific user. */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Account[] getAccountsByTypeAsUser(String type, UserHandle userHandle) { try { return mService.getAccountsAsUser(type, userHandle.getIdentifier(), @@ -2122,7 +2122,7 @@ public class AccountManager { * Same as {@link #confirmCredentials(Account, Bundle, Activity, AccountManagerCallback, Handler)} * but for the specified user. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AccountManagerFuture confirmCredentialsAsUser(final Account account, final Bundle options, final Activity activity, diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index eb525d301986..3cdd691fd5dd 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ConstantState; -import android.os.Build; import java.util.ArrayList; @@ -462,7 +461,7 @@ public abstract class Animator implements Cloneable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void reverse() { throw new IllegalStateException("Reverse is not supported"); } diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 3c55bce4fc06..8c0b4387c27f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -757,7 +757,7 @@ public class Activity extends ContextThemeWrapper */ public static final int FINISH_TASK_WITH_ACTIVITY = 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static final String FRAGMENTS_TAG = "android:fragments"; private static final String LAST_AUTOFILL_ID = "android:lastAutofillId"; @@ -2941,7 +2941,7 @@ public class Activity extends ContextThemeWrapper * @see View#onMovedToDisplay(int, Configuration) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public void onMovedToDisplay(int displayId, Configuration config) { } @@ -3211,7 +3211,7 @@ public class Activity extends ContextThemeWrapper * @deprecated Use {@link CursorLoader} instead. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final Cursor managedQuery(Uri uri, String[] projection, String selection, String sortOrder) { Cursor c = getContentResolver().query(uri, projection, selection, null, sortOrder); @@ -6019,7 +6019,7 @@ public class Activity extends ContextThemeWrapper * @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void startActivityForResult( String who, Intent intent, int requestCode, @Nullable Bundle options) { Uri referrer = onProvideReferrer(); @@ -6351,7 +6351,7 @@ public class Activity extends ContextThemeWrapper * Finishes the current activity and specifies whether to remove the task associated with this * activity. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void finish(int finishTask) { if (mParent == null) { int resultCode; @@ -7881,7 +7881,7 @@ public class Activity extends ContextThemeWrapper mParent = parent; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final void attach(Context context, ActivityThread aThread, Instrumentation instr, IBinder token, int ident, Application application, Intent intent, ActivityInfo info, @@ -7977,7 +7977,7 @@ public class Activity extends ContextThemeWrapper performCreate(icicle, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final void performCreate(Bundle icicle, PersistableBundle persistentState) { dispatchActivityPreCreated(icicle); mCanEnterPictureInPicture = true; @@ -8292,7 +8292,7 @@ public class Activity extends ContextThemeWrapper } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void dispatchActivityResult(String who, int requestCode, int resultCode, Intent data, String reason) { if (false) Log.v( diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 71c6799d0141..250f2f0b2dc9 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -508,18 +508,18 @@ public class ActivityManager { public static final int PROCESS_STATE_BOUND_TOP = 3; /** @hide Process is hosting a foreground service. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; /** @hide Process is hosting a foreground service due to a system binding. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 5; /** @hide Process is important to the user, and something they are aware of. */ public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 6; /** @hide Process is important to the user, but not something they are aware of. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_IMPORTANT_BACKGROUND = 7; /** @hide Process is in the background transient so we will try to keep running. */ @@ -531,14 +531,14 @@ public class ActivityManager { /** @hide Process is in the background running a service. Unlike oom_adj, this level * is used for both the normal running in background state and the executing * operations state. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_SERVICE = 10; /** @hide Process is in the background running a receiver. Note that from the * perspective of oom_adj, receivers run at a higher foreground level, but for our * prioritization here that is not necessary and putting them below services means * many fewer changes in some process states as they receive broadcasts. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_RECEIVER = 11; /** @hide Same as {@link #PROCESS_STATE_TOP} but while device is sleeping. */ @@ -549,14 +549,14 @@ public class ActivityManager { public static final int PROCESS_STATE_HEAVY_WEIGHT = 13; /** @hide Process is in the background but hosts the home activity. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_HOME = 14; /** @hide Process is in the background but hosts the last shown activity. */ public static final int PROCESS_STATE_LAST_ACTIVITY = 15; /** @hide Process is being cached for later use and contains activities. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROCESS_STATE_CACHED_ACTIVITY = 16; /** @hide Process is being cached for later use and is a client of another cached @@ -2198,7 +2198,7 @@ public class ActivityManager { /** * @return The size of the task at the point this snapshot was taken. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Point getTaskSize() { return mTaskSize; } @@ -2740,13 +2740,13 @@ public class ActivityManager { public boolean lowMemory; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long hiddenAppThreshold; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long secondaryServerThreshold; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long visibleAppThreshold; /** @hide */ @UnsupportedAppUsage @@ -3037,7 +3037,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FLAG_PERSISTENT = 1<<1; /** @@ -3045,7 +3045,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FLAG_HAS_ACTIVITIES = 1<<2; /** @@ -3149,7 +3149,7 @@ public class ActivityManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170; @@ -3209,7 +3209,7 @@ public class ActivityManager { * will be passed to a client, use {@link #procStateToImportanceForClient}. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static @Importance int procStateToImportance(int procState) { if (procState == PROCESS_STATE_NONEXISTENT) { return IMPORTANCE_GONE; @@ -4168,7 +4168,7 @@ public class ActivityManager { * @param userid the user's id. Zero indicates the default user. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean switchUser(int userid) { try { return getService().switchUser(userid); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b68194792db1..87c729b20c71 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -346,7 +346,7 @@ public final class ActivityThread extends ClientTransactionHandler { @UnsupportedAppUsage AppBindData mBoundApplication; Profiler mProfiler; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mCurDefaultDisplayDpi; @UnsupportedAppUsage boolean mDensityCompatMode; @@ -821,7 +821,7 @@ public final class ActivityThread extends ClientTransactionHandler { boolean trackAllocation; @UnsupportedAppUsage boolean restrictedBackupMode; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean persistent; Configuration config; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2288,7 +2288,7 @@ public final class ActivityThread extends ClientTransactionHandler { return null; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo, int flags) { boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0; @@ -3036,7 +3036,7 @@ public final class ActivityThread extends ClientTransactionHandler { proto.end(asToken); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void registerOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { @@ -3049,7 +3049,7 @@ public final class ActivityThread extends ClientTransactionHandler { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void unregisterOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index e20ef7f70954..3bcb87aa73f2 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -797,7 +797,7 @@ public class AppOpsManager { // - add the op to the appropriate template in AppOpsState.OpsTemplate (settings app) /** @hide No operation specified. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int OP_NONE = AppProtoEnums.APP_OP_NONE; /** @hide Access to coarse location information. */ @UnsupportedAppUsage @@ -1156,7 +1156,7 @@ public class AppOpsManager { public static final int OP_RECORD_AUDIO_HOTWORD = 102; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int _NUM_OP = 104; /** Access to coarse location information. */ @@ -2592,7 +2592,7 @@ public class AppOpsManager { * Retrieve a non-localized name for the operation, for debugging output. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String opToName(int op) { if (op == OP_NONE) return "NONE"; return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")"); @@ -2623,7 +2623,7 @@ public class AppOpsManager { * Retrieve the permission associated with an operation, or null if there is not one. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static String opToPermission(int op) { return sOpPerms[op]; @@ -6837,7 +6837,7 @@ public class AppOpsManager { /** @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void resetAllModes() { try { mService.resetAllModes(mContext.getUserId(), null); diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 146d648fe65a..941467fad736 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -26,7 +26,6 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.res.Configuration; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.autofill.AutofillManager; @@ -353,7 +352,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { mLoadedApk = ContextImpl.getImpl(context).mPackageInfo; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -377,7 +376,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -389,7 +388,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -409,7 +408,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -419,7 +418,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -439,7 +438,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -449,7 +448,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPrePaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -469,7 +468,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostPaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -479,7 +478,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -499,7 +498,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -509,7 +508,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -533,7 +532,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -545,7 +544,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPreDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -565,7 +564,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void dispatchActivityPostDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 7cef93fe7547..c6b52c1ea705 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1309,7 +1309,7 @@ public class ApplicationPackageManager extends PackageManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Override public boolean setInstantAppCookie(@NonNull byte[] cookie) { try { @@ -2422,7 +2422,7 @@ public class ApplicationPackageManager extends PackageManager { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable VolumeInfo getPackageCurrentVolume(ApplicationInfo app) { final StorageManager storage = mContext.getSystemService(StorageManager.class); return getPackageCurrentVolume(app, storage); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 5c3be316f924..e94fd452b7f8 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2700,7 +2700,7 @@ class ContextImpl extends Context { return context; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static ContextImpl createActivityContext(ActivityThread mainThread, LoadedApk packageInfo, ActivityInfo activityInfo, IBinder activityToken, int displayId, Configuration overrideConfiguration) { diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java index 9fea3f75c2c2..e4c84d7e7997 100644 --- a/core/java/android/app/DialogFragment.java +++ b/core/java/android/app/DialogFragment.java @@ -19,7 +19,6 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.DialogInterface; -import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -184,11 +183,11 @@ public class DialogFragment extends Fragment int mTheme = 0; boolean mCancelable = true; boolean mShowsDialog = true; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mBackStackId = -1; Dialog mDialog; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean mViewDestroyed; @UnsupportedAppUsage boolean mDismissed; diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 355092378279..0719422632d1 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -351,7 +351,7 @@ public class DownloadManager { * columns to request from DownloadProvider. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String[] UNDERLYING_COLUMNS = new String[] { DownloadManager.COLUMN_ID, DownloadManager.COLUMN_LOCAL_FILENAME, @@ -1646,7 +1646,7 @@ public class DownloadManager { /** * Get a parameterized SQL WHERE clause to select a bunch of IDs. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static String getWhereClauseForIds(long[] ids) { StringBuilder whereClause = new StringBuilder(); whereClause.append("("); @@ -1664,7 +1664,7 @@ public class DownloadManager { /** * Get the selection args for a clause returned by {@link #getWhereClauseForIds(long[])}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static String[] getWhereArgsForIds(long[] ids) { String[] whereArgs = new String[ids.length]; return getWhereArgsForIds(ids, whereArgs); diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 93381cf82764..ce4109cd44a3 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -306,7 +306,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene int mTargetRequestCode; // True if the fragment is in the list of added fragments. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean mAdded; // If set this fragment is being removed from its activity. diff --git a/core/java/android/app/FragmentController.java b/core/java/android/app/FragmentController.java index 150b7a56a36d..f021f7690283 100644 --- a/core/java/android/app/FragmentController.java +++ b/core/java/android/app/FragmentController.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; -import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.ArrayMap; @@ -45,7 +44,7 @@ import java.util.List; */ @Deprecated public class FragmentController { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final FragmentHostCallback mHost; /** diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 5435558b3be5..904c4735e0ff 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1101,7 +1101,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage Animator loadAnimator(Fragment fragment, int transit, boolean enter, int transitionStyle) { Animator animObj = fragment.onCreateAnimator(transit, enter, fragment.getNextAnim()); diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index fc217b69b95a..357b26c3083d 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -112,7 +112,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void unhandledBack(); @UnsupportedAppUsage boolean finishActivity(in IBinder token, int code, in Intent data, int finishTask); @@ -171,12 +171,12 @@ interface IActivityManager { @UnsupportedAppUsage boolean unbindService(in IServiceConnection connection); void publishService(in IBinder token, in Intent intent, in IBinder service); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setDebugApp(in String packageName, boolean waitForDebugger, boolean persistent); void setAgentApp(in String packageName, @nullable String agent); @UnsupportedAppUsage void setAlwaysFinish(boolean enabled); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean startInstrumentation(in ComponentName className, in String profileFile, int flags, in Bundle arguments, in IInstrumentationWatcher watcher, in IUiAutomationConnection connection, int userId, @@ -198,7 +198,7 @@ interface IActivityManager { * @throws RemoteException * @return Returns true if the configuration was updated. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean updateConfiguration(in Configuration values); /** * Updates mcc mnc configuration and applies changes to the entire system. @@ -223,7 +223,7 @@ interface IActivityManager { int mode, int userId); void revokeUriPermission(in IApplicationThread caller, in String targetPkg, in Uri uri, int mode, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setActivityController(in IActivityController watcher, boolean imAMonkey); void showWaitingForDebugger(in IApplicationThread who, boolean waiting); /* @@ -277,7 +277,7 @@ interface IActivityManager { List getRunningAppProcesses(); IBinder peekService(in Intent service, in String resolvedType, in String callingPackage); // Turn on/off profiling in a particular process. - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean profileControl(in String process, int userId, boolean start, in ProfilerInfo profilerInfo, int profileType); @UnsupportedAppUsage @@ -309,7 +309,7 @@ interface IActivityManager { // Retrieve info of applications installed on external media that are currently // running. List getRunningExternalApplications(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void finishHeavyWeightApp(); // A StrictMode violation to be handled. @UnsupportedAppUsage @@ -331,7 +331,7 @@ interface IActivityManager { in RemoteCallback finishCallback); @UnsupportedAppUsage boolean isUserRunning(int userid, int flags); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setPackageScreenCompatMode(in String packageName, int mode); @UnsupportedAppUsage boolean switchUser(int userid); @@ -349,12 +349,12 @@ interface IActivityManager { @UnsupportedAppUsage long[] getProcessPss(in int[] pids); void showBootMessage(in CharSequence msg, boolean always); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void killAllBackgroundProcesses(); ContentProviderHolder getContentProviderExternal(in String name, int userId, in IBinder token, String tag); /** @deprecated - Use {@link #removeContentProviderExternalAsUser} which takes a user ID. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void removeContentProviderExternal(in String name, in IBinder token); void removeContentProviderExternalAsUser(in String name, in IBinder token, int userId); // Get memory information about the calling process. @@ -382,7 +382,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int stopUser(int userid, boolean force, in IStopUserCallback callback); /** * Check {@link com.android.server.am.ActivityManagerService#stopUserWithDelayedLocking(int, boolean, IStopUserCallback)} @@ -443,20 +443,20 @@ interface IActivityManager { String getLaunchedFromPackage(in IBinder activityToken); void killUid(int appId, int userId, in String reason); void setUserIsMonkey(boolean monkey); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void hang(in IBinder who, boolean allowRestart); List getAllRootTaskInfos(); void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop); void setFocusedRootTask(int taskId); ActivityTaskManager.RootTaskInfo getFocusedRootTaskInfo(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void restart(); void performIdleMaintenance(); void appNotRespondingViaProvider(in IBinder connection); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Rect getTaskBounds(int taskId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean setProcessMemoryTrimLevel(in String process, int userId, int level); @@ -464,13 +464,13 @@ interface IActivityManager { String getTagForIntentSender(in IIntentSender sender, in String prefix); @UnsupportedAppUsage boolean startUserInBackground(int userid); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isInLockTaskMode(); @UnsupportedAppUsage int startActivityFromRecents(int taskId, in Bundle options); @UnsupportedAppUsage void startSystemLockTaskMode(int taskId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isTopOfTask(in IBinder token); void bootAnimationComplete(); int checkPermissionWithToken(in String permission, int pid, int uid, @@ -481,11 +481,11 @@ interface IActivityManager { void notifyCleartextNetwork(int uid, in byte[] firstPacket); @UnsupportedAppUsage void setTaskResizeable(int taskId, int resizeableMode); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void resizeTask(int taskId, in Rect bounds, int resizeMode); @UnsupportedAppUsage int getLockTaskModeState(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setDumpHeapDebugLimit(in String processName, int uid, long maxMemSize, in String reportPackage); void dumpHeapFinished(in String path); @@ -498,17 +498,17 @@ interface IActivityManager { // Start of N transactions // Start Binder transaction tracking for all applications. - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean startBinderTracking(); // Stop Binder transaction tracking for all applications and dump trace data to the given file // descriptor. - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void suppressResizeConfigChanges(boolean suppress); boolean moveTopActivityToPinnedRootTask(int rootTaskId, in Rect bounds); boolean isAppStartModeDisabled(int uid, in String packageName); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean unlockUser(int userid, in byte[] token, in byte[] secret, in IProgressListener listener); void killPackageDependents(in String packageName, int userId); @@ -517,7 +517,7 @@ interface IActivityManager { boolean isVrModePackageEnabled(in ComponentName packageName); void notifyLockedProfile(int userId); void startConfirmDeviceCredentialIntent(in Intent intent, in Bundle options); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void sendIdleJobTrigger(); int sendIntentSender(in IIntentSender target, in IBinder whitelistToken, int code, in Intent intent, in String resolvedType, in IIntentReceiver finishedReceiver, diff --git a/core/java/android/app/IAppTask.aidl b/core/java/android/app/IAppTask.aidl index d3046c590c4f..f41d705e2ba7 100644 --- a/core/java/android/app/IAppTask.aidl +++ b/core/java/android/app/IAppTask.aidl @@ -24,7 +24,7 @@ import android.os.Bundle; /** @hide */ interface IAppTask { void finishAndRemoveTask(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ActivityManager.RecentTaskInfo getTaskInfo(); void moveToFront(in IApplicationThread appThread, in String callingPackage); int startActivity(IBinder whoThread, String callingPackage, String callingFeatureId, diff --git a/core/java/android/app/IAssistDataReceiver.aidl b/core/java/android/app/IAssistDataReceiver.aidl index d67fbff4548b..0d69838e4329 100644 --- a/core/java/android/app/IAssistDataReceiver.aidl +++ b/core/java/android/app/IAssistDataReceiver.aidl @@ -21,8 +21,8 @@ import android.os.Bundle; /** @hide */ oneway interface IAssistDataReceiver { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onHandleAssistData(in Bundle resultData); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onHandleAssistScreenshot(in Bitmap screenshot); } diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index c052186bb974..66a7f4df03bb 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -126,7 +126,7 @@ interface INotificationManager StatusBarNotification[] getActiveNotifications(String callingPkg); StatusBarNotification[] getActiveNotificationsWithAttribution(String callingPkg, String callingAttributionTag); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count, boolean includeSnoozed); StatusBarNotification[] getHistoricalNotificationsWithAttribution(String callingPkg, String callingAttributionTag, int count, boolean includeSnoozed); diff --git a/core/java/android/app/IStopUserCallback.aidl b/core/java/android/app/IStopUserCallback.aidl index c99734259f57..d3c2ff776128 100644 --- a/core/java/android/app/IStopUserCallback.aidl +++ b/core/java/android/app/IStopUserCallback.aidl @@ -22,7 +22,7 @@ package android.app; */ interface IStopUserCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void userStopped(int userId); void userStopAborted(int userId); } diff --git a/core/java/android/app/ITransientNotification.aidl b/core/java/android/app/ITransientNotification.aidl index 537a8f2acdc5..09a3ba045fc2 100644 --- a/core/java/android/app/ITransientNotification.aidl +++ b/core/java/android/app/ITransientNotification.aidl @@ -19,7 +19,7 @@ package android.app; /** @hide */ oneway interface ITransientNotification { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void show(IBinder windowToken); void hide(); } diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index 101917bc2e07..4cb8d936aa9c 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -83,7 +83,7 @@ interface IWallpaperManager { * information about that wallpaper. Otherwise, if it is a static image, * simply return null. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage WallpaperInfo getWallpaperInfo(int userId); /** diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 9e967958c9cb..f2a9daafb4ce 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1416,7 +1416,7 @@ public class Instrumentation { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void callActivityOnNewIntent(Activity activity, ReferrerIntent intent) { final String oldReferrer = activity.mReferrer; try { @@ -1762,7 +1762,7 @@ public class Instrumentation { * * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int execStartActivitiesAsUser(Context who, IBinder contextThread, IBinder token, Activity target, Intent[] intents, Bundle options, int userId) { @@ -1945,7 +1945,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ActivityResult execStartActivityAsCaller( Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options, IBinder permissionToken, @@ -1993,7 +1993,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void execStartActivityFromAppTask( Context who, IBinder contextThread, IAppTask appTask, Intent intent, Bundle options) { diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 545c3f70d466..2122e92ba5b5 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -531,7 +531,7 @@ public class KeyguardManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isDeviceSecure(int userId) { try { return mTrustManager.isDeviceSecure(userId); diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index b6094627d1f6..202b6152d2ea 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -117,7 +117,7 @@ public final class LoadedApk { private String[] mOverlayDirs; @UnsupportedAppUsage private String mDataDir; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mLibDir; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private File mDataDirFile; @@ -286,7 +286,7 @@ public final class LoadedApk { return mSecurityViolation; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CompatibilityInfo getCompatibilityInfo() { return mDisplayAdjustments.getCompatibilityInfo(); } @@ -1739,7 +1739,7 @@ public final class LoadedApk { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IServiceConnection lookupServiceDispatcher(ServiceConnection c, Context context) { synchronized (mServices) { @@ -1805,7 +1805,7 @@ public final class LoadedApk { static final class ServiceDispatcher { private final ServiceDispatcher.InnerConnection mIServiceConnection; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final ServiceConnection mConnection; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Context mContext; @@ -1824,7 +1824,7 @@ public final class LoadedApk { } private static class InnerConnection extends IServiceConnection.Stub { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final WeakReference mDispatcher; InnerConnection(LoadedApk.ServiceDispatcher sd) { @@ -1843,7 +1843,7 @@ public final class LoadedApk { private final ArrayMap mActiveConnections = new ArrayMap(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ServiceDispatcher(ServiceConnection conn, Context context, Handler activityThread, int flags) { mIServiceConnection = new InnerConnection(this); @@ -1908,7 +1908,7 @@ public final class LoadedApk { return mConnection; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage IServiceConnection getIServiceConnection() { return mIServiceConnection; } diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index 12d16049d1c3..74bc9e215106 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -71,7 +71,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private NativeContentView mNativeContentView; private InputMethodManager mIMM; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeHandle; private InputQueue mCurInputQueue; @@ -87,7 +87,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private boolean mDestroyed; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private native long loadNativeCode(String path, String funcname, MessageQueue queue, String internalDataPath, String obbPath, String externalDataPath, int sdkVersion, AssetManager assetMgr, byte[] savedState, ClassLoader classLoader, String libraryPath); @@ -315,22 +315,22 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void setWindowFlags(int flags, int mask) { getWindow().setFlags(flags, mask); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void setWindowFormat(int format) { getWindow().setFormat(format); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void showIme(int mode) { mIMM.showSoftInput(mNativeContentView, mode); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void hideIme(int mode) { mIMM.hideSoftInputFromWindow(mNativeContentView.getWindowToken(), mode); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index a1abe3d8190b..5e50b96a23d5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5266,7 +5266,7 @@ public class Notification implements Parcelable /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String loadHeaderAppName() { CharSequence name = null; final PackageManager pm = mContext.getPackageManager(); diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index 27cd78acb35f..f3bd04cd132e 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1112,7 +1112,7 @@ public class NotificationManager { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ZenModeConfig getZenModeConfig() { INotificationManager service = getService(); try { diff --git a/core/java/android/app/PackageDeleteObserver.java b/core/java/android/app/PackageDeleteObserver.java index 4ff6f2a5133b..d8803aa13e42 100644 --- a/core/java/android/app/PackageDeleteObserver.java +++ b/core/java/android/app/PackageDeleteObserver.java @@ -19,12 +19,11 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.pm.IPackageDeleteObserver2; -import android.os.Build; /** {@hide} */ public class PackageDeleteObserver { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PackageDeleteObserver() { } diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 40dee52c557e..1f81c44e54cb 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -311,7 +311,7 @@ public final class PendingIntent implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void setOnMarshaledListener(OnMarshaledListener listener) { sOnMarshaledListener.set(listener); } diff --git a/core/java/android/app/QueuedWork.java b/core/java/android/app/QueuedWork.java index edf0a46b1433..a1fcf53a2c37 100644 --- a/core/java/android/app/QueuedWork.java +++ b/core/java/android/app/QueuedWork.java @@ -17,7 +17,6 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -218,7 +217,7 @@ public class QueuedWork { * @param work The new runnable to process * @param shouldDelay If the message should be delayed */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void queue(Runnable work, boolean shouldDelay) { Handler handler = getHandler(); diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 7dd7c901ff84..dcb53505227a 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -31,7 +31,6 @@ import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Rect; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -779,7 +778,7 @@ public class SearchManager * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isVisible() { return mSearchDialog == null? false : mSearchDialog.isShowing(); } diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java index bc1bcbc4f80e..3df164822f32 100644 --- a/core/java/android/app/SharedPreferencesImpl.java +++ b/core/java/android/app/SharedPreferencesImpl.java @@ -130,7 +130,7 @@ final class SharedPreferencesImpl implements SharedPreferences { startLoadFromDisk(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void startLoadFromDisk() { synchronized (mLock) { mLoaded = false; diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index b8fae6755bfd..864db2722d53 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -26,7 +26,6 @@ import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -55,7 +54,7 @@ public class StatusBarManager { /** @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DISABLE_NOTIFICATION_TICKER = View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER; /** @hide */ @@ -314,7 +313,7 @@ public class StatusBarManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void expandSettingsPanel(@Nullable String subPanel) { try { final IStatusBarService svc = getService(); @@ -327,7 +326,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIcon(String slot, int iconId, int iconLevel, String contentDescription) { try { final IStatusBarService svc = getService(); @@ -341,7 +340,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void removeIcon(String slot) { try { final IStatusBarService svc = getService(); @@ -354,7 +353,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIconVisibility(String slot, boolean visible) { try { final IStatusBarService svc = getService(); diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index 8a3ae04a3589..5caf3057c840 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -26,7 +26,6 @@ import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; -import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; @@ -46,7 +45,7 @@ public class TaskInfo { * running user of the system otherwise. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int userId; /** diff --git a/core/java/android/app/TaskStackListener.java b/core/java/android/app/TaskStackListener.java index 70ad9af8a037..e77d7ac6a4ad 100644 --- a/core/java/android/app/TaskStackListener.java +++ b/core/java/android/app/TaskStackListener.java @@ -21,7 +21,6 @@ import android.app.ActivityManager.TaskSnapshot; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -38,35 +37,35 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onTaskStackChanged() throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityPinned(String packageName, int userId, int taskId, int stackId) throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityUnpinned() throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityForcedResizable(String packageName, int taskId, int reason) throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityDismissingDockedStack() throws RemoteException { } @@ -81,12 +80,12 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * #onActivityLaunchOnSecondaryDisplayFailed(RunningTaskInfo, int)} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityLaunchOnSecondaryDisplayFailed() throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityLaunchOnSecondaryDisplayRerouted(RunningTaskInfo taskInfo, int requestedDisplayId) throws RemoteException { } @@ -96,7 +95,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onTaskRemoved(int taskId) throws RemoteException { } @@ -110,7 +109,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * @deprecated see {@link #onTaskMovedToFront(RunningTaskInfo)} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onTaskMovedToFront(int taskId) throws RemoteException { } @@ -142,18 +141,18 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onTaskProfileLocked(int taskId, int userId) throws RemoteException { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) throws RemoteException { if (Binder.getCallingPid() != android.os.Process.myPid() && snapshot != null && snapshot.getHardwareBuffer() != null) { @@ -163,7 +162,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken) throws RemoteException { } diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index 290e12191de8..255b93f79811 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -25,7 +25,6 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.hardware.input.InputManager; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.Process; @@ -89,7 +88,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { private int mOwningUid; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public UiAutomationConnection() { } diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 42b4c5c389bb..08a210b069b9 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -9,7 +9,6 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; -import android.os.Build; import android.os.RemoteException; import android.service.vr.IPersistentVrStateCallbacks; import android.service.vr.IVrManager; @@ -52,7 +51,7 @@ public class VrManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final IVrManager mService; private Map mCallbackMap = new ArrayMap<>(); diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index ab0901da632f..54f3209e17be 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1977,7 +1977,7 @@ public class WallpaperManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static InputStream openDefaultWallpaper(Context context, @SetWallpaperFlags int which) { final String whichProp; final int defaultResId; diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 1ee8e4fce58b..4c541b3f6b76 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -459,7 +459,7 @@ public final class DeviceAdminInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ArrayList getUsedPolicies() { ArrayList res = new ArrayList(); for (int i=0; i exclusionList ) { throwIfParentInstance("setGlobalProxy"); @@ -6308,7 +6308,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setActiveAdmin(@NonNull ComponentName policyReceiver, boolean refreshing, int userHandle) { if (mService != null) { @@ -7022,7 +7022,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable ComponentName getProfileOwnerAsUser(final int userId) { if (mService != null) { try { @@ -7437,7 +7437,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN) public @Nullable List getTrustAgentConfiguration( @Nullable ComponentName admin, @NonNull ComponentName agent, int userHandle) { @@ -10623,7 +10623,7 @@ public class DevicePolicyManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void throwIfParentInstance(String functionName) { if (mParentInstance) { throw new SecurityException(functionName + " cannot be called on the parent instance"); diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 86f91d79ad2b..5a4ab48f3823 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemProperties; @@ -525,7 +524,7 @@ public class SecurityLog { * Constructor used by native classes to generate SecurityEvent instances. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ SecurityEvent(byte[] data) { this(0, data); } diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index 50d7cec0bc71..fb161d41acd2 100644 --- a/core/java/android/app/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -18,7 +18,6 @@ package android.app.backup; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -69,7 +68,7 @@ public class BackupDataOutput { private final long mQuota; private final int mTransportFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage long mBackupWriter; /** diff --git a/core/java/android/app/backup/FullBackup.java b/core/java/android/app/backup/FullBackup.java index c854abac291e..587e883edaf2 100644 --- a/core/java/android/app/backup/FullBackup.java +++ b/core/java/android/app/backup/FullBackup.java @@ -20,7 +20,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.XmlResourceParser; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.Process; import android.os.storage.StorageManager; @@ -92,7 +91,7 @@ public class FullBackup { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static public native int backupToTar(String packageName, String domain, String linkdomain, String rootpath, String path, FullBackupDataOutput output); diff --git a/core/java/android/app/backup/FullBackupDataOutput.java b/core/java/android/app/backup/FullBackupDataOutput.java index a47478cc66a7..d8fa0f586b7a 100644 --- a/core/java/android/app/backup/FullBackupDataOutput.java +++ b/core/java/android/app/backup/FullBackupDataOutput.java @@ -1,7 +1,6 @@ package android.app.backup; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -78,7 +77,7 @@ public class FullBackupDataOutput { public BackupDataOutput getData() { return mData; } /** @hide - used for measurement pass */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addSize(long size) { if (size > 0) { mSize += size; diff --git a/core/java/android/app/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl index e1bbc08e72f3..e177a74915ee 100644 --- a/core/java/android/app/backup/IBackupManager.aidl +++ b/core/java/android/app/backup/IBackupManager.aidl @@ -74,7 +74,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.clearBackupDataForUser} for the calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void clearBackupData(String transportName, String packageName); /** @@ -157,7 +157,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setBackupEnabled(boolean isEnabled); /** @@ -181,7 +181,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setAutoRestoreForUser} for the calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setAutoRestore(boolean doAutoRestore); /** @@ -198,7 +198,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.isBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isBackupEnabled(); /** @@ -327,7 +327,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.acknowledgeFullBackupOrRestoreForUser} for the * calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void acknowledgeFullBackupOrRestore(int token, boolean allow, in String curPassword, in String encryptionPassword, IFullBackupRestoreObserver observer); @@ -404,7 +404,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.listAllTransportsForUser} for the calling user id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String[] listAllTransports(); /** @@ -442,7 +442,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.selectBackupTransportForUser} for the calling user * id. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String selectBackupTransport(String transport); /** @@ -595,7 +595,7 @@ interface IBackupManager { * @param whichUser User handle of the defined user whose backup active state * is being queried. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isBackupServiceActive(int whichUser); /** diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index e059f177e344..8320f49f132f 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -24,7 +24,6 @@ import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.app.ResultInfo; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -38,7 +37,7 @@ import java.util.Objects; */ public class ActivityResultItem extends ActivityTransactionItem { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private List mResultInfoList; /* TODO(b/78294732) diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index 723fa012c902..ac57f2bf80e0 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -24,7 +24,6 @@ import android.annotation.Nullable; import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -40,7 +39,7 @@ import java.util.Objects; */ public class NewIntentItem extends ActivityTransactionItem { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private List mIntents; private boolean mResume; diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl index 2c1e951b6128..ed6ba0c5efa4 100644 --- a/core/java/android/app/usage/IUsageStatsManager.aidl +++ b/core/java/android/app/usage/IUsageStatsManager.aidl @@ -28,10 +28,10 @@ import java.util.Map; * {@hide} */ interface IUsageStatsManager { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ParceledListSlice queryUsageStats(int bucketType, long beginTime, long endTime, String callingPackage); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ParceledListSlice queryConfigurationStats(int bucketType, long beginTime, long endTime, String callingPackage); ParceledListSlice queryEventStats(int bucketType, long beginTime, long endTime, @@ -40,9 +40,9 @@ interface IUsageStatsManager { UsageEvents queryEventsForPackage(long beginTime, long endTime, String callingPackage); UsageEvents queryEventsForUser(long beginTime, long endTime, int userId, String callingPackage); UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setAppInactive(String packageName, boolean inactive, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isAppInactive(String packageName, int userId, String callingPackage); void onCarrierPrivilegedAppsChanged(); void reportChooserSelection(String packageName, int userId, String contentType, diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java index 1ddfe0d2479a..fc8248e1012a 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/core/java/android/app/usage/NetworkStatsManager.java @@ -34,7 +34,6 @@ import android.net.NetworkTemplate; import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.NetworkStatsProvider; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -130,7 +129,7 @@ public class NetworkStatsManager { /** * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetworkStatsManager(Context context) throws ServiceNotFoundException { this(context, INetworkStatsService.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE))); @@ -154,7 +153,7 @@ public class NetworkStatsManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public void setPollForce(boolean pollForce) { if (pollForce) { diff --git a/core/java/android/appwidget/AppWidgetHost.java b/core/java/android/appwidget/AppWidgetHost.java index 565e4cd7fea0..467b2fba1102 100644 --- a/core/java/android/appwidget/AppWidgetHost.java +++ b/core/java/android/appwidget/AppWidgetHost.java @@ -25,7 +25,6 @@ import android.content.Context; import android.content.IntentSender; import android.content.pm.PackageManager; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -55,7 +54,7 @@ public class AppWidgetHost { static final int HANDLE_UPDATE = 1; static final int HANDLE_PROVIDER_CHANGED = 2; static final int HANDLE_PROVIDERS_CHANGED = 3; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static final int HANDLE_VIEW_DATA_CHANGED = 4; static final int HANDLE_APP_WIDGET_REMOVED = 5; @@ -174,7 +173,7 @@ public class AppWidgetHost { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AppWidgetHost(Context context, int hostId, OnClickHandler handler, Looper looper) { mContextOpPackageName = context.getOpPackageName(); mHostId = hostId; diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index a3c3a0e106a3..3fef92b203b6 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -30,7 +30,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; -import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; import android.os.Parcelable; @@ -287,7 +286,7 @@ public class AppWidgetHostView extends FrameLayout { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth, int maxHeight, boolean ignorePadding) { if (newOptions == null) { diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 37093a10b2f0..009ec522e436 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -34,7 +34,6 @@ import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.pm.ShortcutInfo; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -944,7 +943,7 @@ public class AppWidgetManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void bindAppWidgetId(int appWidgetId, ComponentName provider, Bundle options) { if (mService == null) { return; @@ -1115,7 +1114,7 @@ public class AppWidgetManager { * @see Context#getServiceDispatcher(ServiceConnection, Handler, int) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean bindRemoteViewsService(Context context, int appWidgetId, Intent intent, IServiceConnection connection, @Context.BindServiceFlags int flags) { if (mService == null) { diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index c0cb32346821..5374d6d55ee3 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -118,7 +118,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -139,7 +139,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_CODEC_CONFIG_CHANGED = "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED"; @@ -409,7 +409,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); try { @@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * is active * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { @@ -651,7 +651,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @return the current codec status * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) { @@ -680,7 +680,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @param codecConfig the codec configuration preference * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public void setCodecConfigPreference(@NonNull BluetoothDevice device, @NonNull BluetoothCodecConfig codecConfig) { @@ -710,7 +710,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public void enableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")"); @@ -725,7 +725,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public void disableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")"); @@ -766,7 +766,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_SUPPORTED. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsSupportStatus public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) { @@ -792,7 +792,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsPreferenceStatus public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) { @@ -819,7 +819,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device, @OptionalCodecsPreferenceStatus int value) { diff --git a/core/java/android/bluetooth/BluetoothA2dpSink.java b/core/java/android/bluetooth/BluetoothA2dpSink.java index 67f3d7b5d717..53f87e6bc05b 100755 --- a/core/java/android/bluetooth/BluetoothA2dpSink.java +++ b/core/java/android/bluetooth/BluetoothA2dpSink.java @@ -24,7 +24,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -159,7 +158,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 475be121b735..573892bcf014 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -40,7 +40,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.BatteryStats; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.ParcelUuid; import android.os.RemoteException; @@ -1171,7 +1170,7 @@ public final class BluetoothAdapter { * @return true to indicate adapter shutdown has begun, or false on immediate error * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean disable(boolean persist) { try { @@ -1220,7 +1219,7 @@ public final class BluetoothAdapter { * @return true to indicate that the config file was successfully cleared * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset() { try { @@ -2626,7 +2625,7 @@ public final class BluetoothAdapter { * permissions, or channel in use. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(String name, UUID uuid) throws IOException { return createNewRfcommSocketAndRecord(name, uuid, false, true); diff --git a/core/java/android/bluetooth/BluetoothCodecStatus.java b/core/java/android/bluetooth/BluetoothCodecStatus.java index 3a65aaa0d16c..7764ebeb2e33 100644 --- a/core/java/android/bluetooth/BluetoothCodecStatus.java +++ b/core/java/android/bluetooth/BluetoothCodecStatus.java @@ -18,7 +18,6 @@ package android.bluetooth; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +39,7 @@ public final class BluetoothCodecStatus implements Parcelable { * This extra represents the current codec status of the A2DP * profile. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_CODEC_STATUS = "android.bluetooth.extra.CODEC_STATUS"; @@ -199,7 +198,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return the current codec configuration */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable BluetoothCodecConfig getCodecConfig() { return mCodecConfig; } @@ -209,7 +208,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs local capabilities */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() { return mCodecsLocalCapabilities; } @@ -219,7 +218,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs selectable capabilities */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() { return mCodecsSelectableCapabilities; } diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 3b8dec7bf955..1b0fe9dc2d78 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -28,7 +28,6 @@ import android.annotation.SystemApi; import android.app.PropertyInvalidatedCache; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.Handler; import android.os.Parcel; import android.os.ParcelUuid; @@ -370,7 +369,7 @@ public final class BluetoothDevice implements Parcelable { /** @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_SDP_RECORD = "android.bluetooth.device.action.SDP_RECORD"; @@ -666,7 +665,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_AUTH_FAILED = 1; /** @@ -675,7 +674,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_AUTH_REJECTED = 2; /** @@ -690,7 +689,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_REMOTE_DEVICE_DOWN = 4; /** @@ -698,7 +697,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5; /** @@ -706,7 +705,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_AUTH_TIMEOUT = 6; /** @@ -714,7 +713,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7; /** @@ -723,7 +722,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8; /** @@ -802,7 +801,7 @@ public final class BluetoothDevice implements Parcelable { "android.bluetooth.device.extra.SDP_RECORD"; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_SDP_SEARCH_STATUS = "android.bluetooth.device.extra.SDP_SEARCH_STATUS"; @@ -1135,7 +1134,7 @@ public final class BluetoothDevice implements Parcelable { * @return true on success, false on error * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public boolean setAlias(@NonNull String alias) { final IBluetooth service = sService; @@ -1574,7 +1573,7 @@ public final class BluetoothDevice implements Parcelable { * @return true pin has been set false for error * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean setPin(@NonNull String pin) { byte[] pinBytes = convertPinToBytes(pin); @@ -2188,7 +2187,7 @@ public final class BluetoothDevice implements Parcelable { * operations. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public BluetoothGatt connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport, boolean opportunistic, int phy, Handler handler) { diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index 7a6ff79623af..6d22eb93fd02 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -58,9 +58,9 @@ public final class BluetoothGatt implements BluetoothProfile { private int mConnState; private final Object mStateLock = new Object(); private final Object mDeviceBusyLock = new Object(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Boolean mDeviceBusy = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mTransport; private int mPhy; private boolean mOpportunistic; @@ -881,7 +881,7 @@ public final class BluetoothGatt implements BluetoothProfile { * automatically connect as soon as the remote device becomes available (true). * @return true, if the connection attempt was initiated successfully */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /*package*/ boolean connect(Boolean autoConnect, BluetoothGattCallback callback, Handler handler) { if (DBG) { diff --git a/core/java/android/bluetooth/BluetoothGattService.java b/core/java/android/bluetooth/BluetoothGattService.java index 23dc7c830855..e7809aeb1bb5 100644 --- a/core/java/android/bluetooth/BluetoothGattService.java +++ b/core/java/android/bluetooth/BluetoothGattService.java @@ -16,7 +16,6 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -386,7 +385,7 @@ public class BluetoothGattService implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setAdvertisePreferred(boolean advertisePreferred) { mAdvertisePreferred = advertisePreferred; } diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index 57d1411aa68a..e6d6e7ac5dda 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -27,7 +27,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -113,7 +112,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -636,7 +635,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @return priority of the device * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public int getPriority(BluetoothDevice device) { if (VDBG) log("getPriority(" + device + ")"); @@ -783,7 +782,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadset service = mService; @@ -1031,7 +1030,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type, String name) { final IBluetoothHeadset service = mService; @@ -1130,7 +1129,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) { Log.d(TAG, "setActiveDevice: " + device); @@ -1156,7 +1155,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * is active. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { diff --git a/core/java/android/bluetooth/BluetoothHeadsetClient.java b/core/java/android/bluetooth/BluetoothHeadsetClient.java index e5b2a1e23cc1..28363250ebda 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClient.java @@ -22,7 +22,6 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; @@ -446,7 +445,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -472,7 +471,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -781,7 +780,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * @return true if command has been issued successfully; false * otherwise; upon completion HFP sends {@link #ACTION_CALL_CHANGED} intent. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean acceptCall(BluetoothDevice device, int flag) { if (DBG) log("acceptCall()"); final IBluetoothHeadsetClient service = @@ -830,7 +829,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * #EXTRA_AG_FEATURE_REJECT_CALL}. This method invocation will fail silently when feature is not * supported.

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean rejectCall(BluetoothDevice device) { if (DBG) log("rejectCall()"); final IBluetoothHeadsetClient service = @@ -1015,7 +1014,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * Note: This is an internal function and shouldn't be exposed */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadsetClient service = diff --git a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java index 219d1596fbf3..d1a096e605dd 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java @@ -17,7 +17,6 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -145,7 +144,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return call id. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getId() { return mId; } @@ -165,7 +164,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return state of this particular phone call. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getState() { return mState; } @@ -175,7 +174,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return string representing phone number. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getNumber() { return mNumber; } @@ -194,7 +193,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if call is a multi party call, false otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isMultiParty() { return mMultiParty; } @@ -204,7 +203,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if its outgoing call, false otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isOutgoing() { return mOutgoing; } diff --git a/core/java/android/bluetooth/BluetoothHearingAid.java b/core/java/android/bluetooth/BluetoothHearingAid.java index ff78825e0f96..fa62a02499e0 100644 --- a/core/java/android/bluetooth/BluetoothHearingAid.java +++ b/core/java/android/bluetooth/BluetoothHearingAid.java @@ -26,7 +26,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -86,7 +85,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -303,7 +302,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); final IBluetoothHearingAid service = getService(); @@ -329,7 +328,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * is not active, it will be null on that position. Returns empty list on error. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(Manifest.permission.BLUETOOTH) public @NonNull List getActiveDevices() { if (VDBG) log("getActiveDevices()"); diff --git a/core/java/android/bluetooth/BluetoothMap.java b/core/java/android/bluetooth/BluetoothMap.java index 35549954007e..14a71c44673b 100644 --- a/core/java/android/bluetooth/BluetoothMap.java +++ b/core/java/android/bluetooth/BluetoothMap.java @@ -24,7 +24,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.CloseGuard; @@ -210,7 +209,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothMap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothMapClient.java b/core/java/android/bluetooth/BluetoothMapClient.java index ff6cffb272a5..df11d3adac01 100644 --- a/core/java/android/bluetooth/BluetoothMapClient.java +++ b/core/java/android/bluetooth/BluetoothMapClient.java @@ -24,7 +24,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.Uri; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -389,7 +388,7 @@ public final class BluetoothMapClient implements BluetoothProfile { * @param deliveredIntent intent issued when message is delivered * @return true if the message is enqueued, false on error */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean sendMessage(BluetoothDevice device, Uri[] contacts, String message, PendingIntent sentIntent, PendingIntent deliveredIntent) { if (DBG) Log.d(TAG, "sendMessage(" + device + ", " + contacts + ", " + message); diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java index ecd718cec32b..ce3c7d25a108 100644 --- a/core/java/android/bluetooth/BluetoothPan.java +++ b/core/java/android/bluetooth/BluetoothPan.java @@ -27,7 +27,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -235,7 +234,7 @@ public final class BluetoothPan implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothPan service = getService(); diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java index 6e5c45f3d129..d58a89350195 100644 --- a/core/java/android/bluetooth/BluetoothPbap.java +++ b/core/java/android/bluetooth/BluetoothPbap.java @@ -27,7 +27,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; @@ -323,7 +322,7 @@ public class BluetoothPbap implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean disconnect(BluetoothDevice device) { log("disconnect()"); final IBluetoothPbap service = mService; diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index db851c4f33b9..7538df8bbe5f 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -23,7 +23,6 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -220,7 +219,7 @@ public interface BluetoothProfile { * * @hide **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int PRIORITY_AUTO_CONNECT = 1000; /** diff --git a/core/java/android/bluetooth/BluetoothSap.java b/core/java/android/bluetooth/BluetoothSap.java index 0d70dbdd8427..48e8c1ada255 100644 --- a/core/java/android/bluetooth/BluetoothSap.java +++ b/core/java/android/bluetooth/BluetoothSap.java @@ -21,7 +21,6 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -220,7 +219,7 @@ public final class BluetoothSap implements BluetoothProfile { * @return false on error, true otherwise * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothSap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index 65381dbb2372..d41a6d064d1f 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -18,7 +18,6 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; import android.net.LocalSocket; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.ParcelUuid; import android.os.RemoteException; @@ -112,7 +111,7 @@ public final class BluetoothSocket implements Closeable { public static final int TYPE_L2CAP_LE = 4; /*package*/ static final int EBADFD = 77; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /*package*/ static final int EADDRINUSE = 98; /*package*/ static final int SEC_FLAG_ENCRYPT = 1; diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index d9ea7d237e51..c0c1aa1634ff 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.bluetooth.BluetoothUuid; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.ParcelUuid; import android.util.ArrayMap; import android.util.Log; @@ -196,7 +195,7 @@ public final class ScanRecord { * @param scanRecord The scan record of Bluetooth LE advertisement and/or scan response. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ScanRecord parseFromBytes(byte[] scanRecord) { if (scanRecord == null) { return null; diff --git a/core/java/android/companion/AssociationRequest.java b/core/java/android/companion/AssociationRequest.java index 223005bbf30c..c55f0ff7da93 100644 --- a/core/java/android/companion/AssociationRequest.java +++ b/core/java/android/companion/AssociationRequest.java @@ -19,7 +19,6 @@ package android.companion; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.provider.OneTimeUseBuilder; @@ -61,14 +60,14 @@ public final class AssociationRequest implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isSingleDevice() { return mSingleDevice; } /** @hide */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public List> getDeviceFilters() { return mDeviceFilters; } diff --git a/core/java/android/companion/BluetoothDeviceFilter.java b/core/java/android/companion/BluetoothDeviceFilter.java index be663f7bdc1d..48dab3b264fd 100644 --- a/core/java/android/companion/BluetoothDeviceFilter.java +++ b/core/java/android/companion/BluetoothDeviceFilter.java @@ -27,7 +27,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.provider.OneTimeUseBuilder; @@ -101,7 +100,7 @@ public final class BluetoothDeviceFilter implements DeviceFilter { /** @hide */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ScanFilter getScanFilter() { return mScanFilter; } diff --git a/core/java/android/companion/DeviceFilter.java b/core/java/android/companion/DeviceFilter.java index 37191a246f00..c9cb072904b4 100644 --- a/core/java/android/companion/DeviceFilter.java +++ b/core/java/android/companion/DeviceFilter.java @@ -20,7 +20,6 @@ package android.companion; import android.annotation.IntDef; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcelable; import java.lang.annotation.Retention; @@ -46,11 +45,11 @@ public interface DeviceFilter extends Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean matches(D device); /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage String getDeviceDisplayName(D device); /** @hide */ diff --git a/core/java/android/companion/IFindDeviceCallback.aidl b/core/java/android/companion/IFindDeviceCallback.aidl index a3a47a9fc857..405277b50f5b 100644 --- a/core/java/android/companion/IFindDeviceCallback.aidl +++ b/core/java/android/companion/IFindDeviceCallback.aidl @@ -20,7 +20,7 @@ import android.app.PendingIntent; /** @hide */ interface IFindDeviceCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage oneway void onSuccess(in PendingIntent launcher); oneway void onFailure(in CharSequence reason); } diff --git a/core/java/android/content/ComponentName.java b/core/java/android/content/ComponentName.java index 5f859846a5c1..b1cee0cb00e0 100644 --- a/core/java/android/content/ComponentName.java +++ b/core/java/android/content/ComponentName.java @@ -19,7 +19,6 @@ package android.content; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -242,14 +241,14 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final ForceLoadContentObserver mObserver; Uri mUri; @@ -56,7 +55,7 @@ public class CursorLoader extends AsyncTaskLoader { String mSortOrder; Cursor mCursor; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage CancellationSignal mCancellationSignal; /* Runs on a worker thread */ diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java index becba67a0198..84b0f0e80bab 100644 --- a/core/java/android/content/IContentProvider.java +++ b/core/java/android/content/IContentProvider.java @@ -152,7 +152,7 @@ public interface IContentProvider extends IInterface { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) static final String descriptor = "android.content.IContentProvider"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static final int QUERY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION; static final int GET_TYPE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 1; static final int INSERT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 2; diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl index 2044fc02a7e5..03c99e1a2344 100644 --- a/core/java/android/content/IContentService.aidl +++ b/core/java/android/content/IContentService.aidl @@ -61,7 +61,7 @@ interface IContentService { */ void sync(in SyncRequest request, String callingPackage); void syncAsUser(in SyncRequest request, int userId, String callingPackage); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void cancelSync(in Account account, String authority, in ComponentName cname); void cancelSyncAsUser(in Account account, String authority, in ComponentName cname, int userId); @@ -159,7 +159,7 @@ interface IContentService { * @param cname component to identify sync service, must be null if account/providerName are * non-null. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isSyncActive(in Account account, String authority, in ComponentName cname); /** diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl index 55210d4aa119..9242d0289cfa 100644 --- a/core/java/android/content/ISyncAdapter.aidl +++ b/core/java/android/content/ISyncAdapter.aidl @@ -32,7 +32,7 @@ oneway interface ISyncAdapter { * * @param cb If called back with {@code false} accounts are not synced. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb); /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 06ac5dbed702..9216a0871870 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2338,7 +2338,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_ALARM_CHANGED = "android.intent.action.ALARM_CHANGED"; /** @@ -3724,7 +3724,7 @@ public class Intent implements Parcelable, Cloneable { * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED"; @@ -7444,7 +7444,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SuppressWarnings("AndroidFrameworkEfficientCollections") public static Intent parseCommandArgs(ShellCommand cmd, CommandOptionHandler optionHandler) throws URISyntaxException { @@ -7836,7 +7836,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void printIntentArgsHelp(PrintWriter pw, String prefix) { final String[] lines = new String[] { " specifications include these flags and arguments:", @@ -8126,7 +8126,7 @@ public class Intent implements Parcelable, Cloneable { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setAllowFds(boolean allowFds) { if (mExtras != null) { mExtras.setAllowFds(allowFds); @@ -10473,7 +10473,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String toInsecureString() { StringBuilder b = new StringBuilder(128); @@ -11156,7 +11156,7 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void prepareToLeaveProcess(Context context) { final boolean leavingPackage = (mComponent == null) || !Objects.equals(mComponent.getPackageName(), context.getPackageName()); diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index f0633591f16c..5240ab4e476f 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -570,7 +570,7 @@ public class IntentFilter implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void setAutoVerify(boolean autoVerify) { mVerifyState &= ~STATE_VERIFY_AUTO; if (autoVerify) mVerifyState |= STATE_VERIFY_AUTO; @@ -950,7 +950,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean hasExactDataType(String type) { return mDataTypes != null && mDataTypes.contains(type); } @@ -1295,7 +1295,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean hasDataSchemeSpecificPart(PatternMatcher ssp) { if (mDataSchemeSpecificParts == null) { return false; @@ -1379,7 +1379,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean hasDataAuthority(AuthorityEntry auth) { if (mDataAuthorities == null) { return false; @@ -1488,7 +1488,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean hasDataPath(PatternMatcher path) { if (mDataPaths == null) { return false; diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java index 1c21b2aa73a5..ffcdf53ca84d 100644 --- a/core/java/android/content/SyncAdapterType.java +++ b/core/java/android/content/SyncAdapterType.java @@ -35,11 +35,11 @@ public class SyncAdapterType implements Parcelable { private final boolean userVisible; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean supportsUploading; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final boolean isAlwaysSyncable; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final boolean allowParallelSyncs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final String settingsActivity; private final String packageName; diff --git a/core/java/android/content/UndoManager.java b/core/java/android/content/UndoManager.java index 87afbf874b37..ed9cd86927ae 100644 --- a/core/java/android/content/UndoManager.java +++ b/core/java/android/content/UndoManager.java @@ -17,7 +17,6 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.text.TextUtils; import android.util.ArrayMap; @@ -86,11 +85,11 @@ public class UndoManager { */ public static final int MERGE_MODE_ANY = 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public UndoManager() { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public UndoOwner getOwner(String tag, Object data) { if (tag == null) { throw new NullPointerException("tag can't be null"); @@ -127,7 +126,7 @@ public class UndoManager { * Flatten the current undo state into a Parcel object, which can later be restored * with {@link #restoreInstanceState(android.os.Parcel, java.lang.ClassLoader)}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void saveInstanceState(Parcel p) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -176,7 +175,7 @@ public class UndoManager { * associated with each {@link UndoOwner}, which requires separate calls to * {@link #getOwner(String, Object)} to re-associate the owner with its data. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void restoreInstanceState(Parcel p, ClassLoader loader) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -237,7 +236,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually popped. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int undo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -275,7 +274,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually redone. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int redo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -304,12 +303,12 @@ public class UndoManager { * useful for editors to know whether they should be generating new undo state * when they see edit operations happening. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isInUndo() { return mInUndo; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int forgetUndos(UndoOwner[] owners, int count) { if (count < 0) { count = mUndos.size(); @@ -331,7 +330,7 @@ public class UndoManager { return removed; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int forgetRedos(UndoOwner[] owners, int count) { if (count < 0) { count = mRedos.size(); @@ -358,7 +357,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int countUndos(UndoOwner[] owners) { if (owners == null) { return mUndos.size(); @@ -378,7 +377,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int countRedos(UndoOwner[] owners) { if (owners == null) { return mRedos.size(); @@ -418,7 +417,7 @@ public class UndoManager { * they are all matched by a later call to {@link #endUpdate}. * @param label Optional user-visible label for this new undo state. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void beginUpdate(CharSequence label) { if (mInUndo) { throw new IllegalStateException("Can't being update while performing undo/redo"); @@ -451,7 +450,7 @@ public class UndoManager { * Forcibly set a new for the new undo state being built within a {@link #beginUpdate}. * Any existing label will be replaced with this one. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUndoLabel(CharSequence label) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -526,7 +525,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public T getLastOperation(Class clazz, UndoOwner owner, int mergeMode) { if (mWorking == null) { @@ -556,7 +555,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addOperation(UndoOperation op, int mergeMode) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -583,7 +582,7 @@ public class UndoManager { * Finish the creation of an undo state, matching a previous call to * {@link #beginUpdate}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void endUpdate() { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -632,7 +631,7 @@ public class UndoManager { * @return Returns an integer identifier for the committed undo state, which * can later be used to try to uncommit the state to perform further edits on it. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int commitState(UndoOwner owner) { if (mWorking != null && mWorking.hasData()) { if (owner == null || mWorking.hasOperation(owner)) { diff --git a/core/java/android/content/UndoOperation.java b/core/java/android/content/UndoOperation.java index 25aeca3290f3..235d72123ff6 100644 --- a/core/java/android/content/UndoOperation.java +++ b/core/java/android/content/UndoOperation.java @@ -17,7 +17,6 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,7 @@ public abstract class UndoOperation implements Parcelable { * @param owner Who owns the data being modified by this undo state; must be * returned by {@link UndoManager#getOwner(String, Object) UndoManager.getOwner}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public UndoOperation(UndoOwner owner) { mOwner = owner; } @@ -44,7 +43,7 @@ public abstract class UndoOperation implements Parcelable { /** * Construct from a Parcel. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected UndoOperation(Parcel src, ClassLoader loader) { } diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl index 44b5c4482599..3d7e3befd9f1 100644 --- a/core/java/android/content/om/IOverlayManager.aidl +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -37,7 +37,7 @@ interface IOverlayManager { * mapped to lists of overlays; if no overlays exist for the * requested user, an empty map is returned. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Map getAllOverlays(in int userId); /** @@ -61,7 +61,7 @@ interface IOverlayManager { * @return The OverlayInfo for the overlay package; or null if no such * overlay package exists. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage OverlayInfo getOverlayInfo(in String packageName, in int userId); /** diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index 517e4bda68d7..62815ddcfc19 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -22,7 +22,6 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -175,7 +174,7 @@ public final class OverlayInfo implements Parcelable { * The state of this OverlayInfo as defined by the STATE_* constants in this class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final @State int state; /** diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 9c4e6aa3e17f..b371141ca9c1 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -24,7 +24,6 @@ import android.content.Intent; import android.content.res.Configuration; import android.content.res.Configuration.NativeConfig; import android.content.res.TypedArray; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Printer; @@ -374,7 +373,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * {@link android.R.attr#showForAllUsers} attribute. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FLAG_SHOW_FOR_ALL_USERS = 0x0400; /** * Bit in {@link #flags} corresponding to an immersive activity @@ -503,7 +502,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * this activity is launched into such a container a SecurityException will be * thrown. Set from the {@link android.R.attr#allowEmbedded} attribute. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FLAG_ALLOW_EMBEDDED = 0x80000000; /** @@ -870,7 +869,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static @NativeConfig int activityInfoConfigJavaToNative(@Config int input) { int output = 0; for (int i = 0; i < CONFIG_NATIVE_BITS.length; i++) { diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 1cca53f369fa..8f4fc261df37 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -128,7 +128,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int fullBackupContent = 0; /** @@ -2236,7 +2236,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** {@hide} */ public void setGwpAsanMode(@GwpAsanMode int value) { gwpAsanMode = value; } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getCodePath() { return scanSourceDir; } /** {@hide} */ public String getBaseCodePath() { return sourceDir; } /** {@hide} */ public String[] getSplitCodePaths() { return splitSourceDirs; } diff --git a/core/java/android/content/pm/BaseParceledListSlice.java b/core/java/android/content/pm/BaseParceledListSlice.java index 5c7a5488076b..bd847bfdb719 100644 --- a/core/java/android/content/pm/BaseParceledListSlice.java +++ b/core/java/android/content/pm/BaseParceledListSlice.java @@ -18,7 +18,6 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -134,7 +133,7 @@ abstract class BaseParceledListSlice implements Parcelable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public List getList() { return mList; } @@ -208,7 +207,7 @@ abstract class BaseParceledListSlice implements Parcelable { protected abstract void writeElement(T parcelable, Parcel reply, int callFlags); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected abstract void writeParcelableCreator(T parcelable, Parcel dest); protected abstract Parcelable.Creator readParcelableCreator(Parcel from, ClassLoader loader); diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java index c67d00e88707..628bcd70cdf6 100644 --- a/core/java/android/content/pm/ComponentInfo.java +++ b/core/java/android/content/pm/ComponentInfo.java @@ -19,7 +19,6 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Parcel; import android.util.Printer; @@ -159,7 +158,7 @@ public class ComponentInfo extends PackageItemInfo { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ComponentName getComponentName() { return new ComponentName(packageName, name); } diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl index d7c257affd43..2147c397725b 100644 --- a/core/java/android/content/pm/IPackageInstaller.aidl +++ b/core/java/android/content/pm/IPackageInstaller.aidl @@ -48,7 +48,7 @@ interface IPackageInstaller { void registerCallback(IPackageInstallerCallback callback, int userId); void unregisterCallback(IPackageInstallerCallback callback); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void uninstall(in VersionedPackage versionedPackage, String callerPackageName, int flags, in IntentSender statusReceiver, int userId); diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index aaedf92905a8..c32d34457889 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -64,7 +64,7 @@ import android.content.IntentSender; */ interface IPackageManager { void checkPackageStartable(String packageName, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isPackageAvailable(String packageName, int userId); @UnsupportedAppUsage PackageInfo getPackageInfo(String packageName, int flags, int userId); @@ -137,7 +137,7 @@ interface IPackageManager { boolean canForwardTo(in Intent intent, String resolvedType, int sourceUserId, int targetUserId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ParceledListSlice queryIntentActivities(in Intent intent, String resolvedType, int flags, int userId); @@ -182,7 +182,7 @@ interface IPackageManager { * limit that kicks in when flags are included that bloat up the data * returned. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ParceledListSlice getInstalledApplications(int flags, int userId); /** @@ -203,7 +203,7 @@ interface IPackageManager { * @param outInfo Filled in with a list of the ProviderInfo for each * name in 'outNames'. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void querySyncProviders(inout List outNames, inout List outInfo); @@ -214,7 +214,7 @@ interface IPackageManager { InstrumentationInfo getInstrumentationInfo( in ComponentName className, int flags); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ParceledListSlice queryInstrumentation( String targetPackage, int flags); @@ -649,7 +649,7 @@ interface IPackageManager { void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden); boolean setSystemAppInstallState(String packageName, boolean installed, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage IPackageInstaller getPackageInstaller(); boolean setBlockUninstallForUser(String packageName, boolean blockUninstall, int userId); @@ -661,7 +661,7 @@ interface IPackageManager { boolean isPackageSignedByKeySet(String packageName, in KeySet ks); boolean isPackageSignedByKeySetExactly(String packageName, in KeySet ks); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getPermissionControllerPackageName(); ParceledListSlice getInstantApps(int userId); @@ -678,9 +678,9 @@ interface IPackageManager { */ void setUpdateAvailable(String packageName, boolean updateAvaialble); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getServicesSystemSharedLibraryPackageName(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getSharedSystemSharedLibraryPackageName(); ChangedPackages getChangedPackages(int sequenceNumber, int userId); @@ -758,7 +758,7 @@ interface IPackageManager { //------------------------------------------------------------------------ // We need to keep these in IPackageManager for app compatibility //------------------------------------------------------------------------ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String[] getAppOpPermissionPackages(String permissionName); @UnsupportedAppUsage @@ -773,10 +773,10 @@ interface IPackageManager { @UnsupportedAppUsage void removePermission(String name); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int checkPermission(String permName, String pkgName, int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void grantRuntimePermission(String packageName, String permissionName, int userId); //------------------------------------------------------------------------ diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 596d39b50848..e2f85282948a 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1497,13 +1497,13 @@ public class PackageInstaller { /** {@hide} */ public @InstallReason int installReason = PackageManager.INSTALL_REASON_UNKNOWN; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long sizeBytes = -1; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String appPackageName; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Bitmap appIcon; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -1513,7 +1513,7 @@ public class PackageInstaller { /** {@hide} */ public Uri originatingUri; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int originatingUid = UID_UNKNOWN; /** {@hide} */ public Uri referrerUri; @@ -2148,13 +2148,13 @@ public class PackageInstaller { /** {@hide} */ public String installerAttributionTag; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String resolvedBaseCodePath; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public float progress; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean sealed; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2227,7 +2227,7 @@ public class PackageInstaller { public int rollbackDataPolicy; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SessionInfo() { } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5bc97ed99d8c..3fb9a9e924e7 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1791,7 +1791,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int MOVE_INTERNAL = 0x00000001; /** @@ -1800,7 +1800,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int MOVE_EXTERNAL_MEDIA = 0x00000002; /** {@hide} */ @@ -3660,7 +3660,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services"; @@ -3673,7 +3673,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared"; @@ -7483,14 +7483,14 @@ public abstract class PackageManager { public abstract void unregisterMoveCallback(@NonNull MoveCallback callback); /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public abstract int movePackage(@NonNull String packageName, @NonNull VolumeInfo vol); /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public abstract @Nullable VolumeInfo getPackageCurrentVolume(@NonNull ApplicationInfo app); /** {@hide} */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public abstract List getPackageCandidateVolumes( @NonNull ApplicationInfo app); @@ -7581,7 +7581,7 @@ public abstract class PackageManager { /** {@hide} */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String installStatusToString(int status, @Nullable String msg) { final String str = installStatusToString(status); if (msg != null) { diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 118524d494de..177f691a97c1 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -288,7 +288,7 @@ public class PackageParser { public String[] mSeparateProcesses; private boolean mOnlyCoreApps; private DisplayMetrics mMetrics; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Callback mCallback; private File mCacheDir; @@ -1364,7 +1364,7 @@ public class PackageParser { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void collectCertificates(Package pkg, File apkFile, boolean skipVerify) throws PackageParserException { final String apkPath = apkFile.getAbsolutePath(); @@ -6539,7 +6539,7 @@ public class PackageParser { } /** set the signing certificates by which the APK proved it can be authenticated */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Builder setPastSigningCertificates(Signature[] pastSigningCertificates) { mPastSigningCertificates = pastSigningCertificates; return this; @@ -6753,9 +6753,9 @@ public class PackageParser { /** * Data used to feed the KeySetManagerService */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ArraySet mUpgradeKeySets; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ArrayMap> mKeySetMapping; /** diff --git a/core/java/android/content/pm/ParceledListSlice.java b/core/java/android/content/pm/ParceledListSlice.java index b54bc5daf31f..73119e05095b 100644 --- a/core/java/android/content/pm/ParceledListSlice.java +++ b/core/java/android/content/pm/ParceledListSlice.java @@ -62,7 +62,7 @@ public class ParceledListSlice extends BaseParceledListSli } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void writeParcelableCreator(T parcelable, Parcel dest) { dest.writeParcelableCreator((Parcelable) parcelable); } diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index c6450ffdf91c..0f9e8e59ec94 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -23,7 +23,6 @@ import android.annotation.StringRes; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -452,7 +451,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static @NonNull String protectionToString(int level) { final StringBuilder protLevel = new StringBuilder(); switch (level & PROTECTION_MASK_BASE) { diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java index fe8e4d7b1bb2..4f2bf65adfca 100644 --- a/core/java/android/content/pm/ResolveInfo.java +++ b/core/java/android/content/pm/ResolveInfo.java @@ -21,7 +21,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.IntentFilter; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -184,7 +183,7 @@ public class ResolveInfo implements Parcelable { public boolean handleAllWebDataURI; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ComponentInfo getComponentInfo() { if (activityInfo != null) return activityInfo; if (serviceInfo != null) return serviceInfo; diff --git a/core/java/android/content/pm/VerifierInfo.java b/core/java/android/content/pm/VerifierInfo.java index 3e69ff555946..5f8855572ef0 100644 --- a/core/java/android/content/pm/VerifierInfo.java +++ b/core/java/android/content/pm/VerifierInfo.java @@ -17,7 +17,6 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -45,7 +44,7 @@ public class VerifierInfo implements Parcelable { * not be {@code null} or empty. * @throws IllegalArgumentException if either argument is null or empty. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public VerifierInfo(String packageName, PublicKey publicKey) { if (packageName == null || packageName.length() == 0) { throw new IllegalArgumentException("packageName must not be null or empty"); diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 13433dc7979f..69dd25fa41d7 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -28,7 +28,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; import android.content.res.Configuration.NativeConfig; import android.content.res.loader.ResourcesLoader; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.util.ArraySet; import android.util.Log; @@ -956,7 +955,7 @@ public final class AssetManager implements AutoCloseable { * @see #open(String, int) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @NonNull InputStream openNonAsset(@NonNull String fileName, int accessMode) throws IOException { return openNonAsset(0, fileName, accessMode); @@ -969,7 +968,7 @@ public final class AssetManager implements AutoCloseable { * @param fileName Name of the asset to retrieve. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @NonNull InputStream openNonAsset(int cookie, @NonNull String fileName) throws IOException { return openNonAsset(cookie, fileName, ACCESS_STREAMING); @@ -1106,7 +1105,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void applyStyle(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable XmlBlock.Parser parser, @NonNull int[] inAttrs, long outValuesAddress, long outIndicesAddress) { @@ -1129,7 +1128,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean resolveAttrs(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable int[] inValues, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { @@ -1145,7 +1144,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean retrieveAttributes(@NonNull XmlBlock.Parser parser, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { Objects.requireNonNull(parser, "parser"); @@ -1187,7 +1186,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void setThemeTo(long dstThemePtr, @NonNull AssetManager srcAssetManager, long srcThemePtr) { synchronized (this) { ensureValidLocked(); diff --git a/core/java/android/content/res/ColorStateList.java b/core/java/android/content/res/ColorStateList.java index 921c63025a57..f23c802d98e2 100644 --- a/core/java/android/content/res/ColorStateList.java +++ b/core/java/android/content/res/ColorStateList.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.Resources.Theme; import android.graphics.Color; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -481,7 +480,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { * @hide only for resource preloading */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ColorStateList obtainForTheme(Theme t) { if (t == null || !canApplyTheme()) { return this; @@ -644,7 +643,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { /** * Updates the default color and opacity. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void onColorsChanged() { int defaultColor = DEFAULT_COLOR; boolean isOpaque = true; diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index f6edb2edc5ff..f8ed27a6646b 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -514,7 +514,7 @@ public class CompatibilityInfo implements Parcelable { * @param outDm If non-null the width and height will be set to their scaled values. * @return Returns the scaling factor for the window. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static float computeCompatibleScaling(DisplayMetrics dm, DisplayMetrics outDm) { final int width = dm.noncompatWidthPixels; final int height = dm.noncompatHeightPixels; diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index ce4ed8edec11..9f3634443d62 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -839,7 +839,7 @@ public final class Configuration implements Parcelable, Comparable { * @return a new instance of the resource, or {@code null} if not in * the cache */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Drawable getInstance(long key, Resources resources, Resources.Theme theme) { final Drawable.ConstantState entry = get(key, theme); if (entry != null) { diff --git a/core/java/android/content/res/ObbInfo.java b/core/java/android/content/res/ObbInfo.java index 6cafb3196735..c477abcea8ba 100644 --- a/core/java/android/content/res/ObbInfo.java +++ b/core/java/android/content/res/ObbInfo.java @@ -17,7 +17,6 @@ package android.content.res; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +54,7 @@ public class ObbInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public byte[] salt; // Only allow things in this package to instantiate. diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 260f03bab7e4..c1f0a5f778b9 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -317,7 +317,7 @@ public class Resources { * class loader * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Resources(@Nullable ClassLoader classLoader) { mClassLoader = classLoader == null ? ClassLoader.getSystemClassLoader() : classLoader; } @@ -394,7 +394,7 @@ public class Resources { * @return the inflater used to create drawable objects * @hide Pending API finalization. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final DrawableInflater getDrawableInflater() { if (mDrawableInflater == null) { mDrawableInflater = new DrawableInflater(this, mClassLoader); @@ -987,7 +987,7 @@ public class Resources { } @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage Drawable loadDrawable(@NonNull TypedValue value, int id, int density, @Nullable Theme theme) throws NotFoundException { return mResourcesImpl.loadDrawable(this, value, id, density, theme); @@ -2057,7 +2057,7 @@ public class Resources { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public DisplayAdjustments getDisplayAdjustments() { final DisplayAdjustments overrideDisplayAdjustments = mOverrideDisplayAdjustments; if (overrideDisplayAdjustments != null) { diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index 78cea15ea33e..bbcacefb02c9 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -78,9 +78,9 @@ public class ResourcesImpl { private static final boolean DEBUG_LOAD = false; private static final boolean DEBUG_CONFIG = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final boolean TRACE_FOR_PRELOAD = false; // Do we still need it? - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final boolean TRACE_FOR_MISS_PRELOAD = false; // Do we still need it? private static final int ID_OTHER = 0x01000004; @@ -88,7 +88,7 @@ public class ResourcesImpl { private static final Object sSync = new Object(); private static boolean sPreloaded; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mPreloading; // Information about preloaded resources. Note that they are not @@ -146,7 +146,7 @@ public class ResourcesImpl { private PluralRules mPluralRule; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Configuration mConfiguration = new Configuration(); static { @@ -166,7 +166,7 @@ public class ResourcesImpl { * @param displayAdjustments this resource's Display override and compatibility info. * Must not be null. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ResourcesImpl(@NonNull AssetManager assets, @Nullable DisplayMetrics metrics, @Nullable Configuration config, @NonNull DisplayAdjustments displayAdjustments) { mAssets = assets; @@ -185,7 +185,7 @@ public class ResourcesImpl { return mAssets; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage DisplayMetrics getDisplayMetrics() { if (DEBUG_CONFIG) Slog.v(TAG, "Returning DisplayMetrics: " + mMetrics.widthPixels + "x" + mMetrics.heightPixels + " " + mMetrics.density); @@ -213,7 +213,7 @@ public class ResourcesImpl { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void getValue(@AnyRes int id, TypedValue outValue, boolean resolveRefs) throws NotFoundException { boolean found = mAssets.getResourceValue(id, 0, outValue, resolveRefs); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 5eaa7662b250..29c5c935c1bf 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -25,7 +25,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo.Config; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.StrictMode; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -76,17 +75,17 @@ public class TypedArray { @UnsupportedAppUsage private final Resources mResources; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private DisplayMetrics mMetrics; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AssetManager mAssets; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mRecycled; @UnsupportedAppUsage /*package*/ XmlBlock.Parser mXml; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /*package*/ Resources.Theme mTheme; /** * mData is used to hold the value/id and other metadata about each attribute. diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java index b0291ce6d842..fcbe36246273 100644 --- a/core/java/android/content/res/XmlBlock.java +++ b/core/java/android/content/res/XmlBlock.java @@ -21,7 +21,6 @@ import static android.content.res.Resources.ID_NULL; import android.annotation.AnyRes; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.TypedValue; import com.android.internal.annotations.VisibleForTesting; @@ -481,7 +480,7 @@ public final class XmlBlock implements AutoCloseable { return mStrings.get(id); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /*package*/ long mParseState; @UnsupportedAppUsage private final XmlBlock mBlock; diff --git a/core/java/android/database/AbstractWindowedCursor.java b/core/java/android/database/AbstractWindowedCursor.java index 18562034e38c..daf7d2b1e908 100644 --- a/core/java/android/database/AbstractWindowedCursor.java +++ b/core/java/android/database/AbstractWindowedCursor.java @@ -17,7 +17,6 @@ package android.database; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A base class for Cursors that store their data in {@link CursorWindow}s. @@ -182,7 +181,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { * Closes the cursor window and sets {@link #mWindow} to null. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void closeWindow() { if (mWindow != null) { mWindow.close(); diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java index 1db948aba7c6..edb7b715e944 100644 --- a/core/java/android/database/CursorWindow.java +++ b/core/java/android/database/CursorWindow.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.database.sqlite.SQLiteClosable; import android.database.sqlite.SQLiteException; import android.os.Binder; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Process; @@ -768,7 +767,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String printStats() { StringBuilder buff = new StringBuilder(); int myPid = Process.myPid(); diff --git a/core/java/android/database/sqlite/SQLiteCustomFunction.java b/core/java/android/database/sqlite/SQLiteCustomFunction.java index 4a15f7010d54..1ace40d7e913 100644 --- a/core/java/android/database/sqlite/SQLiteCustomFunction.java +++ b/core/java/android/database/sqlite/SQLiteCustomFunction.java @@ -27,7 +27,7 @@ import android.os.Build; public final class SQLiteCustomFunction { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final String name; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int numArgs; public final SQLiteDatabase.CustomFunction callback; @@ -52,7 +52,7 @@ public final class SQLiteCustomFunction { // Called from native. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void dispatchCallback(String[] args) { callback.callback(args); } diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 9684ece5d9c1..a2cbdd3829ff 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -31,7 +31,6 @@ import android.database.DatabaseUtils; import android.database.DefaultDatabaseErrorHandler; import android.database.SQLException; import android.database.sqlite.SQLiteDebug.DbStats; -import android.os.Build; import android.os.CancellationSignal; import android.os.Looper; import android.os.OperationCanceledException; @@ -104,7 +103,7 @@ public final class SQLiteDatabase extends SQLiteClosable { // Thread-local for database sessions that belong to this database. // Each thread has its own database session. // INVARIANT: Immutable. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final ThreadLocal mThreadSession = ThreadLocal .withInitial(this::createSession); diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 1afa0f8d7090..165f863ccde7 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -135,7 +135,7 @@ public final class SQLiteDebug { * that overflowed because no space was left in the page cache. * documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int pageCacheOverflow; /** records the largest memory allocation request handed to sqlite3. diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java index cd4131ce2abb..de1c54321985 100644 --- a/core/java/android/database/sqlite/SQLiteProgram.java +++ b/core/java/android/database/sqlite/SQLiteProgram.java @@ -18,7 +18,6 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; import android.database.DatabaseUtils; -import android.os.Build; import android.os.CancellationSignal; import java.util.Arrays; @@ -38,7 +37,7 @@ public abstract class SQLiteProgram extends SQLiteClosable { private final boolean mReadOnly; private final String[] mColumnNames; private final int mNumParameters; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Object[] mBindArgs; SQLiteProgram(SQLiteDatabase db, String sql, Object[] bindArgs, diff --git a/core/java/android/database/sqlite/SQLiteStatement.java b/core/java/android/database/sqlite/SQLiteStatement.java index d33eadcfd11b..9fda8b011e52 100644 --- a/core/java/android/database/sqlite/SQLiteStatement.java +++ b/core/java/android/database/sqlite/SQLiteStatement.java @@ -17,7 +17,6 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -29,7 +28,7 @@ import android.os.ParcelFileDescriptor; *

*/ public final class SQLiteStatement extends SQLiteProgram { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage SQLiteStatement(SQLiteDatabase db, String sql, Object[] bindArgs) { super(db, sql, bindArgs, null); } diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java index 35da062329b3..4f55921b0488 100644 --- a/core/java/android/ddm/DdmHandleAppName.java +++ b/core/java/android/ddm/DdmHandleAppName.java @@ -17,7 +17,6 @@ package android.ddm; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.Log; import org.apache.harmony.dalvik.ddmc.Chunk; @@ -81,7 +80,7 @@ public class DdmHandleAppName extends ChunkHandler { * before or after DDMS connects. For the latter we need to send up * an APNM message. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void setAppName(String appName, String pkgName, int userId) { if (appName == null || appName.isEmpty() || pkgName == null || pkgName.isEmpty()) return; @@ -91,7 +90,7 @@ public class DdmHandleAppName extends ChunkHandler { sendAPNM(appName, pkgName, userId); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Names getNames() { return sNames; } diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 3bdd39f5d7d7..86031dd918f5 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -245,7 +245,7 @@ public class Camera { * Camera HAL device API version 1.0 * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int CAMERA_HAL_API_VERSION_1_0 = 0x100; /** @@ -1221,7 +1221,7 @@ public class Camera { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(Object camera_ref, int what, int arg1, int arg2, Object obj) { @@ -4415,7 +4415,7 @@ public class Camera { // Splits a comma delimited string to an ArrayList of Area objects. // Example string: "(-10,-10,0,0,300),(0,0,10,10,700)". Return null if // the passing string is null or the size is 0 or (0,0,0,0,0). - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ArrayList splitArea(String str) { if (str == null || str.charAt(0) != '(' || str.charAt(str.length() - 1) != ')') { diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index cad30dda9034..a9b613228070 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -97,7 +97,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { public static final int S_UI8 = 0x35; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeObject; // Invoked on destruction diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index e913986ae792..0f3cdfca70f5 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -509,7 +509,7 @@ public final class Sensor { * * @hide Expected to be used internally for always on display. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int TYPE_PICK_UP_GESTURE = 25; /** @@ -549,7 +549,7 @@ public final class Sensor { * @hide Expected to be used internally for auto-rotate and speaker rotation. * */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int TYPE_DEVICE_ORIENTATION = 27; /** diff --git a/core/java/android/hardware/SerialManager.java b/core/java/android/hardware/SerialManager.java index 26e5129b1fb3..b51382e01ccd 100644 --- a/core/java/android/hardware/SerialManager.java +++ b/core/java/android/hardware/SerialManager.java @@ -19,7 +19,6 @@ package android.hardware; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -48,7 +47,7 @@ public class SerialManager { * * @return names of available serial ports */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String[] getSerialPorts() { try { return mService.getSerialPorts(); @@ -68,7 +67,7 @@ public class SerialManager { * @param speed at which to open the serial port * @return the serial port */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SerialPort openSerialPort(String name, int speed) throws IOException { try { ParcelFileDescriptor pfd = mService.openSerialPort(name); diff --git a/core/java/android/hardware/SerialPort.java b/core/java/android/hardware/SerialPort.java index 2578dd67746e..0fcaa4989210 100644 --- a/core/java/android/hardware/SerialPort.java +++ b/core/java/android/hardware/SerialPort.java @@ -17,7 +17,6 @@ package android.hardware; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -32,7 +31,7 @@ public class SerialPort { private static final String TAG = "SerialPort"; // used by the JNI code - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mNativeContext; private final String mName; private ParcelFileDescriptor mFileDescriptor; @@ -61,7 +60,7 @@ public class SerialPort { /** * Closes the serial port */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void close() throws IOException { if (mFileDescriptor != null) { mFileDescriptor.close(); @@ -105,7 +104,7 @@ public class SerialPort { * @param buffer to write * @param length number of bytes to write */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void write(ByteBuffer buffer, int length) throws IOException { if (buffer.isDirect()) { native_write_direct(buffer, length); diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 376503e79cfc..974913b290b1 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -21,7 +21,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.MemoryFile; @@ -760,13 +759,13 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) throw new NullPointerException(); return nativeDisableSensor(mNativeSensorEventQueue, sensor.getHandle()); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected abstract void dispatchSensorEvent(int handle, float[] values, int accuracy, long timestamp); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected abstract void dispatchFlushCompleteEvent(int handle); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void dispatchAdditionalInfoEvent( int handle, int type, int serial, float[] floatValues, int[] intValues) { // default implementation is do nothing diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java index 76d50bdf414c..bed9a0640693 100644 --- a/core/java/android/hardware/biometrics/BiometricConstants.java +++ b/core/java/android/hardware/biometrics/BiometricConstants.java @@ -20,7 +20,6 @@ import static android.hardware.biometrics.BiometricManager.Authenticators; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -154,7 +153,7 @@ public interface BiometricConstants { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int BIOMETRIC_ERROR_VENDOR_BASE = 1000; @IntDef({BIOMETRIC_SUCCESS, diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index 01f0e71a7c33..c7b554b3aafc 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -21,7 +21,6 @@ import android.app.KeyguardManager; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.biometrics.BiometricManager.Authenticators; import android.hardware.fingerprint.FingerprintManager; -import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -168,7 +167,7 @@ public interface BiometricFingerprintConstants { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int FINGERPRINT_ERROR_VENDOR_BASE = 1000; // diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 1f6cbc590774..2efec3fa2ec1 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -26,7 +26,6 @@ import android.hardware.camera2.params.RecommendedStreamConfigurationMap; import android.hardware.camera2.params.SessionConfiguration; import android.hardware.camera2.utils.ArrayUtils; import android.hardware.camera2.utils.TypeReference; -import android.os.Build; import android.util.Rational; import java.util.ArrayList; @@ -80,7 +79,7 @@ public final class CameraCharacteristics extends CameraMetadata type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -194,7 +193,7 @@ public final class CameraCharacteristics extends CameraMetadata> mKeys; private List> mKeysNeedingPermission; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index d931789a7005..47dafa0c61a8 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -26,7 +26,6 @@ import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.utils.HashCodeHelpers; import android.hardware.camera2.utils.SurfaceUtils; import android.hardware.camera2.utils.TypeReference; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.ArraySet; @@ -109,7 +108,7 @@ public final class CaptureRequest extends CameraMetadata> * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -230,7 +229,7 @@ public final class CaptureRequest extends CameraMetadata> private static final ArraySet mEmptySurfaceSet = new ArraySet(); private String mLogicalCameraId; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private CameraMetadataNative mLogicalCameraSettings; private final HashMap mPhysicalCameraSettings = new HashMap(); diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index cd69788f1924..228617c74388 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -24,7 +24,6 @@ import android.hardware.camera2.impl.CaptureResultExtras; import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.SyntheticKey; import android.hardware.camera2.utils.TypeReference; -import android.os.Build; import android.util.Log; import android.util.Rational; @@ -80,7 +79,7 @@ public class CaptureResult extends CameraMetadata> { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 19f4cd6e991a..9d4ab0b08e92 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -64,7 +64,6 @@ import android.hardware.camera2.params.TonemapCurve; import android.hardware.camera2.utils.TypeReference; import android.location.Location; import android.location.LocationManager; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.ServiceSpecificException; @@ -262,7 +261,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean hasTag() { return mHasTag; } @@ -272,7 +271,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void cacheTag(int tag) { mHasTag = true; mTag = tag; @@ -1710,7 +1709,7 @@ public class CameraMetadataNative implements Parcelable { mDisplaySize = displaySize; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mMetadataPtr; // native std::shared_ptr* @FastNative @@ -1735,7 +1734,7 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native long nativeGetBufferSize(long ptr); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @FastNative private static synchronized native byte[] nativeReadValues(int tag, long ptr); @FastNative @@ -1744,11 +1743,11 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @FastNative private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName) throws IllegalArgumentException; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @FastNative private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag) throws IllegalArgumentException; diff --git a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java index 064d4b31363b..16f3f2ab2023 100644 --- a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java +++ b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java @@ -17,7 +17,6 @@ package android.hardware.camera2.utils; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * Provide hashing functions using the Modified Bernstein hash @@ -33,7 +32,7 @@ public final class HashCodeHelpers { * * @return the numeric hash code */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int hashCode(int... array) { if (array == null) { return 0; diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 0f868655f692..68b9d5227746 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -31,7 +31,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.media.projection.MediaProjection; -import android.os.Build; import android.os.Handler; import android.util.Pair; import android.util.SparseArray; @@ -67,7 +66,7 @@ public final class DisplayManager { *

* @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_WIFI_DISPLAY_STATUS_CHANGED = "android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED"; @@ -75,7 +74,7 @@ public final class DisplayManager { * Contains a {@link WifiDisplayStatus} object. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_WIFI_DISPLAY_STATUS = "android.hardware.display.extra.WIFI_DISPLAY_STATUS"; diff --git a/core/java/android/hardware/display/WifiDisplayStatus.java b/core/java/android/hardware/display/WifiDisplayStatus.java index 0004b39e54e8..e2a825fd990a 100644 --- a/core/java/android/hardware/display/WifiDisplayStatus.java +++ b/core/java/android/hardware/display/WifiDisplayStatus.java @@ -17,7 +17,6 @@ package android.hardware.display; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -36,9 +35,9 @@ public final class WifiDisplayStatus implements Parcelable { private final int mFeatureState; private final int mScanState; private final int mActiveDisplayState; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final WifiDisplay mActiveDisplay; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final WifiDisplay[] mDisplays; /** Session info needed for Miracast Certification */ @@ -51,23 +50,23 @@ public final class WifiDisplayStatus implements Parcelable { /** Feature state: Wifi display is turned off in settings. */ public static final int FEATURE_STATE_OFF = 2; /** Feature state: Wifi display is turned on in settings. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FEATURE_STATE_ON = 3; /** Scan state: Not currently scanning. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int SCAN_STATE_NOT_SCANNING = 0; /** Scan state: Currently scanning. */ public static final int SCAN_STATE_SCANNING = 1; /** Display state: Not connected. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DISPLAY_STATE_NOT_CONNECTED = 0; /** Display state: Connecting to active display. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DISPLAY_STATE_CONNECTING = 1; /** Display state: Connected to active display. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DISPLAY_STATE_CONNECTED = 2; public static final @android.annotation.NonNull Creator CREATOR = new Creator() { diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 63397c05edc2..2aefb1da4783 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -41,7 +41,6 @@ import android.hardware.biometrics.BiometricTestSession; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.biometrics.SensorProperties; import android.os.Binder; -import android.os.Build; import android.os.CancellationSignal; import android.os.CancellationSignal.OnCancelListener; import android.os.Handler; @@ -762,7 +761,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * @hide */ @RequiresPermission(USE_FINGERPRINT) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public List getEnrolledFingerprints(int userId) { if (mService != null) try { return mService.getEnrolledFingerprints(userId, mContext.getOpPackageName()); diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index f75b88f8e24d..e9b685754db4 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -231,7 +231,7 @@ public final class InputManager { * Waits for the event to be delivered to the application and handled. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = InputEventInjectionSync.WAIT_FOR_FINISHED; diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java index 313d8efc19be..a1866af43706 100644 --- a/core/java/android/hardware/location/GeofenceHardware.java +++ b/core/java/android/hardware/location/GeofenceHardware.java @@ -169,7 +169,7 @@ public final class GeofenceHardware { GeofenceHardwareMonitorCallbackWrapper>(); /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public GeofenceHardware(IGeofenceHardware service) { mService = service; } diff --git a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl index b32b7e555622..2dfaf601c6f5 100644 --- a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl +++ b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl @@ -32,6 +32,6 @@ oneway interface IActivityRecognitionHardwareClient { * @param isSupported whether the platform has hardware support for the feature * @param instance the available instance to provide access to the feature */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onAvailabilityChanged(in boolean isSupported, in IActivityRecognitionHardware instance); } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index 11f3e4582ac2..e58403fe387d 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -45,7 +45,6 @@ import android.media.soundtrigger_middleware.ISoundTriggerMiddlewareService; import android.media.soundtrigger_middleware.SoundTriggerModuleDescriptor; import android.media.soundtrigger_middleware.Status; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -1175,7 +1174,7 @@ public class SoundTrigger { /** @hide */ @TestApi - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data) { @@ -1381,7 +1380,7 @@ public class SoundTrigger { public static class RecognitionConfig implements Parcelable { /** True if the DSP should capture the trigger sound and make it available for further * capture. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean captureRequested; /** * True if the service should restart listening after the DSP triggers. @@ -1390,12 +1389,12 @@ public class SoundTrigger { public final boolean allowMultipleTriggers; /** List of all keyphrases in the sound model for which recognition should be performed with * options for each keyphrase. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @NonNull public final KeyphraseRecognitionExtra keyphrases[]; /** Opaque data for use by system applications who know about voice engine internals, * typically during enrollment. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @NonNull public final byte[] data; @@ -1561,7 +1560,7 @@ public class SoundTrigger { public final int id; /** Recognition modes matched for this event */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int recognitionModes; /** Confidence level for mode RECOGNITION_MODE_VOICE_TRIGGER when user identification @@ -1668,7 +1667,7 @@ public class SoundTrigger { @NonNull public final KeyphraseRecognitionExtra[] keyphraseExtras; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeyphraseRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data, @@ -1790,7 +1789,7 @@ public class SoundTrigger { * @hide */ public static class GenericRecognitionEvent extends RecognitionEvent implements Parcelable { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public GenericRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @@ -1861,7 +1860,7 @@ public class SoundTrigger { @NonNull public final byte[] data; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage SoundModelEvent(int status, int soundModelHandle, @Nullable byte[] data) { this.status = status; this.soundModelHandle = soundModelHandle; diff --git a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java index 431c99dbdc1f..05823bf14b63 100644 --- a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java +++ b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java @@ -29,7 +29,6 @@ import android.media.soundtrigger_middleware.PhraseRecognitionEvent; import android.media.soundtrigger_middleware.PhraseSoundModel; import android.media.soundtrigger_middleware.RecognitionEvent; import android.media.soundtrigger_middleware.SoundModel; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -49,7 +48,7 @@ public class SoundTriggerModule { private static final int EVENT_RECOGNITION = 1; private static final int EVENT_SERVICE_DIED = 2; private static final int EVENT_SERVICE_STATE_CHANGE = 3; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mId; private EventHandlerDelegate mEventHandlerDelegate; private ISoundTriggerModule mService; diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 21634cc544e7..53a5785f7c76 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -47,7 +47,7 @@ public class UsbDeviceConnection { private Context mContext; // used by the JNI code - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeContext; private final CloseGuard mCloseGuard = CloseGuard.get(); diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index 62a5782cb55d..ef305e2c1867 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -209,7 +209,7 @@ public class UsbManager { * * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String USB_DATA_UNLOCKED = "unlocked"; /** @@ -771,7 +771,7 @@ public class UsbManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFunctionEnabled(String function) { try { return mService.isFunctionEnabled(function); diff --git a/core/java/android/hardware/usb/UsbRequest.java b/core/java/android/hardware/usb/UsbRequest.java index d1c6465d62c8..473df712e3f9 100644 --- a/core/java/android/hardware/usb/UsbRequest.java +++ b/core/java/android/hardware/usb/UsbRequest.java @@ -49,7 +49,7 @@ public class UsbRequest { static final int MAX_USBFS_BUFFER_SIZE = 16384; // used by the JNI code - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeContext; private UsbEndpoint mEndpoint; diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 070bec11b93a..78cc71a782a5 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1139,7 +1139,7 @@ public class InputMethodService extends AbstractInputMethodService { mService.getContentResolver().unregisterContentObserver(this); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean shouldShowImeWithHardKeyboard() { // Lazily initialize as needed. if (mShowImeWithHardKeyboard == ShowImeWithHardKeyboardType.UNKNOWN) { @@ -1179,7 +1179,7 @@ public class InputMethodService extends AbstractInputMethodService { return "SettingsObserver{mShowImeWithHardKeyboard=" + mShowImeWithHardKeyboard + "}"; } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private SettingsObserver mSettingsObserver; /** diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 224113fc29cb..1012f47f8c0a 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -354,7 +354,7 @@ public class ConnectivityManager { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_TETHER_STATE_CHANGED = TetheringManager.ACTION_TETHER_STATE_CHANGED; @@ -363,7 +363,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces configured for * tethering and currently available for tethering. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_AVAILABLE_TETHER = TetheringManager.EXTRA_AVAILABLE_TETHER; /** @@ -378,7 +378,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces currently tethered * (ie, has DHCPv4 support and packets potentially forwarded/NATed) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_ACTIVE_TETHER = TetheringManager.EXTRA_ACTIVE_TETHER; /** @@ -387,7 +387,7 @@ public class ConnectivityManager { * failed. Use {@link #getLastTetherError} to find the error code * for any interfaces listed here. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_ERRORED_TETHER = TetheringManager.EXTRA_ERRORED_TETHER; /** @@ -850,7 +850,7 @@ public class ConnectivityManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String getNetworkTypeName(int type) { switch (type) { case TYPE_NONE: @@ -1173,7 +1173,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.NETWORK_STACK) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetworkInfo getActiveNetworkInfoForUid(int uid) { return getActiveNetworkInfoForUid(uid, false); } @@ -1520,7 +1520,7 @@ public class ConnectivityManager { return 1; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { if (networkType == TYPE_MOBILE) { switch (feature) { @@ -1606,7 +1606,7 @@ public class ConnectivityManager { }; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final HashMap sLegacyRequests = new HashMap<>(); @@ -1635,7 +1635,7 @@ public class ConnectivityManager { Log.d(TAG, "expireRequest with " + ourSeqNum + ", " + sequenceNum); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private NetworkRequest requestNetworkForFeatureLocked(NetworkCapabilities netCap) { int delay = -1; int type = legacyTypeForNetworkCapabilities(netCap); @@ -1665,7 +1665,7 @@ public class ConnectivityManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean removeRequestForFeature(NetworkCapabilities netCap) { final LegacyRequest l; synchronized (sLegacyRequests) { @@ -1732,17 +1732,17 @@ public class ConnectivityManager { /** @hide */ public static class PacketKeepaliveCallback { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PacketKeepaliveCallback() { } /** The requested keepalive was successfully started. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onStarted() {} /** The keepalive was successfully stopped. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onStopped() {} /** An error occurred. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onError(int error) {} } @@ -1806,7 +1806,7 @@ public class ConnectivityManager { private volatile Integer mSlot; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void stop() { try { mExecutor.execute(() -> { @@ -1875,7 +1875,7 @@ public class ConnectivityManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PacketKeepalive startNattKeepalive( Network network, int intervalSeconds, PacketKeepaliveCallback callback, InetAddress srcAddr, int srcPort, InetAddress dstAddr) { @@ -2110,7 +2110,7 @@ public class ConnectivityManager { /** {@hide} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetworkQuotaInfo getActiveNetworkQuotaInfo() { try { return mService.getActiveNetworkQuotaInfo(); @@ -2408,7 +2408,7 @@ public class ConnectivityManager { * * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public int tether(String iface) { return mTetheringManager.tether(iface); @@ -2849,7 +2849,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public int getLastTetherError(String iface) { int error = mTetheringManager.getLastTetherError(iface); @@ -4659,7 +4659,7 @@ public class ConnectivityManager { * @deprecated This is strictly for legacy usage to support {@link #startUsingNetworkFeature}. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean setProcessDefaultNetworkForHostResolution(Network network) { return NetworkUtils.bindProcessToNetworkForHostResolution( (network == null) ? NETID_UNSET : network.getNetIdForResolv()); diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java index 82ba156b08d0..6819c349d20a 100644 --- a/core/java/android/net/DhcpResults.java +++ b/core/java/android/net/DhcpResults.java @@ -18,7 +18,6 @@ package android.net; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -41,30 +40,30 @@ import java.util.Objects; public final class DhcpResults implements Parcelable { private static final String TAG = "DhcpResults"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public LinkAddress ipAddress; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public InetAddress gateway; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final ArrayList dnsServers = new ArrayList<>(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String domains; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Inet4Address serverAddress; /** Vendor specific information (from RFC 2132). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String vendorInfo; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int leaseDuration; /** Link MTU option. 0 means unset. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mtu; public String serverHostName; diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index 84a8e1c3dcc1..5860e20ad3b4 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -23,7 +23,6 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.RemoteException; @@ -77,7 +76,7 @@ public class EthernetManager { * @param isAvailable {@code true} if Ethernet port exists. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void onAvailabilityChanged(String iface, boolean isAvailable); } @@ -98,7 +97,7 @@ public class EthernetManager { * @return the Ethernet Configuration, contained in {@link IpConfiguration}. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IpConfiguration getConfiguration(String iface) { try { return mService.getConfiguration(iface); @@ -111,7 +110,7 @@ public class EthernetManager { * Set Ethernet configuration. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setConfiguration(String iface, IpConfiguration config) { try { mService.setConfiguration(iface, config); @@ -124,7 +123,7 @@ public class EthernetManager { * Indicates whether the system currently has one or more Ethernet interfaces. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isAvailable() { return getAvailableInterfaces().length > 0; } @@ -135,7 +134,7 @@ public class EthernetManager { * @param iface Ethernet interface name * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isAvailable(String iface) { try { return mService.isAvailable(iface); @@ -150,7 +149,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); @@ -169,7 +168,7 @@ public class EthernetManager { * Returns an array of available Ethernet interface names. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String[] getAvailableInterfaces() { try { return mService.getAvailableInterfaces(); @@ -184,7 +183,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void removeListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 41732008b4ee..059ec28298f9 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -73,7 +73,7 @@ interface IConnectivityManager NetworkCapabilities getNetworkCapabilities(in Network network, String callingPackageName); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage NetworkState[] getAllNetworkState(); NetworkQuotaInfo getActiveNetworkQuotaInfo(); @@ -134,7 +134,7 @@ interface IConnectivityManager VpnConfig getVpnConfig(int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void startLegacyVpn(in VpnProfile profile); LegacyVpnInfo getLegacyVpnInfo(int userId); diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl index e486052e0e53..72a6b397a30c 100644 --- a/core/java/android/net/INetworkPolicyManager.aidl +++ b/core/java/android/net/INetworkPolicyManager.aidl @@ -67,7 +67,7 @@ interface INetworkPolicyManager { void setDeviceIdleMode(boolean enabled); void setWifiMeteredOverride(String networkId, int meteredOverride); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state); SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage); diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl index 1a3dc974480c..5fa515a14343 100644 --- a/core/java/android/net/INetworkStatsService.aidl +++ b/core/java/android/net/INetworkStatsService.aidl @@ -42,7 +42,7 @@ interface INetworkStatsService { * PACKAGE_USAGE_STATS permission is always checked. If PACKAGE_USAGE_STATS is not granted * READ_NETWORK_USAGE_STATS is checked for. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage INetworkStatsSession openSessionForUsageStats(int flags, String callingPackage); /** Return data layer snapshot of UID network usage. */ diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java index d5f8b2edb6bb..fa31b806ba9f 100644 --- a/core/java/android/net/IpConfiguration.java +++ b/core/java/android/net/IpConfiguration.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -99,7 +98,7 @@ public final class IpConfiguration implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IpConfiguration(IpAssignment ipAssignment, ProxySettings proxySettings, StaticIpConfiguration staticIpConfiguration, diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 209a3fa839c0..25a76f43553a 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -111,7 +111,7 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ProvisioningChange compareProvisioning( LinkProperties before, LinkProperties after) { if (before.isProvisioned() && after.isProvisioned()) { @@ -849,7 +849,7 @@ public final class LinkProperties implements Parcelable { * Returns all the links stacked on top of this link. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @NonNull List getStackedLinks() { if (mStackedLinks.isEmpty()) { return Collections.emptyList(); @@ -1448,7 +1448,7 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if both are identical, {@code false} otherwise. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isIdenticalStackedLinks(@NonNull LinkProperties target) { if (!mStackedLinks.keySet().equals(target.mStackedLinks.keySet())) { return false; diff --git a/core/java/android/net/LinkQualityInfo.java b/core/java/android/net/LinkQualityInfo.java index 2bf1fbc848f7..aa56cff50f63 100644 --- a/core/java/android/net/LinkQualityInfo.java +++ b/core/java/android/net/LinkQualityInfo.java @@ -17,7 +17,6 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -191,7 +190,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPacketCount(long packetCount) { mPacketCount = packetCount; } @@ -207,7 +206,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPacketErrorCount(long packetErrorCount) { mPacketErrorCount = packetErrorCount; } @@ -269,7 +268,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLastDataSampleTime(long lastDataSampleTime) { mLastDataSampleTime = lastDataSampleTime; } @@ -285,7 +284,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDataSampleDuration(int dataSampleDuration) { mDataSampleDuration = dataSampleDuration; } diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index e01e5aecc7e6..e80e3a6f93ec 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -17,7 +17,6 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.system.ErrnoException; import android.system.Int32Ref; import android.system.Os; @@ -52,7 +51,7 @@ class LocalSocketImpl @UnsupportedAppUsage FileDescriptor[] inboundFileDescriptors; /** file descriptor array that should be written during next write */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage FileDescriptor[] outboundFileDescriptors; /** diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 049e9bcc2509..6949bf2a7807 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -22,7 +22,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.util.MacAddressUtils; import android.net.wifi.WifiInfo; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -59,7 +58,7 @@ public final class MacAddress implements Parcelable { *

Not publicly exposed or treated specially since the OUI 00:00:00 is registered. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final MacAddress ALL_ZEROS_ADDRESS = new MacAddress(0); /** @hide */ diff --git a/core/java/android/net/MobileLinkQualityInfo.java b/core/java/android/net/MobileLinkQualityInfo.java index f51c4df2d6b5..a65de6bb2908 100644 --- a/core/java/android/net/MobileLinkQualityInfo.java +++ b/core/java/android/net/MobileLinkQualityInfo.java @@ -17,7 +17,6 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; /** @@ -41,7 +40,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { private int mLteRssnr = UNKNOWN_INT; private int mLteCqi = UNKNOWN_INT; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MobileLinkQualityInfo() { } @@ -99,7 +98,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { * returns mobile network type as defined by {@link android.telephony.TelephonyManager} * @return network type or {@link android.net.LinkQualityInfo#UNKNOWN_INT} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getMobileNetworkType() { return mMobileNetworkType; } @@ -107,7 +106,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setMobileNetworkType(int mobileNetworkType) { mMobileNetworkType = mobileNetworkType; } @@ -123,7 +122,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRssi(int Rssi) { mRssi = Rssi; } @@ -139,7 +138,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setGsmErrorRate(int gsmErrorRate) { mGsmErrorRate = gsmErrorRate; } @@ -155,7 +154,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCdmaDbm(int cdmaDbm) { mCdmaDbm = cdmaDbm; } @@ -171,7 +170,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCdmaEcio(int cdmaEcio) { mCdmaEcio = cdmaEcio; } @@ -187,7 +186,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setEvdoDbm(int evdoDbm) { mEvdoDbm = evdoDbm; } @@ -203,7 +202,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setEvdoEcio(int evdoEcio) { mEvdoEcio = evdoEcio; } @@ -219,7 +218,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setEvdoSnr(int evdoSnr) { mEvdoSnr = evdoSnr; } @@ -235,7 +234,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLteSignalStrength(int lteSignalStrength) { mLteSignalStrength = lteSignalStrength; } @@ -251,7 +250,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLteRsrp(int lteRsrp) { mLteRsrp = lteRsrp; } @@ -267,7 +266,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLteRsrq(int lteRsrq) { mLteRsrq = lteRsrq; } @@ -283,7 +282,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLteRssnr(int lteRssnr) { mLteRssnr = lteRssnr; } @@ -299,7 +298,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setLteCqi(int lteCqi) { mLteCqi = lteCqi; } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 53996a5fc503..3e4f73555e58 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.system.ErrnoException; @@ -111,7 +110,7 @@ public class Network implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Network(int netId) { this(netId, false); } diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index a50f03a28c10..be33f4edb5d1 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -133,7 +133,7 @@ public final class NetworkCapabilities implements Parcelable { * Represents the network's capabilities. If any are specified they will be satisfied * by any Network that matches all of them. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNetworkCapabilities; /** @@ -1279,7 +1279,7 @@ public final class NetworkCapabilities implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean hasSignalStrength() { return mSignalStrength > SIGNAL_STRENGTH_UNSPECIFIED; } @@ -1917,7 +1917,7 @@ public final class NetworkCapabilities implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static @NonNull String transportNamesOf(@Nullable @Transport int[] types) { StringJoiner joiner = new StringJoiner("|"); if (types != null) { diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index a643d09eef49..e9e242e2b08a 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -253,7 +253,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getUidPolicy(int uid) { try { return mService.getUidPolicy(uid); @@ -339,7 +339,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRestrictBackground(boolean restrictBackground) { try { mService.setRestrictBackground(restrictBackground); @@ -349,7 +349,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean getRestrictBackground() { try { return mService.getRestrictBackground(); diff --git a/core/java/android/net/NetworkQuotaInfo.java b/core/java/android/net/NetworkQuotaInfo.java index d39bf29a4ef1..2e52d9cd19ab 100644 --- a/core/java/android/net/NetworkQuotaInfo.java +++ b/core/java/android/net/NetworkQuotaInfo.java @@ -17,7 +17,6 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -38,17 +37,17 @@ public class NetworkQuotaInfo implements Parcelable { public NetworkQuotaInfo(Parcel in) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getEstimatedBytes() { return 0; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getSoftLimitBytes() { return NO_LIMIT; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getHardLimitBytes() { return NO_LIMIT; } diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 6209718e8788..1d6e50710df1 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -43,7 +43,7 @@ public class NetworkRequest implements Parcelable { * The {@link NetworkCapabilities} that define this request. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final @NonNull NetworkCapabilities networkCapabilities; /** @@ -52,7 +52,7 @@ public class NetworkRequest implements Parcelable { * the request. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int requestId; /** diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index d42beae601ed..cbee01024622 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -220,11 +219,11 @@ public final class NetworkStats implements Parcelable { * generated. */ private long elapsedRealtime; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int size; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int capacity; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String[] iface; @UnsupportedAppUsage private int[] uid; @@ -232,21 +231,21 @@ public final class NetworkStats implements Parcelable { private int[] set; @UnsupportedAppUsage private int[] tag; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int[] metered; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int[] roaming; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int[] defaultNetwork; @UnsupportedAppUsage private long[] rxBytes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long[] rxPackets; @UnsupportedAppUsage private long[] txBytes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long[] txPackets; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long[] operations; /** @@ -259,7 +258,7 @@ public final class NetworkStats implements Parcelable { @SystemApi public static class Entry { /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String iface; /** @hide */ @UnsupportedAppUsage @@ -268,7 +267,7 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public int set; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int tag; /** * Note that this is only populated w/ the default value when read from /proc or written @@ -295,20 +294,20 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public long rxBytes; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long rxPackets; /** @hide */ @UnsupportedAppUsage public long txBytes; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long txPackets; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long operations; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Entry() { this(IFACE_ALL, UID_ALL, SET_DEFAULT, TAG_NONE, 0L, 0L, 0L, 0L, 0L); } @@ -455,7 +454,7 @@ public final class NetworkStats implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetworkStats(Parcel parcel) { elapsedRealtime = parcel.readLong(); size = parcel.readInt(); diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java index fba75614342d..51f09a0103ff 100644 --- a/core/java/android/net/NetworkStatsHistory.java +++ b/core/java/android/net/NetworkStatsHistory.java @@ -32,7 +32,6 @@ import static android.text.format.DateUtils.SECOND_IN_MILLIS; import static com.android.internal.util.ArrayUtils.total; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.NetworkStatsHistoryBucketProto; @@ -92,18 +91,18 @@ public class NetworkStatsHistory implements Parcelable { public static class Entry { public static final long UNKNOWN = -1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long bucketDuration; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long bucketStart; public long activeTime; @UnsupportedAppUsage public long rxBytes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long rxPackets; @UnsupportedAppUsage public long txBytes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long txPackets; public long operations; } @@ -135,7 +134,7 @@ public class NetworkStatsHistory implements Parcelable { recordEntireHistory(existing); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetworkStatsHistory(Parcel in) { bucketDuration = in.readLong(); bucketStart = readLongArray(in); @@ -221,7 +220,7 @@ public class NetworkStatsHistory implements Parcelable { return 0; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int size() { return bucketCount; } @@ -259,7 +258,7 @@ public class NetworkStatsHistory implements Parcelable { * Return index of bucket that contains or is immediately before the * requested time. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getIndexBefore(long time) { int index = Arrays.binarySearch(bucketStart, 0, bucketCount, time); if (index < 0) { @@ -287,7 +286,7 @@ public class NetworkStatsHistory implements Parcelable { /** * Return specific stats entry. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Entry getValues(int i, Entry recycle) { final Entry entry = recycle != null ? recycle : new Entry(); entry.bucketStart = bucketStart[i]; diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index dc33cc7b614d..a95ba12f6544 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -37,7 +37,6 @@ import static android.net.wifi.WifiInfo.sanitizeSsid; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Annotation.NetworkType; @@ -160,7 +159,7 @@ public class NetworkTemplate implements Parcelable { * Template to match metered {@link ConnectivityManager#TYPE_MOBILE} networks, * regardless of IMSI. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static NetworkTemplate buildTemplateMobileWildcard() { return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null); } diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index a0faafa779a8..1e5b6d5ab5c0 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -98,7 +98,7 @@ public class NetworkUtils { * this socket will go directly to the underlying network, so its traffic will not be * forwarded through the VPN. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean protectFromVpn(FileDescriptor fd) { return protectFromVpn(fd.getInt$()); } @@ -223,7 +223,7 @@ public class NetworkUtils { * @hide * @deprecated use {@link Inet4AddressUtils#netmaskToPrefixLength(Inet4Address)} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public static int netmaskToPrefixLength(Inet4Address netmask) { // This is only here because some apps seem to be using it (@UnsupportedAppUsage). @@ -290,7 +290,7 @@ public class NetworkUtils { /** * Returns the implicit netmask of an IPv4 address, as was the custom before 1993. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getImplicitNetmask(Inet4Address address) { // Only here because it seems to be used by apps return Inet4AddressUtils.getImplicitNetmask(address); diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index f1d9669a8309..4ba7394a4bb2 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -20,7 +20,6 @@ import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.text.TextUtils; import android.util.Log; @@ -242,7 +241,7 @@ public final class Proxy { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final void setHttpProxySystemProperty(ProxyInfo p) { String host = null; String port = null; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 2543aa3ab48a..93ad41f7c524 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -232,7 +232,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RouteInfo(@Nullable IpPrefix destination, @Nullable InetAddress gateway, @Nullable String iface) { this(destination, gateway, iface, RTN_UNICAST); @@ -501,7 +501,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable public static RouteInfo selectBestRoute(Collection routes, InetAddress dest) { return NetUtils.selectBestRoute(routes, dest); diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index f3d3c6560fc2..e51145800cc7 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -115,20 +115,20 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private SSLSocketFactory mInsecureFactory = null; @UnsupportedAppUsage private SSLSocketFactory mSecureFactory = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private TrustManager[] mTrustManagers = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private KeyManager[] mKeyManagers = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private byte[] mNpnProtocols = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private byte[] mAlpnProtocols = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private PrivateKey mChannelIdPrivateKey = null; @UnsupportedAppUsage private final int mHandshakeTimeoutMillis; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final SSLClientSessionCache mSessionCache; @UnsupportedAppUsage private final boolean mSecure; @@ -249,7 +249,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private SSLSocketFactory makeSocketFactory( KeyManager[] keyManagers, TrustManager[] trustManagers) { try { @@ -343,7 +343,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * must be non-empty and of length less than 256. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setAlpnProtocols(byte[][] protocols) { this.mAlpnProtocols = toLengthPrefixedList(protocols); } @@ -464,13 +464,13 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds) throws SocketException { castToOpenSSLSocket(socket).setSoWriteTimeout(writeTimeoutMilliseconds); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static OpenSSLSocketImpl castToOpenSSLSocket(Socket socket) { if (!(socket instanceof OpenSSLSocketImpl)) { throw new IllegalArgumentException("Socket not created by this factory: " diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index ce545974f5cb..f56d656f07ed 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -54,19 +53,19 @@ import java.util.Objects; @SystemApi public final class StaticIpConfiguration implements Parcelable { /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable public LinkAddress ipAddress; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable public InetAddress gateway; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @NonNull public final ArrayList dnsServers; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable public String domains; diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index a985e934ed3c..e7bba69dbb84 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -565,7 +565,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static long getMobileTcpRxPackets() { long total = 0; for (String iface : getMobileIfaces()) { @@ -581,7 +581,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static long getMobileTcpTxPackets() { long total = 0; for (String iface : getMobileIfaces()) { diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index 77fb18411546..aa3777d55342 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -161,7 +161,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setHost(String host) { mHost = host; } @@ -201,7 +201,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getAuthInfo() { return mAuthInfo; } diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java index ab12cdd22685..c50bae90488b 100644 --- a/core/java/android/net/metrics/ApfProgramEvent.java +++ b/core/java/android/net/metrics/ApfProgramEvent.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -56,22 +55,22 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { public @interface Flags {} /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final long lifetime; // Maximum computed lifetime of the program in seconds /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final long actualLifetime; // Effective program lifetime in seconds /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int filteredRas; // Number of RAs filtered by the APF program /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int currentRas; // Total number of current RAs at generation time /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int programLength; // Length of the APF program in bytes /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int flags; // Bitfield compound of FLAG_* constants private ApfProgramEvent(long lifetime, long actualLifetime, int filteredRas, int currentRas, @@ -218,7 +217,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { }; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static @Flags int flagsFor(boolean hasIPv4, boolean multicastFilterOn) { int bitfield = 0; if (hasIPv4) { diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java index fcafb7ebd676..2a601b273ef4 100644 --- a/core/java/android/net/metrics/ApfStats.java +++ b/core/java/android/net/metrics/ApfStats.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,61 +34,61 @@ public final class ApfStats implements IpConnectivityLog.Event { * time interval in milliseconds these stastistics covers. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final long durationMs; /** * number of received RAs. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int receivedRas; /** * number of received RAs matching a known RA. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int matchingRas; /** * number of received RAs ignored due to the MAX_RAS limit. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int droppedRas; /** * number of received RAs with a minimum lifetime of 0. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int zeroLifetimeRas; /** * number of received RAs that could not be parsed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int parseErrors; /** * number of APF program updates from receiving RAs. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int programUpdates; /** * total number of APF program updates. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int programUpdatesAll; /** * number of APF program updates from allowing multicast traffic. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int programUpdatesAllowingMulticast; /** * maximum APF program size advertised by hardware. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int maxProgramSize; private ApfStats(Parcel in) { diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index 8de427de1dab..e0a93dd1c18f 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -39,7 +38,7 @@ public final class DhcpClientEvent implements IpConnectivityLog.Event { /** @hide */ public final int durationMs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private DhcpClientEvent(String msg, int durationMs) { this.msg = msg; this.durationMs = durationMs; diff --git a/core/java/android/net/nsd/INsdManager.aidl b/core/java/android/net/nsd/INsdManager.aidl index e9e8935a19b2..9484c74bcb23 100644 --- a/core/java/android/net/nsd/INsdManager.aidl +++ b/core/java/android/net/nsd/INsdManager.aidl @@ -25,7 +25,7 @@ import android.os.Messenger; */ interface INsdManager { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Messenger getMessenger(); void setEnabled(boolean enable); } diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl index cde57c58ca1f..dd260bc6f2f6 100644 --- a/core/java/android/nfc/INfcAdapterExtras.aidl +++ b/core/java/android/nfc/INfcAdapterExtras.aidl @@ -23,18 +23,18 @@ import android.os.Bundle; * {@hide} */ interface INfcAdapterExtras { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Bundle open(in String pkg, IBinder b); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Bundle close(in String pkg, IBinder b); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Bundle transceive(in String pkg, in byte[] data_in); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int getCardEmulationRoute(in String pkg); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setCardEmulationRoute(in String pkg, int route); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void authenticate(in String pkg, in byte[] token); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getDriverName(in String pkg); } diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 7bf4355d5b35..421eb33392db 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -283,7 +282,7 @@ public final class NdefRecord implements Parcelable { private final short mTnf; private final byte[] mType; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final byte[] mId; private final byte[] mPayload; diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 90e01ebe6205..c61f10f50c93 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -35,7 +35,6 @@ import android.nfc.tech.MifareClassic; import android.nfc.tech.Ndef; import android.nfc.tech.NfcA; import android.nfc.tech.NfcF; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -2078,7 +2077,7 @@ public final class NfcAdapter { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public INfcAdapterExtras getNfcAdapterExtrasInterface() { if (mContext == null) { throw new UnsupportedOperationException("You need a context on NfcAdapter to use the " diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index 398ec63a931b..b9e6ff4a5a9e 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -29,7 +29,6 @@ import android.nfc.tech.NfcBarcode; import android.nfc.tech.NfcF; import android.nfc.tech.NfcV; import android.nfc.tech.TagTechnology; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -112,7 +111,7 @@ import java.util.HashMap; *

*/ public final class Tag implements Parcelable { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final byte[] mId; final int[] mTechList; final String[] mTechStringList; diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index 1692921f4a8f..1d28489d2ac8 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -315,7 +315,7 @@ public class BaseBundle { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isParcelled() { return mParcelledData != null; } diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 6d4593a2ce87..9a16d3fee600 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -120,7 +120,7 @@ public class BatteryManager { * Int value set to the maximum charging current supported by the charger in micro amperes. * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_MAX_CHARGING_CURRENT = "max_charging_current"; /** @@ -128,7 +128,7 @@ public class BatteryManager { * Int value set to the maximum charging voltage supported by the charger in micro volts. * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_MAX_CHARGING_VOLTAGE = "max_charging_voltage"; /** @@ -136,7 +136,7 @@ public class BatteryManager { * integer containing the charge counter present in the battery. * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_CHARGE_COUNTER = "charge_counter"; /** diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 00023a5caf75..b550c7d4ba81 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -87,7 +87,7 @@ public abstract class BatteryStats implements Parcelable { /** * A constant indicating a partial wake lock timer. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int WAKE_TYPE_PARTIAL = 0; /** @@ -790,7 +790,7 @@ public abstract class BatteryStats implements Parcelable { * Returns the timer keeping track of background wifi scans. */ public abstract Timer getWifiScanBackgroundTimer(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public abstract long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which); public abstract int getWifiBatchedScanCount(int csphBin, int which); @UnsupportedAppUsage diff --git a/core/java/android/os/Broadcaster.java b/core/java/android/os/Broadcaster.java index 88760b0b6828..d1a953f23f7f 100644 --- a/core/java/android/os/Broadcaster.java +++ b/core/java/android/os/Broadcaster.java @@ -21,7 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; /** @hide */ public class Broadcaster { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Broadcaster() { } @@ -32,7 +32,7 @@ public class Broadcaster * When this broadcaster pushes a message with senderWhat in the what field, * target will be sent a copy of that message with targetWhat in the what field. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void request(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -100,7 +100,7 @@ public class Broadcaster /** * Unregister for notifications for this senderWhat/target/targetWhat tuple. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void cancelRequest(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -173,7 +173,7 @@ public class Broadcaster * Send out msg. Anyone who has registered via the request() method will be * sent the message. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void broadcast(Message msg) { synchronized (this) { diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index 1c1f5c034cd9..f8f8bf746afd 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -174,7 +174,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Bundle forPair(String key, String value) { Bundle b = new Bundle(1); b.putString(key, value); @@ -306,7 +306,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getSize() { if (mParcelledData != null) { return mParcelledData.dataSize(); @@ -389,7 +389,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * Filter values in Bundle to only basic types. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Bundle filterValues() { unparcel(); Bundle bundle = this; diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index a4af0dbed0bd..4fed93204f59 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -88,7 +88,7 @@ public final class Debug // set/cleared by waitForDebugger() private static volatile boolean mWaiting = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Debug() {} /* @@ -120,7 +120,7 @@ public final class Debug @UnsupportedAppUsage public int dalvikSwappablePss; /** @hide The resident set size for dalvik heap. (Without other Dalvik overhead.) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int dalvikRss; /** The private dirty pages used by dalvik heap. */ public int dalvikPrivateDirty; @@ -140,7 +140,7 @@ public final class Debug public int dalvikSwappedOut; /** The dirty dalvik pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int dalvikSwappedOutPss; /** The proportional set size for the native heap. */ @@ -150,7 +150,7 @@ public final class Debug @UnsupportedAppUsage public int nativeSwappablePss; /** @hide The resident set size for the native heap. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int nativeRss; /** The private dirty pages used by the native heap. */ public int nativePrivateDirty; @@ -170,7 +170,7 @@ public final class Debug public int nativeSwappedOut; /** The dirty native pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int nativeSwappedOutPss; /** The proportional set size for everything else. */ @@ -180,7 +180,7 @@ public final class Debug @UnsupportedAppUsage public int otherSwappablePss; /** @hide The resident set size for everything else. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int otherRss; /** The private dirty pages used by everything else. */ public int otherPrivateDirty; @@ -200,12 +200,12 @@ public final class Debug public int otherSwappedOut; /** The dirty pages used by anyting else that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int otherSwappedOutPss; /** Whether the kernel reports proportional swap usage */ /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean hasSwappedOutPss; /** @hide */ @@ -2042,7 +2042,7 @@ public final class Debug * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static native void dumpNativeHeap(FileDescriptor fd); /** diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 518e29d51091..5745187fcbb9 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -719,7 +719,7 @@ public class Environment { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static File getLegacyExternalStorageObbDirectory() { return buildPath(getLegacyExternalStorageDirectory(), DIR_ANDROID, DIR_OBB); } @@ -1040,7 +1040,7 @@ public class Environment { * Generates the raw path to an application's OBB files * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static File[] buildExternalStorageAppObbDirs(String packageName) { throwIfUserRequired(); return sCurrentUser.buildExternalStorageAppObbDirs(packageName); diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java index 6f44b20a0ff4..25bffbc9e8d5 100644 --- a/core/java/android/os/FileObserver.java +++ b/core/java/android/os/FileObserver.java @@ -145,7 +145,7 @@ public abstract class FileObserver { stopWatching(m_fd, descriptors); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onEvent(int wfd, @NotifyEventType int mask, String path) { // look up our observer, fixing up the map if necessary... FileObserver observer = null; diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index d151c16061d9..bbafc7b0875a 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -189,7 +189,7 @@ public final class FileUtils { * @return 0 on success, otherwise errno. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int setPermissions(FileDescriptor fd, int mode, int uid, int gid) { try { Os.fchmod(fd, mode); @@ -672,7 +672,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void stringToFile(File file, String string) throws IOException { stringToFile(file.getAbsolutePath(), string); } @@ -721,7 +721,7 @@ public final class FileUtils { * to its potential for collision. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public static long checksumCrc32(File file) throws FileNotFoundException, IOException { CRC32 checkSummer = new CRC32(); @@ -808,7 +808,7 @@ public final class FileUtils { * @return if any files were deleted. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean deleteOlderFiles(File dir, int minCount, long minAgeMs) { if (minCount < 0 || minAgeMs < 0) { throw new IllegalArgumentException("Constraints must be positive or 0"); @@ -917,7 +917,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean deleteContents(File dir) { File[] files = dir.listFiles(); boolean success = true; diff --git a/core/java/android/os/Handler.java b/core/java/android/os/Handler.java index d310d6e7530d..24aaa583f542 100644 --- a/core/java/android/os/Handler.java +++ b/core/java/android/os/Handler.java @@ -189,7 +189,7 @@ public class Handler { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Handler(boolean async) { this(null, async); } @@ -297,7 +297,7 @@ public class Handler { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @NonNull public static Handler getMain() { if (MAIN_THREAD_HANDLER == null) { diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index feed20800fd4..0d2bfdf04905 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -159,7 +159,7 @@ public abstract class HwBinder implements IHwBinder { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage public static void reportSyspropChanged() { native_report_sysprop_change(); } diff --git a/core/java/android/os/IBinder.java b/core/java/android/os/IBinder.java index d91c458a474b..8a8a6af09e5f 100644 --- a/core/java/android/os/IBinder.java +++ b/core/java/android/os/IBinder.java @@ -150,7 +150,7 @@ public interface IBinder { int LIKE_TRANSACTION = ('_'<<24)|('L'<<16)|('I'<<8)|'K'; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int SYSPROPS_TRANSACTION = ('_'<<24)|('S'<<16)|('P'<<8)|'R'; /** diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index e738cb276d00..8f8d451bbe8e 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -68,7 +68,7 @@ interface INetworkManagementService /** * Clear all IP addresses on the specified interface */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void clearInterfaceAddresses(String iface); /** @@ -84,26 +84,26 @@ interface INetworkManagementService /** * Set interface IPv6 privacy extensions */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setInterfaceIpv6PrivacyExtensions(String iface, boolean enable); /** * Disable IPv6 on an interface */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void disableIpv6(String iface); /** * Enable IPv6 on an interface */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void enableIpv6(String iface); /** * Set IPv6 autoconf address generation mode. * This is a no-op if an unsupported mode is requested. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setIPv6AddrGenMode(String iface, int mode); /** @@ -296,7 +296,7 @@ interface INetworkManagementService /** * Return status of bandwidth control module. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isBandwidthControlEnabled(); /** diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 90cbac50b391..e996809f1299 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -45,7 +45,7 @@ interface IPowerManager @UnsupportedAppUsage void userActivity(long time, int event, int flags); void wakeUp(long time, int reason, String details, String opPackageName); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void goToSleep(long time, int reason, int flags); @UnsupportedAppUsage(maxTargetSdk = 28) void nap(long time); diff --git a/core/java/android/os/LocaleList.java b/core/java/android/os/LocaleList.java index cfa823cffe86..ee64551df226 100644 --- a/core/java/android/os/LocaleList.java +++ b/core/java/android/os/LocaleList.java @@ -546,7 +546,7 @@ public final class LocaleList implements Parcelable { * * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void setDefault(@NonNull @Size(min=1) LocaleList locales, int localeIndex) { if (locales == null) { throw new NullPointerException("locales is null"); diff --git a/core/java/android/os/MemoryFile.java b/core/java/android/os/MemoryFile.java index 95337f6a1b1e..f84f9f05b13e 100644 --- a/core/java/android/os/MemoryFile.java +++ b/core/java/android/os/MemoryFile.java @@ -41,7 +41,7 @@ public class MemoryFile { private static String TAG = "MemoryFile"; // Returns 'true' if purged, 'false' otherwise - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native boolean native_pin(FileDescriptor fd, boolean pin) throws IOException; @UnsupportedAppUsage private static native int native_get_size(FileDescriptor fd) throws IOException; diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index 87c4f331e93f..7213b067a691 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -266,7 +266,7 @@ public final class MessageQueue { } // Called from native code. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int dispatchEvents(int fd, int events) { // Get the file descriptor record and any state that might change. final FileDescriptorRecord record; @@ -635,7 +635,7 @@ public final class MessageQueue { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean hasMessages(Handler h, Runnable r, Object object) { if (h == null) { return false; diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index a04fcb580e63..765ef48308ae 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -514,11 +514,11 @@ public final class Parcel { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static native long getGlobalAllocSize(); /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static native long getGlobalAllocCount(); /** @@ -742,7 +742,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void writeBlob(@Nullable byte[] b) { writeBlob(b, 0, (b != null) ? b.length : 0); } @@ -1014,7 +1014,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void writeArrayMap(@Nullable ArrayMap val) { writeArrayMapInternal(val); } @@ -1053,7 +1053,7 @@ public final class Parcel { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void writeArraySet(@Nullable ArraySet val) { final int size = (val != null) ? val.size() : -1; writeInt(size); @@ -2719,7 +2719,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Nullable public final byte[] readBlob() { return nativeReadBlob(mNativePtr); @@ -3633,7 +3633,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void readArrayMap(@NonNull ArrayMap outVal, @Nullable ClassLoader loader) { final int N = readInt(); if (N < 0) { diff --git a/core/java/android/os/ParcelableParcel.java b/core/java/android/os/ParcelableParcel.java index 3be630f2b382..38d980ecb0f1 100644 --- a/core/java/android/os/ParcelableParcel.java +++ b/core/java/android/os/ParcelableParcel.java @@ -27,7 +27,7 @@ public class ParcelableParcel implements Parcelable { final Parcel mParcel; final ClassLoader mClassLoader; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ParcelableParcel(ClassLoader loader) { mParcel = Parcel.obtain(); mClassLoader = loader; @@ -46,13 +46,13 @@ public class ParcelableParcel implements Parcelable { mParcel.appendFrom(src, pos, size); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Parcel getParcel() { mParcel.setDataPosition(0); return mParcel; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ClassLoader getClassLoader() { return mClassLoader; } @@ -68,7 +68,7 @@ public class ParcelableParcel implements Parcelable { dest.appendFrom(mParcel, 0, mParcel.dataSize()); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Parcelable.ClassLoaderCreator CREATOR = new Parcelable.ClassLoaderCreator() { public ParcelableParcel createFromParcel(Parcel in) { diff --git a/core/java/android/os/PerformanceCollector.java b/core/java/android/os/PerformanceCollector.java index e6471ae1c00a..27de48d40188 100644 --- a/core/java/android/os/PerformanceCollector.java +++ b/core/java/android/os/PerformanceCollector.java @@ -364,7 +364,7 @@ public class PerformanceCollector { * @param label description of code block between startTiming and * stopTiming, used to label output */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void startTiming(String label) { if (mPerfWriter != null) mPerfWriter.writeStartTiming(label); @@ -414,7 +414,7 @@ public class PerformanceCollector { * between calls to startTiming and stopTiming. List of iterations * is keyed by {@link #METRIC_KEY_ITERATIONS iterations}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Bundle stopTiming(String label) { addIteration(label); if (mPerfWriter != null) diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index d130bc5d37e7..e736e30b51e5 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1014,7 +1014,7 @@ public final class PowerManager { * Gets a float screen brightness setting. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float getBrightnessConstraint(int constraint) { try { return mService.getBrightnessConstraint(constraint); @@ -2304,7 +2304,7 @@ public final class PowerManager { * This broadcast is only sent to registered receivers. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED"; diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index aa2ad115a48f..e62ad1fa9052 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -71,7 +71,7 @@ public class Process { * Defines the UID/GID for the log group. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int LOG_UID = 1007; /** @@ -84,14 +84,14 @@ public class Process { * Defines the UID/GID for the mediaserver process. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int MEDIA_UID = 1013; /** * Defines the UID/GID for the DRM process. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DRM_UID = 1019; /** @@ -104,7 +104,7 @@ public class Process { * Defines the UID/GID for the group that controls VPN services. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int VPN_UID = 1016; /** @@ -123,7 +123,7 @@ public class Process { * Defines the UID/GID for the NFC service process. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int NFC_UID = 1027; /** @@ -277,7 +277,7 @@ public class Process { * First uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int FIRST_ISOLATED_UID = 99000; @@ -285,7 +285,7 @@ public class Process { * Last uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int LAST_ISOLATED_UID = 99999; @@ -725,7 +725,7 @@ public class Process { * Returns the identifier of this process' parent. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int myPpid() { return Os.getppid(); } @@ -1165,38 +1165,38 @@ public class Process { public static final native int[] getPids(String path, int[] lastArray); /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_TERM_MASK = 0xff; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_ZERO_TERM = 0; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_SPACE_TERM = (int)' '; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_TAB_TERM = (int)'\t'; /** @hide */ public static final int PROC_NEWLINE_TERM = (int) '\n'; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_COMBINE = 0x100; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_PARENS = 0x200; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_QUOTES = 0x400; /** @hide */ public static final int PROC_CHAR = 0x800; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_OUT_STRING = 0x1000; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_OUT_LONG = 0x2000; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROC_OUT_FLOAT = 0x4000; /** diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 71344f90de75..35e7bad83736 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -190,7 +190,7 @@ public final class ServiceManager { * @param dumpPriority supported dump priority levels as a bitmask * to access this service */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void addService(String name, IBinder service, boolean allowIsolated, int dumpPriority) { try { diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java index 1cd9c1a457a9..75123528a6b8 100644 --- a/core/java/android/os/SharedMemory.java +++ b/core/java/android/os/SharedMemory.java @@ -158,7 +158,7 @@ public final class SharedMemory implements Parcelable, Closeable { * * @hide Exposed for native ASharedMemory_dupFromJava() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getFd() { return mFileDescriptor.getInt$(); } diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java index 3358ce13ed52..0be3d681c80a 100644 --- a/core/java/android/os/ShellCommand.java +++ b/core/java/android/os/ShellCommand.java @@ -98,7 +98,7 @@ public abstract class ShellCommand extends BasicShellCommandHandler { return super.handleDefaultCommands(cmd); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String peekNextArg() { return super.peekNextArg(); } diff --git a/core/java/android/os/StatFs.java b/core/java/android/os/StatFs.java index eb8e71761294..6d1a1164abb4 100644 --- a/core/java/android/os/StatFs.java +++ b/core/java/android/os/StatFs.java @@ -26,7 +26,7 @@ import android.system.StructStatVfs; * wrapper for Unix statvfs(). */ public class StatFs { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private StructStatVfs mStat; /** diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index c89adadfbf2d..0fba8950cf15 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2381,7 +2381,7 @@ public final class StrictMode { * Binder for its current (native) thread-local policy value and synchronize it to libcore's * (Java) thread-local policy value. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void onBinderStrictModePolicyChange(@ThreadPolicyMask int newPolicy) { setBlockGuardPolicy(newPolicy); } @@ -2621,7 +2621,7 @@ public final class StrictMode { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void incrementExpectedActivityCount(Class klass) { if (klass == null) { return; diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index e29d75611856..26f3af0c68bb 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -247,7 +247,7 @@ public final class SystemClock { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @CriticalNative public static native long currentThreadTimeMicro(); diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index ded9be5eb74a..a16452705efc 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -60,7 +60,7 @@ public class SystemProperties { * uses reflection to read this whenever text is selected (http://b/36095274). * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int PROP_NAME_MAX = Integer.MAX_VALUE; /** @hide */ @@ -256,7 +256,7 @@ public class SystemProperties { * @param callback The {@link Runnable} that should be removed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void removeChangeCallback(@NonNull Runnable callback) { synchronized (sChangeCallbacks) { if (sChangeCallbacks.contains(callback)) { diff --git a/core/java/android/os/SystemService.java b/core/java/android/os/SystemService.java index 9b0ac8fdeb7a..5871d2d9b58f 100644 --- a/core/java/android/os/SystemService.java +++ b/core/java/android/os/SystemService.java @@ -66,7 +66,7 @@ public class SystemService { } /** Request that the init daemon stop a named service. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void stop(String name) { SystemProperties.set("ctl.stop", name); } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 9c9e4995d673..58c8efa3a972 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -52,7 +52,7 @@ public final class Trace { /** @hide */ public static final long TRACE_TAG_INPUT = 1L << 2; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final long TRACE_TAG_VIEW = 1L << 3; /** @hide */ public static final long TRACE_TAG_WEBVIEW = 1L << 4; diff --git a/core/java/android/os/UpdateLock.java b/core/java/android/os/UpdateLock.java index 5aa9401ddb27..036d0951c19a 100644 --- a/core/java/android/os/UpdateLock.java +++ b/core/java/android/os/UpdateLock.java @@ -51,7 +51,7 @@ public class UpdateLock { * locker releases theirs. The broadcast is sticky but is sent only to * registered receivers. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String UPDATE_LOCK_CHANGED = "android.os.UpdateLock.UPDATE_LOCK_CHANGED"; /** @@ -60,7 +60,7 @@ public class UpdateLock { * update operation. True means that updates are okay right now; false indicates * that perhaps later would be a better time. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String NOW_IS_CONVENIENT = "nowisconvenient"; /** @@ -69,7 +69,7 @@ public class UpdateLock { * in the System.currentTimeMillis() time base, which may be non-monotonic especially * around reboots. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String TIMESTAMP = "timestamp"; /** @@ -94,7 +94,7 @@ public class UpdateLock { /** * Is this lock currently held? */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isHeld() { synchronized (mToken) { return mHeld; @@ -104,7 +104,7 @@ public class UpdateLock { /** * Acquire an update lock. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void acquire() { if (DEBUG) { Log.v(TAG, "acquire() : " + this, new RuntimeException("here")); @@ -131,7 +131,7 @@ public class UpdateLock { /** * Release this update lock. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void release() { if (DEBUG) Log.v(TAG, "release() : " + this, new RuntimeException("here")); checkService(); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index d6720248720a..d39c5328e330 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -100,7 +100,7 @@ public final class UserHandle implements Parcelable { public static final @UserIdInt int USER_SYSTEM = 0; /** @hide A user serial constant to indicate the "system" user of the device */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int USER_SERIAL_SYSTEM = 0; /** @hide A user handle to indicate the "system" user of the device */ @@ -136,22 +136,22 @@ public final class UserHandle implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int ERR_GID = -1; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int AID_ROOT = android.os.Process.ROOT_UID; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int AID_APP_START = android.os.Process.FIRST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int AID_APP_END = android.os.Process.LAST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int AID_SHARED_GID_START = android.os.Process.FIRST_SHARED_APPLICATION_GID; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int AID_CACHE_GID_START = android.os.Process.FIRST_APPLICATION_CACHE_GID; /** The userId represented by this UserHandle. */ diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index af86a24caff4..b0e76e3ea851 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -1020,7 +1020,7 @@ public class UserManager { * @see #getUserRestrictions() * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** @@ -1704,7 +1704,7 @@ public class UserManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean canSwitchUsers() { boolean allowUserSwitchingWhenSystemUserLocked = Settings.Global.getInt( mContext.getContentResolver(), @@ -2066,7 +2066,7 @@ public class UserManager { * @return whether user is a guest user. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}) public boolean isGuestUser(@UserIdInt int userId) { @@ -2397,7 +2397,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getUserStartRealtime() { try { return mService.getUserStartRealtime(); @@ -2412,7 +2412,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getUserUnlockRealtime() { try { return mService.getUserUnlockRealtime(); @@ -4220,7 +4220,7 @@ public class UserManager { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isDeviceInDemoMode(Context context) { return Settings.Global.getInt(context.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0) > 0; diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index f82cc22bd764..21ad38b0e371 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -85,7 +85,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int EFFECT_THUD = Effect.THUD; @@ -94,7 +94,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int EFFECT_POP = Effect.POP; @@ -135,7 +135,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(Uri, Context) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int[] RINGTONES = { Effect.RINGTONE_1, @@ -567,7 +567,7 @@ public abstract class VibrationEffect implements Parcelable { out.writeInt(mAmplitude); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/os/health/HealthStatsParceler.java b/core/java/android/os/health/HealthStatsParceler.java index eb864a4c3d3f..f28a9747bc44 100644 --- a/core/java/android/os/health/HealthStatsParceler.java +++ b/core/java/android/os/health/HealthStatsParceler.java @@ -18,7 +18,6 @@ package android.os.health; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +38,7 @@ public class HealthStatsParceler implements Parcelable { private HealthStatsWriter mWriter; private HealthStats mHealthStats; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public HealthStatsParceler createFromParcel(Parcel in) { diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index 8181911ec783..6e259ea2642c 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -52,7 +52,7 @@ public class SystemHealthManager { * Construct a new SystemHealthManager object. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SystemHealthManager() { this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME))); } diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 694ff19f7dad..9fd9e4e4067d 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -17,7 +17,6 @@ package android.os.storage; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * Used for receiving notifications from the StorageManager @@ -48,23 +47,23 @@ public class StorageEventListener { public void onStorageStateChanged(String path, String oldState, String newState) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onVolumeRecordChanged(VolumeRecord rec) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onVolumeForgotten(String fsUuid) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onDiskScanned(DiskInfo disk, int volumeCount) { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onDiskDestroyed(DiskInfo disk) { } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 5d3c66cc3f34..270115beb09b 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -60,7 +60,6 @@ import android.content.res.ObbScanner; import android.database.Cursor; import android.net.Uri; import android.os.Binder; -import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.Handler; @@ -288,7 +287,7 @@ public class StorageManager { public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM; /** @hide The volume is not encrypted. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int ENCRYPTION_STATE_NONE = IVold.ENCRYPTION_STATE_NONE; @@ -628,7 +627,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void enableUsbMassStorage() { } @@ -638,7 +637,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void disableUsbMassStorage() { } @@ -649,7 +648,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isUsbMassStorageConnected() { return false; } @@ -805,7 +804,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable VolumeInfo findVolumeById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -1026,7 +1025,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void format(String volId) { try { mStorageManager.format(volId); @@ -1068,7 +1067,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void partitionPublic(String diskId) { try { mStorageManager.partitionPublic(diskId); @@ -1230,7 +1229,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) { if (file == null) { return null; @@ -1478,7 +1477,7 @@ public class StorageManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getStorageFullBytes(File path) { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); @@ -1595,7 +1594,7 @@ public class StorageManager { * @return true for file encrypted. (Implies isEncrypted() == true) * false not encrypted or block encrypted */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isFileEncryptedNativeOnly() { if (!isEncrypted()) { return false; @@ -2677,10 +2676,10 @@ public class StorageManager { /// Consts to match the password types in cryptfs.h /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; /** @hide */ public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index a52eeccaca64..eed36d714653 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -327,7 +327,7 @@ public final class StorageVolume implements Parcelable { * parse or UUID is unknown. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getFatVolumeId() { if (mFsUuid == null || mFsUuid.length() != 9) { return -1; diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 901494b845b0..74c0ecb2ecc3 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.net.Uri; -import android.os.Build; import android.os.Environment; import android.os.IVold; import android.os.Parcel; @@ -180,7 +179,7 @@ public class VolumeInfo implements Parcelable { this.partGuid = partGuid; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public VolumeInfo(Parcel parcel) { id = parcel.readString8(); type = parcel.readInt(); @@ -313,7 +312,7 @@ public class VolumeInfo implements Parcelable { * Returns {@code true} if this volume is the primary emulated volume for {@code userId}, * {@code false} otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isPrimaryEmulatedForUser(int userId) { return id.equals(ID_EMULATED_INTERNAL + ";" + userId); } @@ -322,7 +321,7 @@ public class VolumeInfo implements Parcelable { return isVisibleForUser(userId); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isVisibleForWrite(int userId) { return isVisibleForUser(userId); } @@ -332,7 +331,7 @@ public class VolumeInfo implements Parcelable { return (path != null) ? new File(path) : null; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public File getInternalPath() { return (internalPath != null) ? new File(internalPath) : null; } @@ -534,7 +533,7 @@ public class VolumeInfo implements Parcelable { return id.hashCode(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java index ee67ca6b7cd0..0f58a714749b 100644 --- a/core/java/android/os/storage/VolumeRecord.java +++ b/core/java/android/os/storage/VolumeRecord.java @@ -19,7 +19,6 @@ package android.os.storage; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +60,7 @@ public class VolumeRecord implements Parcelable { this.fsUuid = Preconditions.checkNotNull(fsUuid); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public VolumeRecord(Parcel parcel) { type = parcel.readInt(); fsUuid = parcel.readString(); @@ -164,7 +163,7 @@ public class VolumeRecord implements Parcelable { return fsUuid.hashCode(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeRecord createFromParcel(Parcel in) { diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 53b1dab9f760..ae4a626cdd5d 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -31,7 +31,6 @@ import android.content.Intent; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -729,7 +728,7 @@ public abstract class PreferenceActivity extends ListActivity implements * Returns the Header list * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public List

getHeaders() { return mHeaders; } diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 22399f517908..3f6e5051a3f8 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -24,7 +24,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.TypedArray; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -104,7 +103,7 @@ public abstract class PreferenceFragment extends Fragment implements private static final String PREFERENCES_TAG = "android:preferences"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private PreferenceManager mPreferenceManager; private ListView mList; private boolean mHavePrefs; diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index 6b813b0c04f6..01fe2f3f6b3a 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -103,7 +102,7 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi private Dialog mDialog; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ListView mListView; private int mLayoutResId = com.android.internal.R.layout.preference_list_fragment; diff --git a/core/java/android/preference/SeekBarPreference.java b/core/java/android/preference/SeekBarPreference.java index e31165e6adcc..a2852bc2cce3 100644 --- a/core/java/android/preference/SeekBarPreference.java +++ b/core/java/android/preference/SeekBarPreference.java @@ -19,7 +19,6 @@ package android.preference; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -74,7 +73,7 @@ public class SeekBarPreference extends Preference this(context, attrs, com.android.internal.R.attr.seekBarPreferenceStyle); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SeekBarPreference(Context context) { this(context, null); } diff --git a/core/java/android/preference/SwitchPreference.java b/core/java/android/preference/SwitchPreference.java index 57fefda35de3..baa023e41aad 100644 --- a/core/java/android/preference/SwitchPreference.java +++ b/core/java/android/preference/SwitchPreference.java @@ -20,7 +20,6 @@ import android.annotation.StringRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; -import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.widget.Checkable; @@ -46,7 +45,7 @@ import android.widget.Switch; */ @Deprecated public class SwitchPreference extends TwoStatePreference { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Listener mListener = new Listener(); // Switch text for on and off states diff --git a/core/java/android/provider/BrowserContract.java b/core/java/android/provider/BrowserContract.java index 7d77d37e117b..5083b8b254ab 100644 --- a/core/java/android/provider/BrowserContract.java +++ b/core/java/android/provider/BrowserContract.java @@ -27,7 +27,6 @@ import android.content.Context; import android.database.Cursor; import android.graphics.BitmapFactory; import android.net.Uri; -import android.os.Build; import android.os.RemoteException; import android.util.Pair; @@ -48,7 +47,7 @@ public class BrowserContract { public static final String AUTHORITY = "com.android.browser"; /** A content:// style uri to the authority for the browser provider */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY); /** @@ -304,7 +303,7 @@ public class BrowserContract { * The content:// style URI for the default folder * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI_DEFAULT_FOLDER = Uri.withAppendedPath(CONTENT_URI, "folder"); @@ -325,7 +324,7 @@ public class BrowserContract { * @param folderId the ID of the folder to point to * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri buildFolderUri(long folderId) { return ContentUris.withAppendedId(CONTENT_URI_DEFAULT_FOLDER, folderId); } @@ -413,7 +412,7 @@ public class BrowserContract { /** * Directory under {@link Bookmarks#CONTENT_URI} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI = AUTHORITY_URI.buildUpon().appendPath("accounts").build(); @@ -451,7 +450,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "history"); /** @@ -581,7 +580,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "images"); /** @@ -682,7 +681,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "combined"); /** diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 1ee2f19038db..8ac1d84e04e4 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -38,7 +38,6 @@ import android.content.Intent; import android.database.Cursor; import android.database.DatabaseUtils; import android.net.Uri; -import android.os.Build; import android.os.RemoteException; import android.text.format.DateUtils; import android.text.format.TimeMigrationUtils; @@ -1826,7 +1825,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String[] PROVIDER_WRITABLE_COLUMNS = new String[] { ACCOUNT_NAME, ACCOUNT_TYPE, @@ -1861,7 +1860,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String[] SYNC_WRITABLE_COLUMNS = new String[] { _SYNC_ID, @@ -2513,7 +2512,7 @@ public final class CalendarContract { * if no such alarm exists. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final long findNextAlarmTime(ContentResolver cr, long millis) { String selection = ALARM_TIME + ">=" + millis; // TODO: construct an explicit SQL query so that we can add @@ -2547,7 +2546,7 @@ public final class CalendarContract { * @param manager the AlarmManager * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final void rescheduleMissedAlarms(ContentResolver cr, Context context, AlarmManager manager) { // Get all the alerts that have been scheduled but have not fired @@ -2604,7 +2603,7 @@ public final class CalendarContract { * epoch * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void scheduleAlarm(Context context, AlarmManager manager, long alarmTime) { if (DEBUG) { String schedTime = TimeMigrationUtils.formatMillisWithFixedFormat(alarmTime); diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index bbd838db68c3..24cde0667444 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -46,7 +46,6 @@ import android.database.CursorWrapper; import android.database.DatabaseUtils; import android.graphics.Rect; import android.net.Uri; -import android.os.Build; import android.os.RemoteException; import android.telecom.PhoneAccountHandle; import android.text.TextUtils; @@ -130,7 +129,7 @@ public final class ContactsContract { * Prefix for column names that are not visible to client apps. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String HIDDEN_COLUMN_PREFIX = "x_"; @@ -6141,7 +6140,7 @@ public final class ContactsContract { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final Uri ENTERPRISE_CONTENT_URI = Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones"); diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 0fea48442941..062d92900643 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -842,7 +842,7 @@ public final class DocumentsContract { public static final String EXTRA_RESULT = "result"; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String METHOD_CREATE_DOCUMENT = "android:createDocument"; /** {@hide} */ public static final String METHOD_RENAME_DOCUMENT = "android:renameDocument"; @@ -877,11 +877,11 @@ public final class DocumentsContract { private static final String PATH_ROOT = "root"; private static final String PATH_RECENT = "recent"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final String PATH_DOCUMENT = "document"; private static final String PATH_CHILDREN = "children"; private static final String PATH_SEARCH = "search"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final String PATH_TREE = "tree"; private static final String PARAM_QUERY = "query"; diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 0829d85801ac..48410a748766 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -21,7 +21,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.NetworkPolicyManager; import android.net.Uri; -import android.os.Build; /** * The Download Manager @@ -139,7 +138,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_URI = "uri"; /** @@ -169,7 +168,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_FILE_NAME_HINT = "hint"; /** @@ -185,7 +184,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_MIME_TYPE = "mimetype"; /** @@ -194,7 +193,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_DESTINATION = "destination"; /** @@ -204,7 +203,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_VISIBILITY = "visibility"; /** @@ -241,7 +240,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_NOTIFICATION_PACKAGE = "notificationpackage"; /** @@ -252,7 +251,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_NOTIFICATION_CLASS = "notificationclass"; /** @@ -261,7 +260,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_NOTIFICATION_EXTRAS = "notificationextras"; /** @@ -271,7 +270,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_COOKIE_DATA = "cookiedata"; /** @@ -288,7 +287,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_REFERER = "referer"; /** @@ -326,7 +325,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_TITLE = "title"; /** @@ -336,7 +335,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_DESCRIPTION = "description"; /** @@ -345,7 +344,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_IS_PUBLIC_API = "is_public_api"; /** @@ -354,7 +353,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; /** @@ -363,7 +362,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_ALLOW_ROAMING = "allow_roaming"; /** @@ -380,7 +379,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI = "is_visible_in_downloads_ui"; /** @@ -397,7 +396,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Read

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_DELETED = "deleted"; /** @@ -426,7 +425,7 @@ public final class Downloads { * *

Type: TEXT

*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String COLUMN_MEDIA_SCANNED = "scanned"; /** Possible values for column {@link #COLUMN_MEDIA_SCANNED} */ @@ -505,7 +504,7 @@ public final class Downloads { * immediately after they are used, and are kept around by the download * manager as long as space is available. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DESTINATION_CACHE_PARTITION_PURGEABLE = 2; /** @@ -519,7 +518,7 @@ public final class Downloads { * This download will be saved to the location given by the file URI in * {@link #COLUMN_FILE_NAME_HINT}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DESTINATION_FILE_URI = 4; /** @@ -600,7 +599,7 @@ public final class Downloads { * @param visibility the value of {@link #COLUMN_VISIBILITY}. * @return true if the notification should be displayed. false otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isNotificationToBeDisplayed(int visibility) { return visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED || visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION; @@ -841,7 +840,7 @@ public final class Downloads { * Prefix for ContentValues keys that contain HTTP header lines, to be passed to * DownloadProvider.insert(). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String INSERT_KEY_PREFIX = "http_header_"; } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e30b4c75d3d3..60d1d477db53 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -60,7 +60,6 @@ import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pManager; import android.os.BatteryManager; import android.os.Binder; -import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.DropBoxManager; @@ -943,7 +942,7 @@ public final class Settings { * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACTION_USER_DICTIONARY_INSERT = "com.android.settings.USER_DICTIONARY_INSERT"; @@ -1894,7 +1893,7 @@ public final class Settings { = "android.settings.ACTION_APP_NOTIFICATION_REDACTION"; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String EXTRA_APP_UID = "app_uid"; /** @@ -2422,7 +2421,7 @@ public final class Settings { * This is the only type of reset available to non-system clients. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; @@ -3067,7 +3066,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/system"); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -3116,9 +3115,9 @@ public final class Settings { MOVED_TO_SECURE.add(Secure.INSTALL_NON_MARKET_APPS); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final HashSet MOVED_TO_GLOBAL; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final HashSet MOVED_TO_SECURE_THEN_GLOBAL; static { MOVED_TO_GLOBAL = new HashSet<>(); @@ -4275,7 +4274,7 @@ public final class Settings { * Kept for use by legacy database upgrade code in DatabaseHelper. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String VIBRATE_IN_SILENT = "vibrate_in_silent"; /** @@ -4570,7 +4569,7 @@ public final class Settings { * 3 = HCO * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String TTY_MODE = "tty_mode"; /** @@ -4597,7 +4596,7 @@ public final class Settings { * pending. The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse"; /** @@ -4606,7 +4605,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String POINTER_LOCATION = "pointer_location"; /** @@ -4615,7 +4614,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String SHOW_TOUCHES = "show_touches"; /** @@ -4643,14 +4642,14 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String DOCK_SOUNDS_ENABLED = Global.DOCK_SOUNDS_ENABLED; /** * Whether to play sounds when the keyguard is shown and dismissed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String LOCKSCREEN_SOUNDS_ENABLED = "lockscreen_sounds_enabled"; /** @@ -4673,7 +4672,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String DESK_DOCK_SOUND = Global.DESK_DOCK_SOUND; /** @@ -4682,7 +4681,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String DESK_UNDOCK_SOUND = Global.DESK_UNDOCK_SOUND; /** @@ -4691,7 +4690,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String CAR_DOCK_SOUND = Global.CAR_DOCK_SOUND; /** @@ -4700,7 +4699,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String CAR_UNDOCK_SOUND = Global.CAR_UNDOCK_SOUND; /** @@ -4709,7 +4708,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String LOCK_SOUND = Global.LOCK_SOUND; /** @@ -4718,7 +4717,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String UNLOCK_SOUND = Global.UNLOCK_SOUND; /** @@ -4767,7 +4766,7 @@ public final class Settings { * +7 = fastest * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String POINTER_SPEED = "pointer_speed"; /** @@ -4825,7 +4824,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Set PUBLIC_SETTINGS = new ArraySet<>(); static { PUBLIC_SETTINGS.add(END_BUTTON_BEHAVIOR); @@ -4884,7 +4883,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Set PRIVATE_SETTINGS = new ArraySet<>(); static { PRIVATE_SETTINGS.add(WIFI_USE_STATIC_IP); @@ -4933,7 +4932,7 @@ public final class Settings { * These entries are considered common between the personal and the managed profile, * since the managed profile doesn't get to change them. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final Set CLONE_TO_MANAGED_PROFILE = new ArraySet<>(); static { CLONE_TO_MANAGED_PROFILE.add(DATE_FORMAT); @@ -5260,7 +5259,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/secure"); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -5500,7 +5499,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean putStringForUser(@NonNull ContentResolver resolver, @NonNull String name, @Nullable String value, @Nullable String tag, boolean makeDefault, @UserIdInt int userHandle, boolean overrideableByRestore) { @@ -5740,7 +5739,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static long getLongForUser(ContentResolver cr, String name, long def, int userHandle) { String valString = getStringForUser(cr, name, userHandle); @@ -5804,7 +5803,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean putLongForUser(ContentResolver cr, String name, long value, int userHandle) { return putStringForUser(cr, name, Long.toString(value), userHandle); @@ -6487,7 +6486,7 @@ public final class Settings { * subject to current DeviceAdmin policy limits. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout"; @@ -6529,7 +6528,7 @@ public final class Settings { * @deprecated */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String LOCK_SCREEN_OWNER_INFO_ENABLED = "lock_screen_owner_info_enabled"; @@ -6660,7 +6659,7 @@ public final class Settings { * accessibility feature. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service"; @@ -7027,7 +7026,7 @@ public final class Settings { * @see android.graphics.Typeface * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACCESSIBILITY_CAPTIONING_TYPEFACE = "accessibility_captioning_typeface"; @@ -7067,7 +7066,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String ACCESSIBILITY_DISPLAY_DALTONIZER = "accessibility_display_daltonizer"; @@ -7481,7 +7480,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String BACKUP_ENABLED = "backup_enabled"; /** @@ -7490,7 +7489,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String BACKUP_AUTO_RESTORE = "backup_auto_restore"; /** @@ -7498,14 +7497,14 @@ public final class Settings { * Type: int ( 0 = unprovisioned, 1 = fully provisioned ) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String BACKUP_PROVISIONED = "backup_provisioned"; /** * Component of the transport to use for backup/restore. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String BACKUP_TRANSPORT = "backup_transport"; /** @@ -7677,7 +7676,7 @@ public final class Settings { * Also prevents ANRs and crash dialogs from being suppressed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi @SuppressLint("NoSettingsProvider") public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; @@ -7698,7 +7697,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service"; /** @@ -7707,7 +7706,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker"; @@ -7719,7 +7718,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER_SUBTYPE = @@ -8054,7 +8053,7 @@ public final class Settings { * The default NFC payment component * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component"; @@ -8068,14 +8067,14 @@ public final class Settings { * Specifies the package name currently configured to be the primary sms application * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String SMS_DEFAULT_APPLICATION = "sms_default_application"; /** * Specifies the package name currently configured to be the default dialer application * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application"; /** @@ -8213,7 +8212,7 @@ public final class Settings { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations"; @@ -8623,7 +8622,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners"; @@ -8792,7 +8791,7 @@ public final class Settings { * The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String NOTIFICATION_BADGING = "notification_badging"; @@ -10096,7 +10095,7 @@ public final class Settings { * scorer app, external network scores will neither be requested nor accepted. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String NETWORK_SCORER_APP = "network_scorer_app"; /** @@ -10440,7 +10439,7 @@ public final class Settings { * by the system). * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String WEBVIEW_PROVIDER = "webview_provider"; /** @@ -10832,7 +10831,7 @@ public final class Settings { * the setting needs to be set to 0 to disable it. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED = "wifi_watchdog_poor_network_test_enabled"; @@ -11010,7 +11009,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; @@ -11652,7 +11651,7 @@ public final class Settings { * @hide * @see com.android.server.power.batterysaver.BatterySaverPolicy */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants"; @@ -12309,7 +12308,7 @@ public final class Settings { * See RIL_PreferredNetworkType in ril.h * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String PREFERRED_NETWORK_MODE = "preferred_network_mode"; @@ -12916,7 +12915,7 @@ public final class Settings { @UnsupportedAppUsage public static final int ZEN_MODE_NO_INTERRUPTIONS = 2; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int ZEN_MODE_ALARMS = 3; /** @hide */ public static String zenModeToString(int mode) { @@ -12979,15 +12978,15 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String HEADS_UP_NOTIFICATIONS_ENABLED = "heads_up_notifications_enabled"; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int HEADS_UP_OFF = 0; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int HEADS_UP_ON = 1; /** @@ -13461,7 +13460,7 @@ public final class Settings { public static final String[] LEGACY_RESTORE_SETTINGS = { }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -13511,7 +13510,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String getStringForUser(ContentResolver resolver, String name, int userHandle) { if (MOVED_TO_SECURE.contains(name)) { @@ -13661,7 +13660,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean putStringForUser(ContentResolver resolver, String name, String value, int userHandle) { return putStringForUser(resolver, name, value, null, false, userHandle, @@ -15227,7 +15226,7 @@ public final class Settings { * callingPackage, a negative result will be returned. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isCallingPackageAllowedToWriteSettings(Context context, int uid, String callingPackage, boolean throwException) { return isCallingPackageAllowedToPerformAppOpsProtectedOperation(context, uid, diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 649c8f353196..2c735fd9012f 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -627,7 +627,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date, boolean read) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -687,7 +687,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -734,7 +734,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -781,7 +781,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Uri addMessage(ContentResolver resolver, String address, String body, String subject, Long date, boolean deliveryReport, long threadId) { diff --git a/core/java/android/security/KeystoreArguments.java b/core/java/android/security/KeystoreArguments.java index 19f78c8500d6..a59c4e04285d 100644 --- a/core/java/android/security/KeystoreArguments.java +++ b/core/java/android/security/KeystoreArguments.java @@ -17,7 +17,6 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +28,7 @@ import android.os.Parcelable; public class KeystoreArguments implements Parcelable { public byte[][] args; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeystoreArguments createFromParcel(Parcel in) { @@ -44,7 +43,7 @@ public class KeystoreArguments implements Parcelable { args = null; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeystoreArguments(byte[][] args) { this.args = args; } diff --git a/core/java/android/security/keymaster/ExportResult.java b/core/java/android/security/keymaster/ExportResult.java index 2c382efab1be..037b85270306 100644 --- a/core/java/android/security/keymaster/ExportResult.java +++ b/core/java/android/security/keymaster/ExportResult.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -34,7 +33,7 @@ public class ExportResult implements Parcelable { this.exportData = new byte[0]; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public ExportResult createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeyCharacteristics.java b/core/java/android/security/keymaster/KeyCharacteristics.java index 4f2bad1127e8..d8382fa8f969 100644 --- a/core/java/android/security/keymaster/KeyCharacteristics.java +++ b/core/java/android/security/keymaster/KeyCharacteristics.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -46,7 +45,7 @@ public class KeyCharacteristics implements Parcelable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeyCharacteristics() {} protected KeyCharacteristics(Parcel in) { @@ -72,7 +71,7 @@ public class KeyCharacteristics implements Parcelable { hwEnforced.writeToParcel(out, flags); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void readFromParcel(Parcel in) { swEnforced = KeymasterArguments.CREATOR.createFromParcel(in); hwEnforced = KeymasterArguments.CREATOR.createFromParcel(in); diff --git a/core/java/android/security/keymaster/KeymasterArguments.java b/core/java/android/security/keymaster/KeymasterArguments.java index 7608f3a7b9ef..e009e128bfea 100644 --- a/core/java/android/security/keymaster/KeymasterArguments.java +++ b/core/java/android/security/keymaster/KeymasterArguments.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +41,7 @@ public class KeymasterArguments implements Parcelable { private List mArguments; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -56,7 +55,7 @@ public class KeymasterArguments implements Parcelable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterArguments() { mArguments = new ArrayList(); } @@ -70,7 +69,7 @@ public class KeymasterArguments implements Parcelable { * * @throws IllegalArgumentException if {@code tag} is not an enum tag. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addEnum(int tag, int value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ENUM) && (tagType != KeymasterDefs.KM_ENUM_REP)) { @@ -142,7 +141,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 32-bit int tag or if * {@code value} is outside of the permitted range [0; 2^32). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addUnsignedInt(int tag, long value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_UINT) && (tagType != KeymasterDefs.KM_UINT_REP)) { @@ -179,7 +178,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 64-bit long tag or if * {@code value} is outside of the permitted range [0; 2^64). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addUnsignedLong(int tag, BigInteger value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ULONG) && (tagType != KeymasterDefs.KM_ULONG_REP)) { @@ -365,7 +364,7 @@ public class KeymasterArguments implements Parcelable { out.writeTypedList(mArguments); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void readFromParcel(Parcel in) { in.readTypedList(mArguments, KeymasterArgument.CREATOR); } diff --git a/core/java/android/security/keymaster/KeymasterBlob.java b/core/java/android/security/keymaster/KeymasterBlob.java index 18cdecb167db..68365bfe603f 100644 --- a/core/java/android/security/keymaster/KeymasterBlob.java +++ b/core/java/android/security/keymaster/KeymasterBlob.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -30,7 +29,7 @@ public class KeymasterBlob implements Parcelable { public KeymasterBlob(byte[] blob) { this.blob = blob; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeymasterBlob createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeymasterBlobArgument.java b/core/java/android/security/keymaster/KeymasterBlobArgument.java index b4106a6f2bc9..81b08c5b5b0a 100644 --- a/core/java/android/security/keymaster/KeymasterBlobArgument.java +++ b/core/java/android/security/keymaster/KeymasterBlobArgument.java @@ -17,17 +17,16 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterBlobArgument extends KeymasterArgument { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final byte[] blob; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterBlobArgument(int tag, byte[] blob) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -40,7 +39,7 @@ class KeymasterBlobArgument extends KeymasterArgument { this.blob = blob; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterBlobArgument(int tag, Parcel in) { super(tag); blob = in.createByteArray(); diff --git a/core/java/android/security/keymaster/KeymasterBooleanArgument.java b/core/java/android/security/keymaster/KeymasterBooleanArgument.java index 574511c70051..25b2ac409d97 100644 --- a/core/java/android/security/keymaster/KeymasterBooleanArgument.java +++ b/core/java/android/security/keymaster/KeymasterBooleanArgument.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; /** @@ -38,7 +37,7 @@ class KeymasterBooleanArgument extends KeymasterArgument { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterBooleanArgument(int tag, Parcel in) { super(tag); } diff --git a/core/java/android/security/keymaster/KeymasterDateArgument.java b/core/java/android/security/keymaster/KeymasterDateArgument.java index f6b8fb589b25..218f4880b289 100644 --- a/core/java/android/security/keymaster/KeymasterDateArgument.java +++ b/core/java/android/security/keymaster/KeymasterDateArgument.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import java.util.Date; @@ -39,7 +38,7 @@ class KeymasterDateArgument extends KeymasterArgument { this.date = date; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterDateArgument(int tag, Parcel in) { super(tag); date = new Date(in.readLong()); diff --git a/core/java/android/security/keymaster/KeymasterIntArgument.java b/core/java/android/security/keymaster/KeymasterIntArgument.java index 6aed8c998d62..01d38c799d9c 100644 --- a/core/java/android/security/keymaster/KeymasterIntArgument.java +++ b/core/java/android/security/keymaster/KeymasterIntArgument.java @@ -17,17 +17,16 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterIntArgument extends KeymasterArgument { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int value; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterIntArgument(int tag, int value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -42,7 +41,7 @@ class KeymasterIntArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterIntArgument(int tag, Parcel in) { super(tag); value = in.readInt(); diff --git a/core/java/android/security/keymaster/KeymasterLongArgument.java b/core/java/android/security/keymaster/KeymasterLongArgument.java index c0c6f0e518cb..3ac27ccef295 100644 --- a/core/java/android/security/keymaster/KeymasterLongArgument.java +++ b/core/java/android/security/keymaster/KeymasterLongArgument.java @@ -17,17 +17,16 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterLongArgument extends KeymasterArgument { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final long value; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterLongArgument(int tag, long value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -40,7 +39,7 @@ class KeymasterLongArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public KeymasterLongArgument(int tag, Parcel in) { super(tag); value = in.readLong(); diff --git a/core/java/android/security/keymaster/OperationResult.java b/core/java/android/security/keymaster/OperationResult.java index 0ace764e435b..b4e155a527de 100644 --- a/core/java/android/security/keymaster/OperationResult.java +++ b/core/java/android/security/keymaster/OperationResult.java @@ -17,7 +17,6 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +34,7 @@ public class OperationResult implements Parcelable { public final byte[] output; public final KeymasterArguments outParams; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index a47c3b188b79..859bb51607b9 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -771,7 +771,7 @@ public class DreamService extends Service implements Window.Callback { * @see #setDozeScreenBrightness * @hide For use by system UI components only. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDozeScreenBrightness() { return mDozeScreenBrightness; } diff --git a/core/java/android/service/dreams/IDreamManager.aidl b/core/java/android/service/dreams/IDreamManager.aidl index 0ce9cfa7a0bf..6496de3e15a0 100644 --- a/core/java/android/service/dreams/IDreamManager.aidl +++ b/core/java/android/service/dreams/IDreamManager.aidl @@ -27,9 +27,9 @@ interface IDreamManager { void dream(); @UnsupportedAppUsage void awaken(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setDreamComponents(in ComponentName[] componentNames); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage ComponentName[] getDreamComponents(); ComponentName getDefaultDreamComponentForUser(int userId); void testDream(int userId, in ComponentName componentName); diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 89e27ba21443..25f140f29e00 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -311,7 +311,7 @@ public abstract class NotificationListenerService extends Service { private Handler mHandler; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected NotificationListenerWrapper mWrapper = null; private boolean isConnected = false; diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java index 8e4a68e52697..579a8bfc9d99 100644 --- a/core/java/android/service/notification/StatusBarNotification.java +++ b/core/java/android/service/notification/StatusBarNotification.java @@ -430,7 +430,7 @@ public class StatusBarNotification implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Context getPackageContext(Context context) { if (mContext == null) { try { diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 169507ce9871..a9ab33c0d1de 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -35,7 +35,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.Uri; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -1744,9 +1743,9 @@ public class ZenModeConfig implements Parcelable { public static class ZenRule implements Parcelable { @UnsupportedAppUsage public boolean enabled; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean snoozing; // user manually disabled this instance - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String name; // required for automatic @UnsupportedAppUsage public int zenMode; // ie: Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS @@ -1756,7 +1755,7 @@ public class ZenModeConfig implements Parcelable { public ComponentName component; // optional public ComponentName configurationActivity; // optional public String id; // required for automatic (unique) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long creationTime; // required for automatic // package name, only used for manual rules when they have turned DND on. public String enabler; diff --git a/core/java/android/service/vr/IVrManager.aidl b/core/java/android/service/vr/IVrManager.aidl index f8ae08563a52..a8293b47db30 100644 --- a/core/java/android/service/vr/IVrManager.aidl +++ b/core/java/android/service/vr/IVrManager.aidl @@ -94,7 +94,7 @@ interface IVrManager { * @return {@link android.view.Display.INVALID_DISPLAY} if there is no virtual display * currently, else return the display id of the virtual display */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int getVr2dDisplayId(); /** diff --git a/core/java/android/service/vr/VrListenerService.java b/core/java/android/service/vr/VrListenerService.java index d92e3b8b6b9b..2758ace8d00b 100644 --- a/core/java/android/service/vr/VrListenerService.java +++ b/core/java/android/service/vr/VrListenerService.java @@ -24,7 +24,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -141,7 +140,7 @@ public abstract class VrListenerService extends Service { * @see android.R.attr#enableVrMode * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onCurrentVrActivityChanged( ComponentName component, boolean running2dInVr, int pid) { // Override to implement. Default to old behaviour of sending null for 2D. diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 9a76f19f3e41..4249e5c20d3b 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -127,7 +127,7 @@ public abstract class WallpaperService extends Service { private static final int MSG_VISIBILITY_CHANGED = 10010; private static final int MSG_WALLPAPER_OFFSETS = 10020; private static final int MSG_WALLPAPER_COMMAND = 10025; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int MSG_WINDOW_RESIZED = 10030; private static final int MSG_WINDOW_MOVED = 10035; private static final int MSG_TOUCH_EVENT = 10040; diff --git a/core/java/android/speech/IRecognitionListener.aidl b/core/java/android/speech/IRecognitionListener.aidl index 7c79b1ae15de..e77851b0e405 100644 --- a/core/java/android/speech/IRecognitionListener.aidl +++ b/core/java/android/speech/IRecognitionListener.aidl @@ -83,6 +83,6 @@ oneway interface IRecognitionListener { * @param eventType the type of the occurred event * @param params a Bundle containing the passed parameters */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onEvent(in int eventType, in Bundle params); } diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index 479a0c16c747..6a5d5c63cb4d 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -843,7 +843,7 @@ public class PhoneStateListener { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onDataConnectionRealTimeInfoChanged( DataConnectionRealTimeInfo dcRtInfo) { // default implementation empty @@ -1046,7 +1046,7 @@ public class PhoneStateListener { * @param rawData is the byte array of the OEM hook raw data. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onOemHookRawEvent(byte[] rawData) { // default implementation empty } diff --git a/core/java/android/telephony/Rlog.java b/core/java/android/telephony/Rlog.java index a1c74e69e7a2..2afdd339e80b 100644 --- a/core/java/android/telephony/Rlog.java +++ b/core/java/android/telephony/Rlog.java @@ -53,7 +53,7 @@ public final class Rlog { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int d(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg + '\n' + Log.getStackTraceString(tr)); diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java index 31da79995172..b9811638b28f 100644 --- a/core/java/android/text/AndroidBidi.java +++ b/core/java/android/text/AndroidBidi.java @@ -18,7 +18,6 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; import android.icu.text.Bidi; -import android.os.Build; import android.text.Layout.Directions; import com.android.internal.annotations.VisibleForTesting; @@ -33,7 +32,7 @@ public class AndroidBidi { /** * Runs the bidi algorithm on input text. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int bidi(int dir, char[] chs, byte[] chInfo) { if (chs == null || chInfo == null) { throw new NullPointerException(); diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index 16b45c30b69f..c60d446d921d 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -987,7 +987,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getIndexFirstChangedBlock() { return mIndexFirstChangedBlock; } @@ -995,7 +995,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIndexFirstChangedBlock(int i) { mIndexFirstChangedBlock = i; } diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index 1878d61c78ac..b5688a48344e 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -24,7 +24,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; import android.net.Uri; -import android.os.Build; import java.lang.annotation.Retention; @@ -45,7 +44,7 @@ public final class FontConfig { /** * Returns the ordered list of families included in the system fonts. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @NonNull Family[] getFamilies() { return mFamilies; } @@ -92,7 +91,7 @@ public final class FontConfig { /** * Returns the index to be used to access this font when accessing a TTC file. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getTtcIndex() { return mTtcIndex; } @@ -100,7 +99,7 @@ public final class FontConfig { /** * Returns the list of axes associated to this font. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @NonNull FontVariationAxis[] getAxes() { return mAxes; } @@ -108,7 +107,7 @@ public final class FontConfig { /** * Returns the weight value for this font. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getWeight() { return mWeight; } @@ -116,7 +115,7 @@ public final class FontConfig { /** * Returns whether this font is italic. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isItalic() { return mIsItalic; } @@ -232,7 +231,7 @@ public final class FontConfig { /** * Returns the name given by the system to this font family. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable String getName() { return mName; } @@ -240,7 +239,7 @@ public final class FontConfig { /** * Returns the list of fonts included in this family. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable Font[] getFonts() { return mFonts; } @@ -255,7 +254,7 @@ public final class FontConfig { /** * Returns the font variant for this family, e.g. "elegant" or "compact". May be null. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Variant int getVariant() { return mVariant; } diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index b80b01f5a64a..ab19fa9a1256 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.os.Build; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.BackgroundColorSpan; @@ -632,7 +631,7 @@ public class Html { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void withinStyle(StringBuilder out, CharSequence text, int start, int end) { for (int i = start; i < end; i++) { diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index f0f0867d414b..8a4497a0f0ce 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -24,7 +24,6 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.Rect; import android.graphics.text.LineBreaker; -import android.os.Build; import android.text.method.TextKeyListener; import android.text.style.AlignmentSpan; import android.text.style.LeadingMarginSpan; @@ -415,7 +414,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void drawText(Canvas canvas, int firstLine, int lastLine) { int previousLineBottom = getLineTop(firstLine); int previousLineEnd = getLineStart(firstLine); @@ -584,7 +583,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void drawBackground(Canvas canvas, Path highlight, Paint highlightPaint, int cursorOffsetVertical, int firstLine, int lastLine) { // First, draw LineBackgroundSpans. @@ -665,7 +664,7 @@ public abstract class Layout { * @return The range of lines that need to be drawn, possibly empty. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getLineRangeForDraw(Canvas canvas) { int dtop, dbottom; @@ -1155,7 +1154,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float getPrimaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, trailing, clamped); @@ -1175,7 +1174,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float getSecondaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, !trailing, clamped); @@ -1850,7 +1849,7 @@ public abstract class Layout { * only robust for left-aligned displays. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean shouldClampCursor(int line) { // Only clamp cursor position in left-aligned displays. switch (getParagraphAlignment(line)) { diff --git a/core/java/android/text/SpanSet.java b/core/java/android/text/SpanSet.java index d464278c714c..81bdd65974a8 100644 --- a/core/java/android/text/SpanSet.java +++ b/core/java/android/text/SpanSet.java @@ -17,7 +17,6 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.lang.reflect.Array; import java.util.Arrays; @@ -35,7 +34,7 @@ public class SpanSet { private final Class classType; int numberOfSpans; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage E[] spans; int[] spanStarts; int[] spanEnds; diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index 0e61eff86c2b..c5f7f581dcd1 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.BaseCanvas; import android.graphics.Paint; -import android.os.Build; import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -864,7 +863,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public T[] getSpans(int queryStart, int queryEnd, @Nullable Class kind, boolean sortByInsertionOrder) { if (kind == null) return (T[]) ArrayUtils.emptyArray(Object.class); diff --git a/core/java/android/text/SpannableStringInternal.java b/core/java/android/text/SpannableStringInternal.java index f2ab1bb31fbc..0fe9b6afeaea 100644 --- a/core/java/android/text/SpannableStringInternal.java +++ b/core/java/android/text/SpannableStringInternal.java @@ -18,7 +18,6 @@ package android.text; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; @@ -154,7 +153,7 @@ import java.lang.reflect.Array; * * @return True if excluded, false if included. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final boolean isOutOfCopyRange(int start, int end, int spanStart, int spanEnd) { if (spanStart > end || spanEnd < start) return true; if (spanStart != spanEnd && start != end) { @@ -186,12 +185,12 @@ import java.lang.reflect.Array; setSpan(what, start, end, flags, true/*enforceParagraph*/); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean isIndexFollowsNextLine(int index) { return index != 0 && index != length() && charAt(index - 1) != '\n'; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void setSpan(Object what, int start, int end, int flags, boolean enforceParagraph) { int nstart = start; int nend = end; @@ -556,12 +555,12 @@ import java.lang.reflect.Array; * * Due to backward compatibility reasons, we copy even NoCopySpan by default */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void copySpans(Spanned src, int start, int end) { copySpansFromSpanned(src, start, end, false); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void copySpans(SpannableStringInternal src, int start, int end) { copySpansFromInternal(src, start, end, false); } @@ -577,15 +576,15 @@ import java.lang.reflect.Array; @UnsupportedAppUsage private int mSpanCount; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ static final Object[] EMPTY = new Object[0]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int START = 0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int END = 1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int FLAGS = 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int COLUMNS = 3; } diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 85911fffc1bf..85e2d98e93c0 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -1433,15 +1433,15 @@ public class StaticLayout extends Layout { // Unused, here because of gray list private API accesses. /*package*/ static class LineBreaks { private static final int INITIAL_SIZE = 16; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int[] breaks = new int[INITIAL_SIZE]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float[] widths = new float[INITIAL_SIZE]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float[] ascents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float[] descents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int[] flags = new int[INITIAL_SIZE]; // hasTab // breaks, widths, and flags should all have the same length } diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 1f11d10052fe..6318c4757bce 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -57,7 +57,7 @@ public class TextLine { private static final char TAB_CHAR = '\t'; private TextPaint mPaint; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private CharSequence mText; private int mStart; private int mLen; @@ -83,13 +83,13 @@ public class TextLine { private final TextPaint mWorkPaint = new TextPaint(); private final TextPaint mActivePaint = new TextPaint(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final SpanSet mMetricAffectingSpanSpanSet = new SpanSet(MetricAffectingSpan.class); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final SpanSet mCharacterStyleSpanSet = new SpanSet(CharacterStyle.class); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final SpanSet mReplacementSpanSpanSet = new SpanSet(ReplacementSpan.class); diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index 8e6c26ae9f93..c2e3a80a5c51 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -460,7 +460,7 @@ public class DateFormat { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean hasDesignator(CharSequence inFormat, char designator) { if (inFormat == null) return false; diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 511c9746c84c..ff08269a93a4 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -25,7 +25,6 @@ import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; import android.icu.util.MeasureUnit; -import android.os.Build; import com.android.internal.R; @@ -396,7 +395,7 @@ public class DateUtils * the briefest form available (e.g. "2h"). * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CharSequence formatDuration(long millis, int abbrev) { final FormatWidth width; switch (abbrev) { diff --git a/core/java/android/text/method/WordIterator.java b/core/java/android/text/method/WordIterator.java index f427e1bd2b72..d766186c13b0 100644 --- a/core/java/android/text/method/WordIterator.java +++ b/core/java/android/text/method/WordIterator.java @@ -21,7 +21,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.icu.lang.UCharacter; import android.icu.lang.UProperty; import android.icu.text.BreakIterator; -import android.os.Build; import android.text.CharSequenceCharacterIterator; import android.text.Selection; @@ -72,7 +71,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int preceding(int offset) { checkOffsetIsValid(offset); while (true) { @@ -84,7 +83,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int following(int offset) { checkOffsetIsValid(offset); while (true) { @@ -96,7 +95,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.isBoundary(offset); @@ -109,7 +108,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int nextBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.following(offset); @@ -122,7 +121,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int prevBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.preceding(offset); @@ -181,7 +180,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPrevWordBeginningOnTwoWordsBoundary(int offset) { return getBeginning(offset, true); } @@ -200,7 +199,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getNextWordEndOnTwoWordBoundary(int offset) { return getEnd(offset, true); } @@ -281,7 +280,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPunctuationBeginning(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationStartBoundary(offset)) { @@ -298,7 +297,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPunctuationEnd(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationEndBoundary(offset)) { @@ -315,7 +314,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is after a punctuation character. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isAfterPunctuation(int offset) { if (mStart < offset && offset <= mEnd) { final int codePoint = Character.codePointBefore(mCharSeq, offset); @@ -331,7 +330,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is at a punctuation character. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isOnPunctuation(int offset) { if (mStart <= offset && offset < mEnd) { final int codePoint = Character.codePointAt(mCharSeq, offset); diff --git a/core/java/android/text/style/EasyEditSpan.java b/core/java/android/text/style/EasyEditSpan.java index ccccdcf88b69..b23c2b7da6ac 100644 --- a/core/java/android/text/style/EasyEditSpan.java +++ b/core/java/android/text/style/EasyEditSpan.java @@ -19,7 +19,6 @@ package android.text.style; import android.annotation.NonNull; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.text.ParcelableSpan; import android.text.TextUtils; @@ -117,7 +116,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isDeleteEnabled() { return mDeleteEnabled; } @@ -127,7 +126,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDeleteEnabled(boolean value) { mDeleteEnabled = value; } @@ -137,7 +136,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PendingIntent getPendingIntent() { return mPendingIntent; } diff --git a/core/java/android/text/style/SuggestionSpan.java b/core/java/android/text/style/SuggestionSpan.java index 1f15d462b9b1..9378636c24ca 100644 --- a/core/java/android/text/style/SuggestionSpan.java +++ b/core/java/android/text/style/SuggestionSpan.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -132,9 +131,9 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { private final String mLanguageTag; private final int mHashCode; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mEasyCorrectUnderlineThickness; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mEasyCorrectUnderlineColor; private float mMisspelledUnderlineThickness; @@ -435,7 +434,7 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { * @deprecated this is deprecated in {@link android.os.Build.VERSION_CODES#Q}. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public void notifySelection(Context context, String original, int index) { Log.w(TAG, "notifySelection() is deprecated. Does nothing."); diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index 6e25160de8ac..a7ddfa93a74e 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -22,7 +22,6 @@ import android.annotation.Nullable; import android.app.ActivityThread; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.Spannable; @@ -661,7 +660,7 @@ public class Linkify { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void gatherTelLinks(ArrayList links, Spannable s, @Nullable Context context) { PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index a2046307302b..e5115846013f 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -25,7 +25,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; import android.graphics.Rect; -import android.os.Build; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; @@ -849,7 +848,7 @@ public abstract class Transition implements Cloneable { return false; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static ArrayMap getRunningAnimators() { ArrayMap runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { @@ -1914,7 +1913,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void end() { --mNumInstances; if (mNumInstances == 0) { @@ -1972,7 +1971,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void cancel() { int numAnimators = mCurrentAnimators.size(); for (int i = numAnimators - 1; i >= 0; i--) { diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 3d5b811f7d9c..1b0612e87202 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -19,7 +19,6 @@ package android.transition; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.util.ArrayMap; import android.util.Log; import android.view.View; @@ -216,7 +215,7 @@ public class TransitionManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static ArrayMap> getRunningTransitions() { WeakReference>> runningTransitions = sRunningTransitions.get(); diff --git a/core/java/android/util/EventLog.java b/core/java/android/util/EventLog.java index 4654dbfa9531..a7d20b56eca3 100644 --- a/core/java/android/util/EventLog.java +++ b/core/java/android/util/EventLog.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.BufferedReader; import java.io.FileReader; @@ -86,7 +85,7 @@ public class EventLog { private static final byte FLOAT_TYPE = 4; /** @param data containing event, read from the system */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /*package*/ Event(byte[] data) { mBuffer = ByteBuffer.wrap(data); mBuffer.order(ByteOrder.nativeOrder()); diff --git a/core/java/android/util/IconDrawableFactory.java b/core/java/android/util/IconDrawableFactory.java index b5e8dd7ed0af..5eeb12273661 100644 --- a/core/java/android/util/IconDrawableFactory.java +++ b/core/java/android/util/IconDrawableFactory.java @@ -23,7 +23,6 @@ import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.UserHandle; import android.os.UserManager; @@ -52,7 +51,7 @@ public class IconDrawableFactory { return appInfo.isInstantApp() || mUm.hasBadge(userId); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Drawable getBadgedIcon(ApplicationInfo appInfo) { return getBadgedIcon(appInfo, UserHandle.getUserId(appInfo.uid)); } diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java index 8c4dcb3b28e2..bf9a8384fe2c 100644 --- a/core/java/android/util/LocalLog.java +++ b/core/java/android/util/LocalLog.java @@ -17,7 +17,6 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.SystemClock; import java.io.FileDescriptor; @@ -113,7 +112,7 @@ public final class LocalLog { ReadOnlyLocalLog(LocalLog log) { mLog = log; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { mLog.dump(pw); } @@ -128,7 +127,7 @@ public final class LocalLog { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ReadOnlyLocalLog readOnlyLocalLog() { return new ReadOnlyLocalLog(this); } diff --git a/core/java/android/util/LogWriter.java b/core/java/android/util/LogWriter.java index 21b366531eac..a674ae166d63 100644 --- a/core/java/android/util/LogWriter.java +++ b/core/java/android/util/LogWriter.java @@ -17,7 +17,6 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.Writer; @@ -40,7 +39,7 @@ public class LogWriter extends Writer { * {@link android.util.Log#ERROR Log.ERROR}. * @param tag A string tag to associate with each printed log statement. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public LogWriter(int priority, String tag) { mPriority = priority; mTag = tag; diff --git a/core/java/android/util/LongArray.java b/core/java/android/util/LongArray.java index 53dddeb5ad0b..93bcd6b8d4a1 100644 --- a/core/java/android/util/LongArray.java +++ b/core/java/android/util/LongArray.java @@ -18,7 +18,6 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.Preconditions; @@ -46,7 +45,7 @@ public class LongArray implements Cloneable { /** * Creates an empty LongArray with the default initial capacity. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public LongArray() { this(10); } @@ -105,7 +104,7 @@ public class LongArray implements Cloneable { * * @throws IndexOutOfBoundsException when index < 0 || index > size() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void add(int index, long value) { ensureCapacity(1); int rightSegment = mSize - index; @@ -209,7 +208,7 @@ public class LongArray implements Cloneable { /** * Returns the number of values in this array. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int size() { return mSize; } diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java index 4ac3178ecb4c..0892c94d5bec 100644 --- a/core/java/android/util/NtpTrustedTime.java +++ b/core/java/android/util/NtpTrustedTime.java @@ -26,7 +26,6 @@ import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkInfo; import android.net.SntpClient; -import android.os.Build; import android.os.SystemClock; import android.provider.Settings; import android.text.TextUtils; @@ -139,7 +138,7 @@ public class NtpTrustedTime implements TrustedTime { return sSingleton; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean forceRefresh() { synchronized (this) { NtpConnectionInfo connectionInfo = getNtpConnectionInfo(); @@ -182,7 +181,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean hasCache() { return mTimeResult != null; } @@ -209,7 +208,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long currentTimeMillis() { TimeResult timeResult = mTimeResult; if (timeResult == null) { @@ -228,7 +227,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getCachedNtpTime() { if (LOGD) Log.d(TAG, "getCachedNtpTime() cache hit"); TimeResult timeResult = mTimeResult; @@ -241,7 +240,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getCachedNtpTimeReference() { TimeResult timeResult = mTimeResult; return timeResult == null ? 0 : timeResult.getElapsedRealtimeMillis(); diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 9be17cf75ba7..1e5ec0b1c5c3 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -16,7 +16,6 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Path; -import android.os.Build; import dalvik.annotation.optimization.FastNative; @@ -30,7 +29,7 @@ public class PathParser { * @param pathString The string representing a path, the same as "d" string in svg file. * @return the generated Path object. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Path createPathFromPathData(String pathString) { if (pathString == null) { throw new IllegalArgumentException("Path string can not be null."); diff --git a/core/java/android/util/Rational.java b/core/java/android/util/Rational.java index d7730f2b0b3f..aade6204aff8 100644 --- a/core/java/android/util/Rational.java +++ b/core/java/android/util/Rational.java @@ -19,7 +19,6 @@ import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.IOException; import java.io.InvalidObjectException; @@ -78,9 +77,9 @@ public final class Rational extends Number implements Comparable { * Do not change the order of these fields or add new instance fields to maintain the * Serializable compatibility across API revisions. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mNumerator; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mDenominator; /** diff --git a/core/java/android/util/RecurrenceRule.java b/core/java/android/util/RecurrenceRule.java index 39d1f2cbef19..0f2d8bc9e375 100644 --- a/core/java/android/util/RecurrenceRule.java +++ b/core/java/android/util/RecurrenceRule.java @@ -18,7 +18,6 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -52,7 +51,7 @@ public class RecurrenceRule implements Parcelable { @VisibleForTesting public static Clock sClock = Clock.systemDefaultZone(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final ZonedDateTime start; public final ZonedDateTime end; public final Period period; @@ -69,7 +68,7 @@ public class RecurrenceRule implements Parcelable { } @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static RecurrenceRule buildRecurringMonthly(int dayOfMonth, ZoneId zone) { // Assume we started last January, since it has all possible days final ZonedDateTime now = ZonedDateTime.now(sClock).withZoneSameInstant(zone); diff --git a/core/java/android/util/Slog.java b/core/java/android/util/Slog.java index 3880131324fc..2c8bbbfcf8de 100644 --- a/core/java/android/util/Slog.java +++ b/core/java/android/util/Slog.java @@ -89,7 +89,7 @@ public final class Slog { * will always be handled asynchronously. Primarily for use by coding running within * the system process. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int wtf(String tag, String msg) { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, null, false, true); } @@ -130,7 +130,7 @@ public final class Slog { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, tr, false, true); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int println(int priority, String tag, String msg) { return Log.println_native(Log.LOG_ID_SYSTEM, priority, tag, msg); } diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index cd6585cd3fa1..e0b8d52aa132 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -363,7 +363,7 @@ public class TimeUtils { * @return String representation of the time. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String logTimeOfDay(long millis) { Calendar c = Calendar.getInstance(); if (millis >= 0) { diff --git a/core/java/android/util/TrustedTime.java b/core/java/android/util/TrustedTime.java index f279bdb79420..f41fe85fa8bb 100644 --- a/core/java/android/util/TrustedTime.java +++ b/core/java/android/util/TrustedTime.java @@ -17,7 +17,6 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * Interface that provides trusted time information, possibly coming from an NTP @@ -53,7 +52,7 @@ public interface TrustedTime { * @deprecated Only kept for UnsupportedAppUsage. Do not use. See {@link NtpTrustedTime} */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getCacheAge(); /** diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java index c41b3cf9fb72..bee04f4d8036 100644 --- a/core/java/android/view/AccessibilityIterators.java +++ b/core/java/android/view/AccessibilityIterators.java @@ -18,7 +18,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Configuration; -import android.os.Build; import java.text.BreakIterator; import java.util.Locale; @@ -47,11 +46,11 @@ public final class AccessibilityIterators { */ public static abstract class AbstractTextSegmentIterator implements TextSegmentIterator { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AbstractTextSegmentIterator() { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected String mText; private final int[] mSegment = new int[2]; diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index 3da3184afae1..b5080cdb37aa 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -854,7 +854,7 @@ public final class Choreographer { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void scheduleVsyncLocked() { mDisplayEventReceiver.scheduleVsync(); } @@ -994,7 +994,7 @@ public final class Choreographer { public Object action; // Runnable or FrameCallback public Object token; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void run(long frameTimeNanos) { if (token == FRAME_CALLBACK_TOKEN) { ((FrameCallback)action).doFrame(frameTimeNanos); diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index b8a712d55929..34e8221bc971 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -289,7 +289,7 @@ public final class Display { * Display type: Physical display connected through an external port. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TestApi public static final int TYPE_EXTERNAL = 2; @@ -1400,7 +1400,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Mode(int modeId, int width, int height, float refreshRate) { mModeId = modeId; mWidth = width; @@ -1583,7 +1583,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public HdrCapabilities(int[] supportedHdrTypes, float maxLuminance, float maxAverageLuminance, float minLuminance) { mSupportedHdrTypes = supportedHdrTypes; diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index e8a4ed44b7c8..467d93ef3aaf 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -18,7 +18,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.FrameInfo; -import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -229,7 +228,7 @@ public abstract class DisplayEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void dispatchHotplug(long timestampNanos, long physicalDisplayId, boolean connected) { onHotplug(timestampNanos, physicalDisplayId, connected); } diff --git a/core/java/android/view/DragEvent.java b/core/java/android/view/DragEvent.java index b6b029bdbb44..9d8f7c3c083d 100644 --- a/core/java/android/view/DragEvent.java +++ b/core/java/android/view/DragEvent.java @@ -19,7 +19,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.ClipData; import android.content.ClipDescription; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -131,9 +130,9 @@ public class DragEvent implements Parcelable { int mAction; float mX, mY; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ClipDescription mClipDescription; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ClipData mClipData; IDragAndDropPermissions mDragAndDropPermissions; @@ -338,7 +337,7 @@ public class DragEvent implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static DragEvent obtain(DragEvent source) { return obtain(source.mAction, source.mX, source.mY, source.mOffsetX, source.mOffsetY, source.mLocalState, source.mClipDescription, source.mClipData, source.mDragSurface, diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index 388096e09631..387787e3b0be 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -18,7 +18,6 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -259,7 +258,7 @@ public final class FrameMetrics { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final long[] mTimingData; /** diff --git a/core/java/android/view/IRecentsAnimationRunner.aidl b/core/java/android/view/IRecentsAnimationRunner.aidl index f054b869a9b9..925786f82e00 100644 --- a/core/java/android/view/IRecentsAnimationRunner.aidl +++ b/core/java/android/view/IRecentsAnimationRunner.aidl @@ -42,7 +42,7 @@ oneway interface IRecentsAnimationRunner { * * @see {@link RecentsAnimationController#cleanupScreenshot} */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onAnimationCanceled(in @nullable ActivityManager.TaskSnapshot taskSnapshot) = 1; /** @@ -52,7 +52,7 @@ oneway interface IRecentsAnimationRunner { * @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be * {@code null} if the device is not currently in split screen */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onAnimationStart(in IRecentsAnimationController controller, in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in Rect homeContentInsets, in Rect minimizedHomeBounds) = 2; diff --git a/core/java/android/view/IRemoteAnimationRunner.aidl b/core/java/android/view/IRemoteAnimationRunner.aidl index 423e23d2bc08..7b35aa2d2b45 100644 --- a/core/java/android/view/IRemoteAnimationRunner.aidl +++ b/core/java/android/view/IRemoteAnimationRunner.aidl @@ -33,7 +33,7 @@ oneway interface IRemoteAnimationRunner { * @param apps The list of apps to animate. * @param finishedCallback The callback to invoke when the animation is finished. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onAnimationStart(in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in IRemoteAnimationFinishedCallback finishedCallback); @@ -41,6 +41,6 @@ oneway interface IRemoteAnimationRunner { * Called when the animation was cancelled. From this point on, any updates onto the leashes * won't have any effect anymore. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onAnimationCancelled(); } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index c50d25e5445b..43a8992aa74e 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -184,7 +184,7 @@ interface IWindowManager * Used by system ui to report that recents has shown itself. * @deprecated to be removed once prebuilts are updated */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void endProlongedAnimations(); void startFreezingScreen(int exitAnim, int enterAnim); @@ -198,7 +198,7 @@ interface IWindowManager void exitKeyguardSecurely(IOnKeyguardExitResult callback); @UnsupportedAppUsage boolean isKeyguardLocked(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isKeyguardSecure(int userId); void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message); @@ -210,11 +210,11 @@ interface IWindowManager // These can only be called with the SET_ANIMATON_SCALE permission. @UnsupportedAppUsage float getAnimationScale(int which); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage float[] getAnimationScales(); @UnsupportedAppUsage void setAnimationScale(int which, float scale); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setAnimationScales(in float[] scales); float getCurrentAnimatorScale(); @@ -235,7 +235,7 @@ interface IWindowManager // should be enabled. The 'enabled' value is null or blank for // the system default (differs per build variant) or any valid // boolean string as parsed by SystemProperties.getBoolean(). - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setStrictModeVisualIndicatorPreference(String enabled); /** @@ -411,7 +411,7 @@ interface IWindowManager /** * Lock the device immediately with the specified options (can be null). */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void lockNow(in Bundle options); /** diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 0089a852a893..9febc9f09ef3 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -178,7 +178,7 @@ interface IWindowSession { * @param data Data transferred by drag and drop * @return Token of drag operation which will be passed to cancelDragAndDrop. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage IBinder performDrag(IWindow window, int flags, in SurfaceControl surface, int touchSource, float touchX, float touchY, float thumbCenterX, float thumbCenterY, in ClipData data); diff --git a/core/java/android/view/InputChannel.java b/core/java/android/view/InputChannel.java index f76b1f89625b..f2d3f5ad08bf 100644 --- a/core/java/android/view/InputChannel.java +++ b/core/java/android/view/InputChannel.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +54,7 @@ public final class InputChannel implements Parcelable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mPtr; // used by native code private static native long[] nativeOpenInputChannelPair(String name); diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 22ac4dcd2cfe..58e5b2dfaa37 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -424,7 +424,7 @@ public final class InputDevice implements Parcelable { }; // Called by native code. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private InputDevice(int id, int generation, int controllerNumber, String name, int vendorId, int productId, String descriptor, boolean isExternal, int sources, int keyboardType, KeyCharacterMap keyCharacterMap, boolean hasVibrator, boolean hasMicrophone, @@ -757,7 +757,7 @@ public final class InputDevice implements Parcelable { } // Called from native code. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void addMotionRange(int axis, int source, float min, float max, float flat, float fuzz, float resolution) { mMotionRanges.add(new MotionRange(axis, source, min, max, flat, fuzz, resolution)); diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index 038dff654ba6..a06a0c68e241 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.IBinder; import android.os.Looper; import android.os.MessageQueue; @@ -125,7 +124,7 @@ public abstract class InputEventReceiver { * * @param event The input event that was received. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onInputEvent(InputEvent event) { finishInputEvent(event, false); } @@ -217,7 +216,7 @@ public abstract class InputEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void dispatchInputEvent(int seq, InputEvent event) { mSeqMap.put(event.getSequenceNumber(), seq); onInputEvent(event); diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java index 40eb438262a1..86a309e3ed79 100644 --- a/core/java/android/view/InputEventSender.java +++ b/core/java/android/view/InputEventSender.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -139,7 +138,7 @@ public abstract class InputEventSender { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void dispatchInputEventFinished(int seq, boolean handled) { onInputEventFinished(seq, handled); } diff --git a/core/java/android/view/InputFilter.java b/core/java/android/view/InputFilter.java index b18c5cdb2aab..36d558630da9 100644 --- a/core/java/android/view/InputFilter.java +++ b/core/java/android/view/InputFilter.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -119,7 +118,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * * @param looper The looper to run callbacks on. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public InputFilter(Looper looper) { mH = new H(looper); } @@ -189,7 +188,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * @param event The input event that was received. * @param policyFlags The input event policy flags. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onInputEvent(InputEvent event, int policyFlags) { sendInputEvent(event, policyFlags); } diff --git a/core/java/android/view/InputQueue.java b/core/java/android/view/InputQueue.java index 7accb66aa3aa..74ce6ac02db3 100644 --- a/core/java/android/view/InputQueue.java +++ b/core/java/android/view/InputQueue.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.LongSparseArray; @@ -102,7 +101,7 @@ public final class InputQueue { mActiveEventArray.put(id, event); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void finishInputEvent(long id, boolean handled) { int index = mActiveEventArray.indexOfKey(id); if (index >= 0) { diff --git a/core/java/android/view/KeyCharacterMap.java b/core/java/android/view/KeyCharacterMap.java index 02a97888cffd..90e0f3f89a0f 100644 --- a/core/java/android/view/KeyCharacterMap.java +++ b/core/java/android/view/KeyCharacterMap.java @@ -18,7 +18,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.input.InputManager; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.method.MetaKeyKeyListener; @@ -309,7 +308,7 @@ public class KeyCharacterMap implements Parcelable { } // Called from native - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private KeyCharacterMap(long ptr) { mPtr = ptr; } @@ -751,9 +750,9 @@ public class KeyCharacterMap implements Parcelable { private FallbackAction next; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int keyCode; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int metaState; private FallbackAction() { diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index c87e51e35891..0ab1751fbf95 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -849,7 +849,7 @@ public class KeyEvent extends InputEvent implements Parcelable { // Symbolic names of all metakeys in bit order from least significant to most significant. // Accordingly there are exactly 32 values in this table. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final String[] META_SYMBOLIC_NAMES = new String[] { "META_SHIFT_ON", "META_ALT_ON", @@ -920,7 +920,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int META_CAP_LOCKED = 0x100; /** @@ -928,7 +928,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int META_ALT_LOCKED = 0x200; /** @@ -936,7 +936,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int META_SYM_LOCKED = 0x400; /** @@ -945,7 +945,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * in its API that is currently being retained for legacy reasons. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int META_SELECTING = 0x800; /** @@ -1266,29 +1266,29 @@ public class KeyEvent extends InputEvent implements Parcelable { private KeyEvent mNext; private int mId; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mDeviceId; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSource; private int mDisplayId; private @Nullable byte[] mHmac; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mMetaState; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mAction; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mKeyCode; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mScanCode; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mRepeatCount; @UnsupportedAppUsage private int mFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mDownTime; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mEventTime; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mCharacters; public interface Callback { @@ -1651,7 +1651,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static KeyEvent obtain(long downTime, long eventTime, int action, int code, int repeat, int metaState, int deviceId, int scancode, int flags, int source, String characters) { @@ -2103,7 +2103,7 @@ public class KeyEvent extends InputEvent implements Parcelable { } // Mask of all modifier key meta states. Specifically excludes locked keys like caps lock. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int META_MODIFIER_MASK = META_SHIFT_ON | META_SHIFT_LEFT_ON | META_SHIFT_RIGHT_ON | META_ALT_ON | META_ALT_LEFT_ON | META_ALT_RIGHT_ON @@ -2112,23 +2112,23 @@ public class KeyEvent extends InputEvent implements Parcelable { | META_SYM_ON | META_FUNCTION_ON; // Mask of all lock key meta states. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int META_LOCK_MASK = META_CAPS_LOCK_ON | META_NUM_LOCK_ON | META_SCROLL_LOCK_ON; // Mask of all valid meta states. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int META_ALL_MASK = META_MODIFIER_MASK | META_LOCK_MASK; // Mask of all synthetic meta states that are reserved for API compatibility with // historical uses in MetaKeyKeyListener. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int META_SYNTHETIC_MASK = META_CAP_LOCKED | META_ALT_LOCKED | META_SYM_LOCKED | META_SELECTING; // Mask of all meta states that are not valid use in specifying a modifier key. // These bits are known to be used for purposes other than specifying modifiers. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int META_INVALID_MODIFIER_MASK = META_LOCK_MASK | META_SYNTHETIC_MASK; diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index 66c514824e35..b925b492c04b 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -956,7 +956,7 @@ public abstract class LayoutInflater { * argument and should be used for everything except {@code >include>} * tag parsing. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private View createViewFromTag(View parent, String name, Context context, AttributeSet attrs) { return createViewFromTag(parent, name, context, attrs, false); } @@ -976,7 +976,7 @@ public abstract class LayoutInflater { * attribute (if set) for the view being inflated, * {@code false} otherwise */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage View createViewFromTag(View parent, String name, Context context, AttributeSet attrs, boolean ignoreThemeAttr) { if (name.equals("view")) { diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index a8d261553a8f..abb82bc9e16b 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1484,7 +1484,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { } // Private value for history pos that obtains the current sample. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int HISTORY_CURRENT = -0x80000000; // This is essentially the same as native AMOTION_EVENT_INVALID_CURSOR_POSITION as they're all diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 2bd3d46d389a..726176568605 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -25,7 +25,6 @@ import android.graphics.Canvas; import android.graphics.Outline; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.widget.RemoteViews; @@ -69,7 +68,7 @@ public class NotificationHeaderView extends ViewGroup { this(context, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NotificationHeaderView(Context context, @Nullable AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java index 38ae03db3290..f60d98b2dc23 100644 --- a/core/java/android/view/PointerIcon.java +++ b/core/java/android/view/PointerIcon.java @@ -153,17 +153,17 @@ public final class PointerIcon implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mType; private int mSystemIconResourceId; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Bitmap mBitmap; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mHotSpotX; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mHotSpotY; // The bitmaps for the additional frame of animated pointer icon. Note that the first frame // will be stored in mBitmap. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Bitmap mBitmapFrames[]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mDurationPerFrame; /** diff --git a/core/java/android/view/RemoteAnimationAdapter.java b/core/java/android/view/RemoteAnimationAdapter.java index a78036fba094..166d3baa2fdf 100644 --- a/core/java/android/view/RemoteAnimationAdapter.java +++ b/core/java/android/view/RemoteAnimationAdapter.java @@ -18,7 +18,6 @@ package android.view; import android.app.ActivityOptions; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -66,7 +65,7 @@ public class RemoteAnimationAdapter implements Parcelable { * @param statusBarTransitionDelay The desired delay for all visual animations in the * status bar caused by this app animation in millis. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RemoteAnimationAdapter(IRemoteAnimationRunner runner, long duration, long statusBarTransitionDelay, boolean changeNeedsSnapshot) { mRunner = runner; diff --git a/core/java/android/view/RemoteAnimationTarget.java b/core/java/android/view/RemoteAnimationTarget.java index ac5d14e97c85..e3129b639900 100644 --- a/core/java/android/view/RemoteAnimationTarget.java +++ b/core/java/android/view/RemoteAnimationTarget.java @@ -38,7 +38,6 @@ import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Point; import android.graphics.Rect; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -99,7 +98,7 @@ public class RemoteAnimationTarget implements Parcelable { * The {@link SurfaceControl} for the starting state of a target if this transition is * MODE_CHANGING, {@code null)} otherwise. This is relative to the app window. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final SurfaceControl startLeash; /** @@ -172,7 +171,7 @@ public class RemoteAnimationTarget implements Parcelable { * should be equivalent to the size of the starting thumbnail. Note that sourceContainerBounds * is the end bounds of a change transition. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final Rect startBounds; /** diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 5b79174a6cd8..0847a179c553 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -34,7 +34,6 @@ import android.graphics.Rect; import android.graphics.RenderNode; import android.graphics.SurfaceTexture; import android.hardware.HardwareBuffer; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -75,7 +74,7 @@ public class Surface implements Parcelable { throws OutOfResourcesException; private static native void nativeUnlockCanvasAndPost(long nativeObject, Canvas canvas); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native void nativeRelease(long nativeObject); private static native boolean nativeIsValid(long nativeObject); private static native boolean nativeIsConsumerRunningBehind(long nativeObject); @@ -128,7 +127,7 @@ public class Surface implements Parcelable { private String mName; @UnsupportedAppUsage long mNativeObject; // package scope only for SurfaceControl access - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mLockedObject; private int mGenerationId; // incremented each time mNativeObject changes private final Canvas mCanvas = new CompatibleCanvas(); @@ -265,7 +264,7 @@ public class Surface implements Parcelable { } /* called from android_view_Surface_createFromIGraphicBufferProducer() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Surface(long nativeObject) { synchronized (mLock) { setNativeObjectLocked(nativeObject); diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 5a4584387dba..6d6fabb16b72 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -309,7 +309,7 @@ public final class SurfaceControl implements Parcelable { * Surface creation flag: Surface is created hidden * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int HIDDEN = 0x00000004; /** @@ -2898,7 +2898,7 @@ public final class SurfaceControl implements Parcelable { * @return Itself. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Transaction setCornerRadius(SurfaceControl sc, float cornerRadius) { checkPreconditions(sc); nativeSetCornerRadius(mNativeObject, sc.mNativeObject, cornerRadius); diff --git a/core/java/android/view/SurfaceSession.java b/core/java/android/view/SurfaceSession.java index cbc0479a4c07..0f851c1881f5 100644 --- a/core/java/android/view/SurfaceSession.java +++ b/core/java/android/view/SurfaceSession.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * An instance of this class represents a connection to the surface @@ -27,7 +26,7 @@ import android.os.Build; */ public final class SurfaceSession { // Note: This field is accessed by native code. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeClient; // SurfaceComposerClient* private static native long nativeCreate(); diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index fc0ec4c560d4..a02070a21ac8 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -29,7 +29,6 @@ import android.graphics.Rect; import android.graphics.SurfaceTexture; import android.graphics.TextureLayer; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.util.Log; @@ -118,7 +117,7 @@ public class TextureView extends View { private SurfaceTextureListener mListener; private boolean mHadSurface; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mOpaque = true; private final Matrix mMatrix = new Matrix(); @@ -126,7 +125,7 @@ public class TextureView extends View { private final Object[] mLock = new Object[0]; private boolean mUpdateLayer; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mUpdateSurface; private Canvas mCanvas; @@ -134,7 +133,7 @@ public class TextureView extends View { private final Object[] mNativeWindowLock = new Object[0]; // Set by native code, do not write! - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeWindow; /** @@ -228,7 +227,7 @@ public class TextureView extends View { /** @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void onDetachedFromWindowInternal() { destroyHardwareLayer(); releaseSurfaceTexture(); @@ -245,7 +244,7 @@ public class TextureView extends View { destroyHardwareLayer(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void destroyHardwareLayer() { if (mLayer != null) { mLayer.detachSurfaceTexture(); @@ -854,9 +853,9 @@ public class TextureView extends View { void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private native void nCreateNativeWindow(SurfaceTexture surface); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private native void nDestroyNativeWindow(); private static native boolean nLockCanvas(long nativeWindow, Canvas canvas, Rect dirty); diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index e1c4305e8747..1f71924ca927 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -18,7 +18,6 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.Pools.SynchronizedPool; @@ -437,25 +436,25 @@ public final class VelocityTracker { /** * Polynomial coefficients describing motion in X. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final float[] xCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial coefficients describing motion in Y. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final float[] yCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial degree, or zero if only position information is available. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int degree; /** * Confidence (coefficient of determination), between 0 (no fit) and 1 (perfect fit). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public float confidence; /** diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e5561b339948..bda368ecb3a2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -809,7 +809,7 @@ import java.util.function.Predicate; @UiThread public class View implements Drawable.Callback, KeyEvent.Callback, AccessibilityEventSource { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final boolean DBG = false; /** @hide */ @@ -2409,7 +2409,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private int mAutofillViewId = NO_ID; // ID for accessibility purposes. This ID must be unique for every window - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mAccessibilityViewId = NO_ID; private int mAccessibilityCursorPosition = ACCESSIBILITY_CURSOR_POSITION_UNDEFINED; @@ -2421,7 +2421,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setTag(Object) * @see #getTag() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected Object mTag = null; /* @@ -3888,7 +3888,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Flag to make the status bar not expandable. Unless you also * set {@link #STATUS_BAR_DISABLE_NOTIFICATION_ICONS}, new notifications will continue to show. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int STATUS_BAR_DISABLE_EXPAND = 0x00010000; /** @@ -4551,7 +4551,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private LongSparseLongArray mMeasureCache; @ViewDebug.ExportedProperty(deepExport = true, prefix = "bg_") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Drawable mBackground; private TintInfo mBackgroundTint; @@ -4669,7 +4669,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * This field should be made private, so it is hidden from the SDK. * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected OnCreateContextMenuListener mOnCreateContextMenuListener; @UnsupportedAppUsage @@ -4678,13 +4678,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @UnsupportedAppUsage private OnTouchListener mOnTouchListener; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private OnHoverListener mOnHoverListener; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private OnGenericMotionListener mOnGenericMotionListener; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private OnDragListener mOnDragListener; private OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener; @@ -5113,7 +5113,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean mCachingFailed; @UnsupportedAppUsage private Bitmap mDrawingCache; @@ -6850,7 +6850,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ScrollabilityCache getScrollCache() { initScrollCache(); return mScrollCache; @@ -10368,7 +10368,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean isVisibleToUser(Rect boundInView) { if (mAttachInfo != null) { // Attached to invisible window means this view is not visible. @@ -10756,7 +10756,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide pending API council approval */ @CallSuper - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void onFocusLost() { resetPressedState(); } @@ -11648,7 +11648,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean fitsSystemWindows() { return getFitsSystemWindows(); } @@ -13709,7 +13709,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void notifyViewAccessibilityStateChangedIfNeeded(int changeType) { if (!AccessibilityManager.getInstance(mContext).isEnabled() || mAttachInfo == null) { return; @@ -14129,7 +14129,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TextSegmentIterator getIteratorForGranularity(int granularity) { switch (granularity) { case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER: { @@ -14596,7 +14596,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return True if the event was handled by the view, false otherwise. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean dispatchPointerEvent(MotionEvent event) { if (event.isTouchEvent()) { return dispatchTouchEvent(event); @@ -15916,7 +15916,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isInScrollingContainer() { ViewParent p = getParent(); while (p != null && p instanceof ViewGroup) { @@ -16646,7 +16646,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return The inverse of the current matrix of this view. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final Matrix getInverseMatrix() { ensureTransformationInfo(); if (mTransformationInfo.mInverseMatrix == null) { @@ -18688,7 +18688,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void invalidateParentIfNeeded() { if (isHardwareAccelerated() && mParent instanceof View) { ((View) mParent).invalidate(true); @@ -18795,7 +18795,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ThreadedRenderer getThreadedRenderer() { return mAttachInfo != null ? mAttachInfo.mThreadedRenderer : null; } @@ -19932,7 +19932,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #computeHorizontalScrollOffset() * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void onDrawHorizontalScrollBar(Canvas canvas, Drawable scrollBar, int l, int t, int r, int b) { scrollBar.setBounds(l, t, r, b); @@ -20115,7 +20115,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Return true if the application tag in the AndroidManifest has set "supportRtl" to true */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean hasRtlSupport() { return mContext.getApplicationInfo().hasRtlSupport(); } @@ -20273,7 +20273,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void resolvePadding() { final int resolvedLayoutDirection = getLayoutDirection(); @@ -20371,7 +20371,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void onDetachedFromWindowInternal() { mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT; mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT; @@ -21088,7 +21088,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void destroyHardwareResources() { if (mOverlay != null) { mOverlay.getOverlayView().destroyHardwareResources(); @@ -21224,7 +21224,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RenderNode updateDisplayListIfDirty() { final RenderNode renderNode = mRenderNode; if (!canHaveDisplayList()) { @@ -21295,7 +21295,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return renderNode; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void resetDisplayList() { mRenderNode.discardDisplayList(); if (mBackgroundRenderNode != null) { @@ -24749,7 +24749,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean toGlobalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -24771,7 +24771,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean toLocalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -26193,7 +26193,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDisabledSystemUiVisibility(int flags) { if (mAttachInfo != null) { if (mAttachInfo.mDisabledSystemUiVisibility != flags) { @@ -26242,7 +26242,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * */ public static class DragShadowBuilder { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final WeakReference mView; /** @@ -26710,7 +26710,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Drawable that are not transparent. * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void applyDrawableToTransparentRegion(Drawable dr, Region region) { if (DBG) { Log.i("View", "Getting transparent region for: " + this); @@ -27278,7 +27278,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"), @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"), }) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRawTextDirection() { return (mPrivateFlags2 & PFLAG2_TEXT_DIRECTION_MASK) >> PFLAG2_TEXT_DIRECTION_MASK_SHIFT; } @@ -27535,7 +27535,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd") }) @TextAlignment - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRawTextAlignment() { return (mPrivateFlags2 & PFLAG2_TEXT_ALIGNMENT_MASK) >> PFLAG2_TEXT_ALIGNMENT_MASK_SHIFT; } @@ -28885,7 +28885,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * constants declared by {@link View} (there are more display states than * screen states). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mDisplayState = Display.STATE_UNKNOWN; /** @@ -29365,7 +29365,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * The current state of the scrollbars: ON, OFF, or FADING */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int state = OFF; private int mLastColor; @@ -29817,7 +29817,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) { return host.createAccessibilityNodeInfoInternal(); } @@ -30235,7 +30235,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return true; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void hideTooltip() { if (mTooltipInfo == null) { return; diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 16211fcecdf4..abf76ece1f3d 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -680,7 +680,7 @@ public class ViewConfiguration { * to a hover movement gesture. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getHoverTapSlop() { return HOVER_TAP_SLOP; } diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 01cb0a67c1a2..100b4fdbf446 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -29,7 +29,6 @@ import android.graphics.Picture; import android.graphics.RecordingCanvas; import android.graphics.Rect; import android.graphics.RenderNode; -import android.os.Build; import android.os.Debug; import android.os.Handler; import android.os.Looper; @@ -477,7 +476,7 @@ public class ViewDebug { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static long getViewRootImplCount() { return Debug.countInstancesOfClass(ViewRootImpl.class); } @@ -1153,7 +1152,7 @@ public class ViewDebug { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void dump(View root, boolean skipChildren, boolean includeProperties, OutputStream clientStream) throws IOException { BufferedWriter out = null; diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 37bea5821e42..eb6c49549100 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -131,7 +131,7 @@ import java.util.function.Predicate; public abstract class ViewGroup extends View implements ViewParent, ViewManager { private static final String TAG = "ViewGroup"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final boolean DBG = false; /** @@ -3059,7 +3059,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void transformPointToViewLocal(float[] point, View child) { point[0] += mScrollX - child.mLeft; point[1] += mScrollY - child.mTop; @@ -3772,7 +3772,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfoInternal(info); if (getAccessibilityNodeProvider() != null) { @@ -3904,7 +3904,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void dispatchDetachedFromWindow() { // If we still have a touch target, we are still in the process of // dispatching motion events to a child; we need to get rid of that @@ -7769,7 +7769,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void resolvePadding() { super.resolvePadding(); int count = getChildCount(); @@ -9240,7 +9240,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) { super.encodeProperties(encoder); diff --git a/core/java/android/view/ViewOverlay.java b/core/java/android/view/ViewOverlay.java index 02f7e95ba742..274f1eddee95 100644 --- a/core/java/android/view/ViewOverlay.java +++ b/core/java/android/view/ViewOverlay.java @@ -22,7 +22,6 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.os.Build; import java.util.ArrayList; @@ -57,7 +56,7 @@ public class ViewOverlay { * of the overlay * @return */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ViewGroup getOverlayView() { return mOverlayViewGroup; } @@ -97,7 +96,7 @@ public class ViewOverlay { mOverlayViewGroup.clear(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean isEmpty() { return mOverlayViewGroup.isEmpty(); } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 49582305663d..9bc07702feee 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -272,7 +272,7 @@ public final class ViewRootImpl implements ViewParent, */ private static final int CONTENT_CAPTURE_ENABLED_FALSE = 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static final ThreadLocal sRunQueues = new ThreadLocal(); static final ArrayList sFirstDrawHandlers = new ArrayList<>(); @@ -417,11 +417,11 @@ public final class ViewRootImpl implements ViewParent, final Region mTransparentRegion; final Region mPreviousTransparentRegion; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mWidth; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mHeight; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage Rect mDirty; public boolean mIsAnimating; @@ -801,7 +801,7 @@ public final class ViewRootImpl implements ViewParent, } /** Add static config callback to be notified about global config changes. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void addConfigCallback(ConfigChangedCallback callback) { synchronized (sConfigCallbacks) { sConfigCallbacks.add(callback); @@ -1175,7 +1175,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getWindowFlags() { return mWindowAttributes.flags; } @@ -1957,7 +1957,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void scheduleTraversals() { if (!mTraversalScheduled) { mTraversalScheduled = true; @@ -5206,7 +5206,7 @@ public final class ViewRootImpl implements ViewParent, * @param inTouchMode Whether we want to be in touch mode. * @return True if the touch mode changed and focus changed was changed as a result */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean ensureTouchMode(boolean inTouchMode) { if (DBG) Log.d("touchmode", "ensureTouchMode(" + inTouchMode + "), current " + "touch mode is " + mAttachInfo.mInTouchMode); @@ -7239,7 +7239,7 @@ public final class ViewRootImpl implements ViewParent, } /* drag/drop */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void setLocalDragState(Object obj) { mLocalDragState = obj; } @@ -7865,7 +7865,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void dispatchResized(ClientWindowFrames frames, boolean reportDraw, MergedConfiguration mergedConfiguration, boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId) { @@ -8056,7 +8056,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void enqueueInputEvent(InputEvent event) { enqueueInputEvent(event, null, 0, false); } @@ -8475,7 +8475,7 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.addViewRect(info); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void cancelInvalidate(View view) { mHandler.removeMessages(MSG_INVALIDATE, view); // fixme: might leak the AttachInfo.InvalidateInfo objects instead of returning @@ -8484,12 +8484,12 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.removeView(view); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void dispatchInputEvent(InputEvent event) { dispatchInputEvent(event, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void dispatchInputEvent(InputEvent event, InputEventReceiver receiver) { SomeArgs args = SomeArgs.obtain(); args.arg1 = event; diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java index 5a99ab2f5bdb..d9b55e4e729d 100644 --- a/core/java/android/view/ViewTreeObserver.java +++ b/core/java/android/view/ViewTreeObserver.java @@ -51,7 +51,7 @@ public final class ViewTreeObserver { // Non-recursive listeners use CopyOnWriteArray // Any listener invoked from ViewRootImpl.performTraversals() should not be recursive - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private CopyOnWriteArray mOnGlobalLayoutListeners; @UnsupportedAppUsage private CopyOnWriteArray mOnComputeInternalInsetsListeners; @@ -242,7 +242,7 @@ public final class ViewTreeObserver { * Only used when {@link #setTouchableInsets(int)} is called with * the option {@link #TOUCHABLE_INSETS_REGION}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final Region touchableRegion = new Region(); /** @@ -267,7 +267,7 @@ public final class ViewTreeObserver { * Option for {@link #setTouchableInsets(int)}: the area inside of * the provided touchable region in {@link #touchableRegion} can be touched. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int TOUCHABLE_INSETS_REGION = 3; /** diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 8dd4b667d357..5331a1b8d538 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -162,7 +162,7 @@ public abstract class Window { * Max value used as a feature ID * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int FEATURE_MAX = FEATURE_ACTIVITY_TRANSITIONS; /** @@ -791,7 +791,7 @@ public abstract class Window { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final boolean isDestroyed() { return mDestroyed; } @@ -1137,7 +1137,7 @@ public abstract class Window { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addPrivateFlags(int flags) { setPrivateFlags(flags, flags); } diff --git a/core/java/android/view/WindowAnimationFrameStats.java b/core/java/android/view/WindowAnimationFrameStats.java index 251ae9bd58f2..dfc4f0cd4dc6 100644 --- a/core/java/android/view/WindowAnimationFrameStats.java +++ b/core/java/android/view/WindowAnimationFrameStats.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -49,7 +48,7 @@ public final class WindowAnimationFrameStats extends FrameStats implements Parce * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void init(long refreshPeriodNano, long[] framesPresentedTimeNano) { mRefreshPeriodNano = refreshPeriodNano; mFramesPresentedTimeNano = framesPresentedTimeNano; diff --git a/core/java/android/view/WindowContentFrameStats.java b/core/java/android/view/WindowContentFrameStats.java index c788346efdd8..217197c96793 100644 --- a/core/java/android/view/WindowContentFrameStats.java +++ b/core/java/android/view/WindowContentFrameStats.java @@ -17,7 +17,6 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -62,7 +61,7 @@ public final class WindowContentFrameStats extends FrameStats implements Parcela * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void init(long refreshPeriodNano, long[] framesPostedTimeNano, long[] framesPresentedTimeNano, long[] framesReadyTimeNano) { mRefreshPeriodNano = refreshPeriodNano; diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 5d1b13f06d39..2cab32b48793 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -76,7 +76,6 @@ import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; -import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -1079,7 +1078,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows only on the owning user's window. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15; /** @@ -1148,7 +1147,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows on all users' windows. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int TYPE_DISPLAY_OVERLAY = FIRST_SYSTEM_WINDOW+26; /** @@ -2725,7 +2724,7 @@ public interface WindowManager extends ViewManager { * The ui visibility as requested by the views in this hierarchy. * the combined value should be systemUiVisibility | subtreeSystemUiVisibility. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int subtreeSystemUiVisibility; /** @@ -2901,7 +2900,7 @@ public interface WindowManager extends ViewManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int INPUT_FEATURE_DISABLE_USER_ACTIVITY = 0x00000004; /** diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index dd0ab6503a8a..f01cbcc1430e 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -259,7 +259,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ArrayList getRootViews(IBinder token) { ArrayList views = new ArrayList<>(); synchronized (mLock) { @@ -438,7 +438,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void removeView(View view, boolean immediate) { if (view == null) { throw new IllegalArgumentException("view must not be null"); diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index f63749be6df2..d803f8bfa6cc 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -126,7 +126,7 @@ public final class AccessibilityInteractionClient /** * @return The client for the current thread. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static AccessibilityInteractionClient getInstance() { final long threadId = Thread.currentThread().getId(); return getInstanceForThread(threadId); @@ -205,7 +205,7 @@ public final class AccessibilityInteractionClient * * @param message The message. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSameThreadMessage(Message message) { synchronized (mInstanceLock) { mSameThreadMessage = message; @@ -729,7 +729,7 @@ public final class AccessibilityInteractionClient return false; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void clearCache() { sAccessibilityCache.clear(); } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index a8534faf43e5..a9e8d5498a57 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -111,7 +111,7 @@ public final class AccessibilityManager { public static final int DALTONIZER_DISABLED = -1; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int DALTONIZER_SIMULATE_MONOCHROMACY = 0; /** @hide */ diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 97ce92cd90aa..303ba9e2a7d8 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -726,7 +726,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getAccessibilityViewId(long accessibilityNodeId) { return (int) accessibilityNodeId; } @@ -740,7 +740,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getVirtualDescendantId(long accessibilityNodeId) { return (int) ((accessibilityNodeId & VIRTUAL_DESCENDANT_ID_MASK) >> VIRTUAL_DESCENDANT_ID_SHIFT); @@ -768,7 +768,7 @@ public class AccessibilityNodeInfo implements Parcelable { private static final AccessibilityNodeInfo DEFAULT = new AccessibilityNodeInfo(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mSealed; // Data. @@ -988,7 +988,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean refresh(Bundle arguments, boolean bypassCache) { enforceSealed(); if (!canPerformRequestOverConnection(mConnectionId, mWindowId, mSourceNodeId)) { diff --git a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl index 049bb31adbb1..f96f0acd6082 100644 --- a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl +++ b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl @@ -33,7 +33,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setFindAccessibilityNodeInfoResult(in AccessibilityNodeInfo info, int interactionId); /** @@ -42,7 +42,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}s. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setFindAccessibilityNodeInfosResult(in List infos, int interactionId); @@ -52,6 +52,6 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param Whether the action was performed. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setPerformAccessibilityActionResult(boolean succeeded, int interactionId); } diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl index 5d3c72015ee3..97036f3f3a1b 100644 --- a/core/java/android/view/accessibility/IAccessibilityManager.aidl +++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl @@ -44,7 +44,7 @@ interface IAccessibilityManager { List getInstalledAccessibilityServiceList(int userId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage List getEnabledAccessibilityServiceList(int feedbackType, int userId); int addAccessibilityInteractionConnection(IWindow windowToken, IBinder leashToken, diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 1931174d4bb8..5785999e2672 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2334,7 +2334,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isCursorAnchorInfoEnabled() { synchronized (mH) { final boolean isImmediate = (mRequestUpdateCursorAnchorInfoMonitorMode & @@ -2350,7 +2350,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUpdateCursorAnchorInfoMode(int flags) { synchronized (mH) { mRequestUpdateCursorAnchorInfoMonitorMode = flags; diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java index b606340b77a7..fa4f7d6d32da 100644 --- a/core/java/android/view/textclassifier/TextClassificationManager.java +++ b/core/java/android/view/textclassifier/TextClassificationManager.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.ServiceManager; import android.view.textclassifier.TextClassifier.TextClassifierType; @@ -105,7 +104,7 @@ public final class TextClassificationManager { * @see TextClassifier#DEFAULT_SYSTEM * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TextClassifier getTextClassifier(@TextClassifierType int type) { switch (type) { case TextClassifier.LOCAL: diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index 35d84458bd35..afddaa2ff58a 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -18,7 +18,6 @@ package android.view.textservice; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -98,7 +97,7 @@ public class SpellCheckerSession { private final InternalListener mInternalListener; private final TextServicesManager mTextServicesManager; private final SpellCheckerInfo mSpellCheckerInfo; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final SpellCheckerSessionListener mSpellCheckerSessionListener; private final SpellCheckerSessionListenerImpl mSpellCheckerSessionListenerImpl; diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index d34c8d58e789..cd70a313db67 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -22,7 +22,6 @@ import android.annotation.TestApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; @@ -218,7 +217,7 @@ public final class TextServicesManager { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SpellCheckerInfo[] getEnabledSpellCheckers() { try { final SpellCheckerInfo[] retval = mService.getEnabledSpellCheckers(mUserId); diff --git a/core/java/android/webkit/IWebViewUpdateService.aidl b/core/java/android/webkit/IWebViewUpdateService.aidl index e17773159ec5..1da0500727ad 100644 --- a/core/java/android/webkit/IWebViewUpdateService.aidl +++ b/core/java/android/webkit/IWebViewUpdateService.aidl @@ -51,7 +51,7 @@ interface IWebViewUpdateService { * DevelopmentSettings uses this to get the current available WebView * providers (to display as choices to the user). */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage WebViewProviderInfo[] getValidWebViewPackages(); /** @@ -62,7 +62,7 @@ interface IWebViewUpdateService { /** * Used by DevelopmentSetting to get the name of the WebView provider currently in use. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getCurrentWebViewPackageName(); /** diff --git a/core/java/android/webkit/PluginData.java b/core/java/android/webkit/PluginData.java index 5d481b12a27c..c9a196017a75 100644 --- a/core/java/android/webkit/PluginData.java +++ b/core/java/android/webkit/PluginData.java @@ -17,7 +17,6 @@ package android.webkit; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.InputStream; import java.util.Map; @@ -94,7 +93,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public InputStream getInputStream() { return mStream; } @@ -109,7 +108,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getContentLength() { return mContentLength; } @@ -127,7 +126,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Map getHeaders() { return mHeaders; } @@ -142,7 +141,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getStatusCode() { return mStatusCode; } diff --git a/core/java/android/webkit/UrlInterceptRegistry.java b/core/java/android/webkit/UrlInterceptRegistry.java index 4fa6fdeecbee..c9dee00942c3 100644 --- a/core/java/android/webkit/UrlInterceptRegistry.java +++ b/core/java/android/webkit/UrlInterceptRegistry.java @@ -18,7 +18,6 @@ package android.webkit; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.webkit.CacheManager.CacheResult; import java.util.Iterator; @@ -155,7 +154,7 @@ public final class UrlInterceptRegistry { */ @Deprecated @Nullable - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static synchronized PluginData getPluginData( String url, Map headers) { if (urlInterceptDisabled()) { diff --git a/core/java/android/webkit/WebResourceResponse.java b/core/java/android/webkit/WebResourceResponse.java index e4af9095265c..219523b15ab0 100644 --- a/core/java/android/webkit/WebResourceResponse.java +++ b/core/java/android/webkit/WebResourceResponse.java @@ -19,7 +19,6 @@ package android.webkit; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.InputStream; import java.io.StringBufferInputStream; @@ -35,7 +34,7 @@ public class WebResourceResponse { private boolean mImmutable; private String mMimeType; private String mEncoding; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mStatusCode; private String mReasonPhrase; private Map mResponseHeaders; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 487d13e40bf3..8eb1371505bf 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -112,7 +112,7 @@ public class WebView extends AbsoluteLayout // Throwing an exception for incorrect thread usage if the // build target is JB MR2 or newer. Defaults to false, and is // set in the WebView constructor. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static volatile boolean sEnforceThreadChecking = false; /** @@ -407,7 +407,7 @@ public class WebView extends AbsoluteLayout * @hide */ @SuppressWarnings("deprecation") // for super() call into deprecated base class constructor. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected WebView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes, @Nullable Map javaScriptInterfaces, boolean privateBrowsing) { @@ -2587,7 +2587,7 @@ public class WebView extends AbsoluteLayout return WebViewFactory.getProvider(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Looper mWebViewThread = Looper.myLooper(); @UnsupportedAppUsage diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index dde9c3089370..5fc93443f4b8 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -26,7 +26,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; -import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; import android.os.Trace; @@ -391,7 +390,7 @@ public final class WebViewFactory { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static Class getProviderClass() { Context webViewContext = null; Application initialApplication = AppGlobals.getInitialApplication(); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 88c0809613ee..45b21c569cea 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -253,7 +253,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Controls CHOICE_MODE_MULTIPLE_MODAL. null when inactive. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ActionMode mChoiceActionMode; /** @@ -288,7 +288,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Should be used by subclasses to listen to changes in the dataset */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AdapterDataSetObserver mDataSetObserver; /** @@ -452,7 +452,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Handles scrolling between positions within the list. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AbsPositionScroller mPositionScroller; /** @@ -1454,7 +1454,7 @@ public abstract class AbsListView extends AdapterView implements Te * @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean isVerticalScrollBarHidden() { return isFastScrollEnabled(); } @@ -2249,7 +2249,7 @@ public abstract class AbsListView extends AdapterView implements Te } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean canScrollUp() { boolean canScrollUp; // 0th element is not visible @@ -2266,7 +2266,7 @@ public abstract class AbsListView extends AdapterView implements Te return canScrollUp; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean canScrollDown() { boolean canScrollDown; int count = getChildCount(); @@ -3275,7 +3275,7 @@ public abstract class AbsListView extends AdapterView implements Te CheckForLongPress.INVALID_COORD); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean performLongPress(final View child, final int longPressPosition, final long longPressId, float x, float y) { // CHOICE_MODE_MULTIPLE_MODAL takes over long press. @@ -6694,7 +6694,7 @@ public abstract class AbsListView extends AdapterView implements Te * scrap heap. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int scrappedFromPosition; /** diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java index b9ff26b7d9ff..67ed30f2ec73 100644 --- a/core/java/android/widget/AbsSeekBar.java +++ b/core/java/android/widget/AbsSeekBar.java @@ -29,7 +29,6 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Bundle; import android.util.AttributeSet; import android.view.KeyEvent; @@ -858,7 +857,7 @@ public abstract class AbsSeekBar extends ProgressBar { /** * Draw the thumb. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void drawThumb(Canvas canvas) { if (mThumb != null) { final int saveCount = canvas.save(); diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java index 6d566baa23cd..aa3590aaff0a 100644 --- a/core/java/android/widget/ActionMenuPresenter.java +++ b/core/java/android/widget/ActionMenuPresenter.java @@ -27,7 +27,6 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -588,7 +587,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter * Dismiss all popup menus - overflow and submenus. * @return true if popups were dismissed, false otherwise. (This can be because none were open.) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean dismissPopupMenus() { boolean result = hideOverflowMenu(); result |= hideSubMenus(); @@ -611,7 +610,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter /** * @return true if the overflow menu is currently showing */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isOverflowMenuShowing() { return mOverflowPopup != null && mOverflowPopup.isShowing(); } @@ -770,7 +769,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Parcelable onSaveInstanceState() { SavedState state = new SavedState(); state.openSubMenuId = mOpenSubMenuId; @@ -778,7 +777,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void onRestoreInstanceState(Parcelable state) { SavedState saved = (SavedState) state; if (saved.openSubMenuId > 0) { diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java index f83ff305cfdc..3a743562110f 100644 --- a/core/java/android/widget/ActionMenuView.java +++ b/core/java/android/widget/ActionMenuView.java @@ -22,7 +22,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.Gravity; @@ -720,7 +719,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo * @hide Private LinearLayout (superclass) API. Un-hide if LinearLayout API is made public. */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean hasDividerBeforeChildAt(int childIndex) { if (childIndex == 0) { return false; @@ -791,7 +790,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo /** @hide */ public interface ActionMenuChildView { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean needsDividerBefore(); public boolean needsDividerAfter(); } @@ -799,31 +798,31 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo public static class LayoutParams extends LinearLayout.LayoutParams { /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isOverflowButton; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int cellsUsed; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int extraPixels; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean expandable; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean preventEdgeOffset; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean expanded; public LayoutParams(Context c, AttributeSet attrs) { diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java index 299760bfa91f..9da337ad97da 100644 --- a/core/java/android/widget/ActivityChooserModel.java +++ b/core/java/android/widget/ActivityChooserModel.java @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.DataSetObservable; import android.os.AsyncTask; -import android.os.Build; import android.text.TextUtils; import android.util.Log; import android.util.Xml; @@ -380,7 +379,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param intent The intent. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIntent(Intent intent) { synchronized (mInstanceLock) { if (mIntent == intent) { @@ -515,7 +514,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param listener The listener. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setOnChooseActivityListener(OnChooseActivityListener listener) { synchronized (mInstanceLock) { mActivityChoserModelPolicy = listener; diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index ea906c68c69b..00526d9f8a2c 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -113,7 +113,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe private final PassThroughClickListener mPassThroughClickListener; private CharSequence mHintText; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private TextView mHintView; private int mHintResource; @@ -615,7 +615,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide Pending API council approval */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDropDownDismissedOnCompletion(boolean dropDownDismissedOnCompletion) { mDropDownDismissedOnCompletion = dropDownDismissedOnCompletion; } @@ -1225,7 +1225,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide internal used only by SearchDialog */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void showDropDownAfterLayout() { mPopup.postShow(); } diff --git a/core/java/android/widget/DatePickerSpinnerDelegate.java b/core/java/android/widget/DatePickerSpinnerDelegate.java index c6d456d8cb01..fd89b2e09131 100644 --- a/core/java/android/widget/DatePickerSpinnerDelegate.java +++ b/core/java/android/widget/DatePickerSpinnerDelegate.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; import android.icu.util.Calendar; -import android.os.Build; import android.os.Parcelable; import android.text.InputType; import android.text.TextUtils; @@ -502,7 +501,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { || mCurrentDate.get(Calendar.DAY_OF_MONTH) != dayOfMonth); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void setDate(int year, int month, int dayOfMonth) { mCurrentDate.set(year, month, dayOfMonth); resetAutofilledValue(); @@ -513,7 +512,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void updateSpinners() { // set the spinner ranges respecting the min and max dates if (mCurrentDate.equals(mMinDate)) { @@ -566,7 +565,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Updates the calendar view with the current date. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void updateCalendarView() { mCalendarView.setDate(mCurrentDate.getTimeInMillis(), false, false); } @@ -575,7 +574,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Notifies the listener, if such, for a change in the selected date. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void notifyDateChanged() { mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); if (mOnDateChangedListener != null) { @@ -631,7 +630,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void updateInputState() { // Make sure that if the user changes the value and the IME is active // for one of the inputs if this widget, the IME is closed. If the user diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 955552289c3a..20a53c03bed1 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -30,7 +30,6 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.database.ContentObserver; -import android.os.Build; import android.os.Handler; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -82,7 +81,7 @@ public class DateTimeView extends TextView { this(context, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public DateTimeView(Context context, AttributeSet attrs) { super(context, attrs); final TypedArray a = context.obtainStyledAttributes(attrs, diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index c10ffbee686a..32f3acd387b0 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -87,7 +87,7 @@ public class EdgeEffect { private static final float RADIUS_FACTOR = 0.6f; private float mGlowAlpha; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mGlowScaleY; private float mGlowAlphaStart; diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 4099c8aa6710..f2955ac554fc 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -323,7 +323,7 @@ public class Editor { private boolean mShowErrorAfterAttach; boolean mInBatchEditControllers; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean mShowSoftInputOnFocus = true; private boolean mPreserveSelection; private boolean mRestartActionModeOnNextRefresh; @@ -355,7 +355,7 @@ public class Editor { Callback mCustomInsertionActionModeCallback; // Set when this TextView gained focus with some text selected. Will start selection mode. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean mCreatedWithASelection; // The button state as of the last time #onTouchEvent is called. diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index 7dbe7b234422..0c0b3491a854 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -140,7 +140,7 @@ class FastScroller { @UnsupportedAppUsage private Drawable mThumbDrawable; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Drawable mTrackDrawable; private int mTextAppearance; private int mThumbPosition; diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index 50773b1c43b9..a6dce7f05f4a 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -39,7 +39,6 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Insets; import android.graphics.Paint; -import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.util.LogPrinter; @@ -2816,7 +2815,7 @@ public class GridLayout extends ViewGroup { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static final Alignment UNDEFINED_ALIGNMENT = new Alignment() { @Override int getGravityOffset(View view, int cellDelta) { diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 196d68bcd08a..4a5e95e492e5 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -979,7 +979,7 @@ public class GridView extends AbsListView { return sel; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean determineColumns(int availableSpace) { final int requestedHorizontalSpacing = mRequestedHorizontalSpacing; final int stretchMode = mStretchMode; diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 97dbb1542717..3bb39c135034 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -150,9 +150,9 @@ public class HorizontalScrollView extends FrameLayout { private int mMinimumVelocity; private int mMaximumVelocity; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mOverscrollDistance; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mOverflingDistance; private float mHorizontalScrollFactor; diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index e4de4001c3e2..c20773848759 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -127,7 +127,7 @@ public class ImageView extends View { @UnsupportedAppUsage private Drawable mDrawable = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private BitmapDrawable mRecycleableBitmapDrawable = null; private ColorStateList mDrawableTintList = null; private BlendMode mDrawableBlendMode = null; diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index fa84407c5c4d..a796ba545d8f 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -212,9 +212,9 @@ public class LinearLayout extends ViewGroup { private static final int VERTICAL_GRAVITY_COUNT = 4; private static final int INDEX_CENTER_VERTICAL = 0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int INDEX_TOP = 1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int INDEX_BOTTOM = 2; private static final int INDEX_FILL = 3; diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index 6232480f8620..4311ffbe0e95 100755 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -332,7 +332,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDropDownAlwaysVisible(boolean dropDownAlwaysVisible) { mDropDownAlwaysVisible = dropDownAlwaysVisible; } @@ -342,7 +342,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isDropDownAlwaysVisible() { return mDropDownAlwaysVisible; } @@ -933,7 +933,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @param max Max number of items that can be visible and still allow the list to expand. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void setListItemExpandMax(int max) { mListItemExpandMaximum = max; } @@ -1130,7 +1130,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @return the content's height or -1 if content already exists */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int buildDropDown() { ViewGroup dropDownView; int otherHeights = 0; diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index cf0e0d1f1842..3c3daa3c7001 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1979,7 +1979,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean trackMotionScroll(int deltaY, int incrementalDeltaY) { final boolean result = super.trackMotionScroll(deltaY, incrementalDeltaY); removeUnusedFixedViews(mHeaderViewInfos); @@ -4028,7 +4028,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int getHeightForPosition(int position) { final int height = super.getHeightForPosition(position); if (shouldAdjustHeightForDivider(position)) { diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 7c20472df357..8dfb936ef7ee 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -250,7 +250,7 @@ public class NumberPicker extends LinearLayout { /** * The min height of this widget. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mMinHeight; /** @@ -261,7 +261,7 @@ public class NumberPicker extends LinearLayout { /** * The max width of this widget. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mMinWidth; /** @@ -277,7 +277,7 @@ public class NumberPicker extends LinearLayout { /** * The height of the text. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mTextSize; /** @@ -298,7 +298,7 @@ public class NumberPicker extends LinearLayout { /** * Upper value of the range of numbers allowed for the NumberPicker */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mMaxValue; /** @@ -309,7 +309,7 @@ public class NumberPicker extends LinearLayout { /** * Listener to be notified upon current value change. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private OnValueChangeListener mOnValueChangeListener; /** @@ -367,7 +367,7 @@ public class NumberPicker extends LinearLayout { /** * The {@link Scroller} responsible for flinging the selector. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Scroller mFlingScroller; /** @@ -429,7 +429,7 @@ public class NumberPicker extends LinearLayout { /** * @see ViewConfiguration#getScaledMaximumFlingVelocity() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mMaximumFlingVelocity; /** diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 27fcde25ad37..1c33d80fd4ca 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -19,7 +19,6 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.hardware.SensorManager; -import android.os.Build; import android.util.Log; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; @@ -37,7 +36,7 @@ public class OverScroller { @UnsupportedAppUsage private final SplineOverScroller mScrollerY; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Interpolator mInterpolator; private final boolean mFlywheel; diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java index 2aa587539930..0ce964666a2b 100644 --- a/core/java/android/widget/PopupMenu.java +++ b/core/java/android/widget/PopupMenu.java @@ -20,7 +20,6 @@ import android.annotation.MenuRes; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; @@ -41,7 +40,7 @@ import com.android.internal.view.menu.ShowableListMenu; * it. */ public class PopupMenu { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Context mContext; private final MenuBuilder mMenu; private final View mAnchor; diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index e7e148abb95a..cc3d74477342 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -183,7 +183,7 @@ public class PopupWindow { private boolean mClipToScreen; private boolean mAllowScrollingAnchorParent = true; private boolean mLayoutInsetDecor = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mNotTouchModal; private boolean mAttachedInDecor = true; private boolean mAttachedInDecorSet = false; diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 67216f5955f7..796654a4dc99 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -240,7 +240,7 @@ public class ProgressBar extends View { /** Value used to track progress animation, in the range [0...1]. */ private float mVisualProgress; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean mMirrorForRtl = false; private boolean mAggregatedIsVisible; @@ -1673,7 +1673,7 @@ public class ProgressBar extends View { // Stub method. } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private synchronized void refreshProgress(int id, int progress, boolean fromUser, boolean animate) { if (mUiThreadId == Thread.currentThread().getId()) { diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 4ba1ca8989b7..dcfb3872bda0 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -261,7 +261,7 @@ public class RemoteViews implements Parcelable, Filter { * RemoteViews. */ private RemoteViews mLandscape = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private RemoteViews mPortrait = null; @ApplyFlags @@ -439,7 +439,7 @@ public class RemoteViews implements Parcelable, Filter { // Do nothing } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mergeBehavior() { return MERGE_REPLACE; } @@ -508,7 +508,7 @@ public class RemoteViews implements Parcelable, Filter { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void mergeRemoteViews(RemoteViews newRv) { if (newRv == null) return; // We first copy the new RemoteViews, as the process of merging modifies the way the actions @@ -700,7 +700,7 @@ public class RemoteViews implements Parcelable, Filter { return SET_PENDING_INTENT_TEMPLATE_TAG; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage PendingIntent pendingIntentTemplate; } @@ -1148,7 +1148,7 @@ public class RemoteViews implements Parcelable, Filter { private static class BitmapCache { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ArrayList mBitmaps; int mBitmapMemory = -1; @@ -1564,7 +1564,7 @@ public class RemoteViews implements Parcelable, Filter { * ViewGroup methods that are related to adding Views. */ private class ViewGroupActionAdd extends Action { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private RemoteViews mNestedViews; private int mIndex; @@ -2479,7 +2479,7 @@ public class RemoteViews implements Parcelable, Filter { * Returns an estimate of the bitmap heap memory usage for this RemoteViews. */ /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int estimateMemoryUsage() { return mBitmapCache.getBitmapMemory(); } @@ -3004,7 +3004,7 @@ public class RemoteViews implements Parcelable, Filter { * @hide * @deprecated this appears to have no users outside of UnsupportedAppUsage? */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public void setRemoteAdapter(int viewId, ArrayList list, int viewTypeCount) { addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount)); diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index c98ed6a2f5d0..b8849367b7b6 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -32,7 +32,6 @@ import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.res.Configuration; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -108,7 +107,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback private final Executor mAsyncViewLoadExecutor; private OnClickHandler mRemoteViewsOnClickHandler; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final FixedSizeRemoteViewsCache mCache; private int mVisibleWindowLowerBound; private int mVisibleWindowUpperBound; @@ -117,7 +116,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // loaded. private RemoteViewsFrameLayoutRefSet mRequestedViews; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final HandlerThread mWorkerThread; // items may be interrupted within the normally processed queues private final Handler mMainHandler; @@ -897,17 +896,17 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isDataReady() { return mDataReady; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRemoteViewsOnClickHandler(OnClickHandler handler) { mRemoteViewsOnClickHandler = handler; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void saveRemoteViewsCache() { final RemoteViewsCacheKey key = new RemoteViewsCacheKey( new Intent.FilterComparison(mIntent), mAppWidgetId); @@ -1052,7 +1051,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Intent getRemoteViewsServiceIntent() { return mIntent; } @@ -1099,7 +1098,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * views are currently being displayed. This allows for certain optimizations and preloading * which wouldn't otherwise be possible. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVisibleRangeHint(int lowerBound, int upperBound) { mVisibleWindowLowerBound = lowerBound; mVisibleWindowUpperBound = upperBound; diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index f3de9828c4aa..b44b8c222fac 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -188,7 +188,7 @@ public class ScrollView extends FrameLayout { * These are no-ops on user builds. */ private StrictMode.Span mScrollStrictSpan = null; // aka "drag" - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private StrictMode.Span mFlingStrictSpan = null; /** diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 2108f8ea350e..b8a324931f86 100755 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -1938,7 +1938,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mThreshold = getThreshold(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SearchAutoComplete(Context context, AttributeSet attrs) { super(context, attrs); mThreshold = getThreshold(); diff --git a/core/java/android/widget/SeekBar.java b/core/java/android/widget/SeekBar.java index 201cab1c81e3..5676881cee76 100644 --- a/core/java/android/widget/SeekBar.java +++ b/core/java/android/widget/SeekBar.java @@ -18,7 +18,6 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -91,7 +90,7 @@ public class SeekBar extends AbsSeekBar { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void onProgressRefresh(float scale, boolean fromUser, int progress) { super.onProgressRefresh(scale, fromUser, progress); diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index ba6fa197f164..46fc09f4c3b3 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -1082,7 +1082,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { /** * @return true if the popup is showing, false otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isShowing(); /** @@ -1113,7 +1113,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isShowing() { return mPopup != null ? mPopup.isShowing() : false; } diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 3295fd2ea1c3..5bca56f14add 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -35,7 +35,6 @@ import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Build.VERSION_CODES; import android.text.Layout; import android.text.StaticLayout; @@ -111,7 +110,7 @@ public class Switch extends CompoundButton { private boolean mHasTrackTintMode = false; private int mThumbTextPadding; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mSwitchMinWidth; private int mSwitchPadding; private boolean mSplitTrack; diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index b1485ef27de5..95c0e8658c57 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -32,7 +32,6 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.icu.text.DateTimePatternGenerator; import android.net.Uri; -import android.os.Build; import android.os.Handler; import android.os.SystemClock; import android.os.UserHandle; @@ -495,7 +494,7 @@ public class TextClock extends TextView { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CharSequence getFormat() { return mFormat; } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index d8b4c748b283..3fc0f4efd608 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4364,7 +4364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener shouldRequestLayout); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void setRawTextSize(float size, boolean shouldRequestLayout) { if (size != mTextPaint.getTextSize()) { mTextPaint.setTextSize(size); @@ -7876,7 +7876,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return drawableState; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Path getUpdatedHighlightPath() { Path highlight = null; Paint highlightPaint = mHighlightPaint; @@ -12359,7 +12359,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * be {@code null} if no text is set */ @Nullable - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private CharSequence getTextForAccessibility() { // If the text is empty, we must be showing the hint text. if (TextUtils.isEmpty(mText)) { @@ -12501,7 +12501,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage CharSequence getTransformedText(int start, int end) { return removeSuggestionSpans(mTransformed.subSequence(start, end)); } @@ -12989,7 +12989,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return x; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int getLineAtCoordinate(float y) { y -= getTotalPaddingTop(); // Clamp the position to inside of the view. @@ -13178,7 +13178,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * Deletes the range of text [start, end[. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected void deleteText_internal(int start, int end) { ((Editable) mText).delete(start, end); } @@ -13230,7 +13230,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @hide */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CharSequence getIterableTextForAccessibility() { return mText; } diff --git a/core/java/android/widget/ViewAnimator.java b/core/java/android/widget/ViewAnimator.java index 3f8325a8f547..90f61ca50d52 100644 --- a/core/java/android/widget/ViewAnimator.java +++ b/core/java/android/widget/ViewAnimator.java @@ -21,7 +21,6 @@ import android.annotation.AnimRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; -import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -157,7 +156,7 @@ public class ViewAnimator extends FrameLayout { * @param animate Whether or not to use the in and out animations, defaults * to true. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void showOnly(int childIndex, boolean animate) { final int count = getChildCount(); for (int i = 0; i < count; i++) { diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 5abb6e1637e7..2df9a785450b 100644 --- a/core/java/android/widget/ViewFlipper.java +++ b/core/java/android/widget/ViewFlipper.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.TypedArray; -import android.os.Build; import android.os.Message; import android.util.AttributeSet; import android.util.Log; @@ -184,7 +183,7 @@ public class ViewFlipper extends ViewAnimator { * addition to queuing future flips. If omitted, defaults to * true. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void updateRunning(boolean flipNow) { boolean running = mVisible && mStarted && mUserPresent; if (running != mRunning) { diff --git a/core/java/com/android/ims/internal/uce/common/CapInfo.java b/core/java/com/android/ims/internal/uce/common/CapInfo.java index bca647a911d6..a7a90f6912c2 100644 --- a/core/java/com/android/ims/internal/uce/common/CapInfo.java +++ b/core/java/com/android/ims/internal/uce/common/CapInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -92,7 +91,7 @@ public class CapInfo implements Parcelable { /** * Constructor for the CapInfo class. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CapInfo() { }; @@ -100,7 +99,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IM is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isImSupported() { return mImSupported; } @@ -108,7 +107,7 @@ public class CapInfo implements Parcelable { /** * Sets IM as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setImSupported(boolean imSupported) { this.mImSupported = imSupported; } @@ -116,7 +115,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Thumbnail is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFtThumbSupported() { return mFtThumbSupported; } @@ -124,7 +123,7 @@ public class CapInfo implements Parcelable { /** * Sets FT thumbnail as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFtThumbSupported(boolean ftThumbSupported) { this.mFtThumbSupported = ftThumbSupported; } @@ -134,7 +133,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Store and Forward is supported */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFtSnFSupported() { return mFtSnFSupported; } @@ -142,7 +141,7 @@ public class CapInfo implements Parcelable { /** * Sets FT Store and Forward as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFtSnFSupported(boolean ftSnFSupported) { this.mFtSnFSupported = ftSnFSupported; } @@ -150,7 +149,7 @@ public class CapInfo implements Parcelable { /** * Checks whether File transfer HTTP is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFtHttpSupported() { return mFtHttpSupported; } @@ -158,7 +157,7 @@ public class CapInfo implements Parcelable { /** * Sets File transfer HTTP as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFtHttpSupported(boolean ftHttpSupported) { this.mFtHttpSupported = ftHttpSupported; } @@ -166,7 +165,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFtSupported() { return mFtSupported; } @@ -174,7 +173,7 @@ public class CapInfo implements Parcelable { /** * Sets FT as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFtSupported(boolean ftSupported) { this.mFtSupported = ftSupported; } @@ -182,7 +181,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IS is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isIsSupported() { return mIsSupported; } @@ -190,7 +189,7 @@ public class CapInfo implements Parcelable { /** * Sets IS as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIsSupported(boolean isSupported) { this.mIsSupported = isSupported; } @@ -198,7 +197,7 @@ public class CapInfo implements Parcelable { /** * Checks whether video sharing is supported during a CS call. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isVsDuringCSSupported() { return mVsDuringCSSupported; } @@ -207,7 +206,7 @@ public class CapInfo implements Parcelable { * Sets video sharing as supported or not supported during a CS * call. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVsDuringCSSupported(boolean vsDuringCSSupported) { this.mVsDuringCSSupported = vsDuringCSSupported; } @@ -216,7 +215,7 @@ public class CapInfo implements Parcelable { * Checks whether video sharing outside a voice call is * supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isVsSupported() { return mVsSupported; } @@ -224,7 +223,7 @@ public class CapInfo implements Parcelable { /** * Sets video sharing as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVsSupported(boolean vsSupported) { this.mVsSupported = vsSupported; } @@ -232,7 +231,7 @@ public class CapInfo implements Parcelable { /** * Checks whether social presence is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isSpSupported() { return mSpSupported; } @@ -240,7 +239,7 @@ public class CapInfo implements Parcelable { /** * Sets social presence as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSpSupported(boolean spSupported) { this.mSpSupported = spSupported; } @@ -249,7 +248,7 @@ public class CapInfo implements Parcelable { * Checks whether capability discovery via presence is * supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isCdViaPresenceSupported() { return mCdViaPresenceSupported; } @@ -258,7 +257,7 @@ public class CapInfo implements Parcelable { * Sets capability discovery via presence as supported or not * supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) { this.mCdViaPresenceSupported = cdViaPresenceSupported; } @@ -266,7 +265,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP voice call is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isIpVoiceSupported() { return mIpVoiceSupported; } @@ -274,7 +273,7 @@ public class CapInfo implements Parcelable { /** * Sets IP voice call as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIpVoiceSupported(boolean ipVoiceSupported) { this.mIpVoiceSupported = ipVoiceSupported; } @@ -282,7 +281,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP video call is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isIpVideoSupported() { return mIpVideoSupported; } @@ -290,7 +289,7 @@ public class CapInfo implements Parcelable { /** * Sets IP video call as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIpVideoSupported(boolean ipVideoSupported) { this.mIpVideoSupported = ipVideoSupported; } @@ -299,7 +298,7 @@ public class CapInfo implements Parcelable { * Checks whether Geo location Pull using File Transfer is * supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isGeoPullFtSupported() { return mGeoPullFtSupported; } @@ -308,7 +307,7 @@ public class CapInfo implements Parcelable { * Sets Geo location Pull using File Transfer as supported or * not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setGeoPullFtSupported(boolean geoPullFtSupported) { this.mGeoPullFtSupported = geoPullFtSupported; } @@ -316,7 +315,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Pull is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isGeoPullSupported() { return mGeoPullSupported; } @@ -324,7 +323,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Pull as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setGeoPullSupported(boolean geoPullSupported) { this.mGeoPullSupported = geoPullSupported; } @@ -332,7 +331,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Push is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isGeoPushSupported() { return mGeoPushSupported; } @@ -340,7 +339,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Push as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setGeoPushSupported(boolean geoPushSupported) { this.mGeoPushSupported = geoPushSupported; } @@ -348,7 +347,7 @@ public class CapInfo implements Parcelable { /** * Checks whether short messaging is supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isSmSupported() { return mSmSupported; } @@ -356,7 +355,7 @@ public class CapInfo implements Parcelable { /** * Sets short messaging as supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSmSupported(boolean smSupported) { this.mSmSupported = smSupported; } @@ -364,22 +363,22 @@ public class CapInfo implements Parcelable { /** * Checks whether store/forward and group chat are supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isFullSnFGroupChatSupported() { return mFullSnFGroupChatSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isRcsIpVoiceCallSupported() { return mRcsIpVoiceCallSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isRcsIpVideoCallSupported() { return mRcsIpVideoCallSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isRcsIpVideoOnlyCallSupported() { return mRcsIpVideoOnlyCallSupported; } @@ -387,20 +386,20 @@ public class CapInfo implements Parcelable { /** * Sets store/forward and group chat supported or not supported. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) { this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) { this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) { this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) { this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported; } @@ -537,20 +536,20 @@ public class CapInfo implements Parcelable { } /** Sets the list of supported extensions. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setExts(String[] exts) { this.mExts = exts; } /** Gets the time stamp for when to query again. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getCapTimestamp() { return mCapTimestamp; } /** Sets the time stamp for when to query again. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCapTimestamp(long capTimestamp) { this.mCapTimestamp = capTimestamp; } diff --git a/core/java/com/android/ims/internal/uce/common/StatusCode.java b/core/java/com/android/ims/internal/uce/common/StatusCode.java index 847792f4b50c..7f69493aa284 100644 --- a/core/java/com/android/ims/internal/uce/common/StatusCode.java +++ b/core/java/com/android/ims/internal/uce/common/StatusCode.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -76,14 +75,14 @@ public class StatusCode implements Parcelable { * Constructor for the StatusCode class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public StatusCode() {} /** * Gets the status code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getStatusCode() { return mStatusCode; } @@ -92,7 +91,7 @@ public class StatusCode implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setStatusCode(int nStatusCode) { this.mStatusCode = nStatusCode; } diff --git a/core/java/com/android/ims/internal/uce/common/UceLong.java b/core/java/com/android/ims/internal/uce/common/UceLong.java index d878c10c76b4..bf514471b506 100644 --- a/core/java/com/android/ims/internal/uce/common/UceLong.java +++ b/core/java/com/android/ims/internal/uce/common/UceLong.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +32,7 @@ public class UceLong implements Parcelable { * Constructor for the UceLong class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public UceLong() { }; @@ -41,7 +40,7 @@ public class UceLong implements Parcelable { * Gets the long value. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getUceLong() { return mUceLong; } @@ -50,7 +49,7 @@ public class UceLong implements Parcelable { * Sets the long value. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUceLong(long uceLong) { this.mUceLong = uceLong; } @@ -58,7 +57,7 @@ public class UceLong implements Parcelable { /** Get the client ID as integer value. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getClientId() { return mClientId; } @@ -67,7 +66,7 @@ public class UceLong implements Parcelable { * Set the client ID as integer value. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setClientId(int nClientId) { this.mClientId = nClientId; } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl index 62897c7fb1ae..c69d5a94f760 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl @@ -29,7 +29,7 @@ interface IOptionsListener * @param version, version information of the service. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void getVersionCb(in String version ); /** @@ -38,7 +38,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service availability. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void serviceAvailable(in StatusCode statusCode); /** @@ -47,7 +47,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service unavailability. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void serviceUnavailable(in StatusCode statusCode); /** @@ -58,7 +58,7 @@ interface IOptionsListener * @param capInfo, capabilities of the remote entity received. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void sipResponseReceived( String uri, in OptionsSipResponse sipResponse, in OptionsCapInfo capInfo); @@ -67,7 +67,7 @@ interface IOptionsListener * @param cmdStatus, command status of the request placed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void cmdStatus(in OptionsCmdStatus cmdStatus); /** @@ -78,7 +78,7 @@ interface IOptionsListener * @param tID, transation of the request received from network. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void incomingOptions( String uri, in OptionsCapInfo capInfo, in int tID); } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl index a7487b804567..2e49082988c3 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl @@ -33,7 +33,7 @@ interface IOptionsService * @return StatusCode, status of the request placed. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getVersion(int optionsServiceHandle); /** @@ -45,7 +45,7 @@ interface IOptionsService * The service will fill UceLong.mUceLong with optionsServiceListenerHdl * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode addListener(int optionsServiceHandle, IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); @@ -56,7 +56,7 @@ interface IOptionsService * @param optionsServiceListenerHdl provided in createOptionsService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode removeListener(int optionsServiceHandle, in UceLong optionsServiceListenerHdl); /** @@ -69,7 +69,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode setMyInfo(int optionsServiceHandle , in CapInfo capInfo, int reqUserData); @@ -82,7 +82,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getMyInfo(int optionsServiceHandle , int reqUserdata); /** @@ -95,7 +95,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getContactCap(int optionsServiceHandle , String remoteURI, int reqUserData); @@ -109,7 +109,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getContactListCap(int optionsServiceHandle, in String[] remoteURIList, int reqUserData); @@ -126,7 +126,7 @@ interface IOptionsService * @param bContactInBL, true if the contact is blacklisted, else false. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode responseIncomingOptions(int optionsServiceHandle, int tId, int sipResponseCode, String reasonPhrase, in OptionsCapInfo capInfo, in boolean bContactInBL); diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java index 6f83bf3224a8..1da5a2439f02 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java @@ -16,7 +16,6 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -32,12 +31,12 @@ public class OptionsCapInfo implements Parcelable { return new OptionsCapInfo(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getSdp() { return mSdp; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSdp(String sdp) { this.mSdp = sdp; } @@ -45,19 +44,19 @@ public class OptionsCapInfo implements Parcelable { /** * Constructor for the OptionsCapInfo class. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public OptionsCapInfo() { mCapInfo = new CapInfo(); }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CapInfo getCapInfo() { return mCapInfo; } /** * Sets the CapInfo */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java index 82eb1b54a775..401ca2fa24ea 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java @@ -18,7 +18,6 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -57,7 +56,7 @@ public class OptionsCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -66,7 +65,7 @@ public class OptionsCmdId implements Parcelable { * Constructor for the OptionsCDCmdId class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public OptionsCmdId(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java index 461f8bfb48c8..70a7a84d3820 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -43,7 +42,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -59,7 +58,7 @@ public class OptionsCmdStatus implements Parcelable { /** Sets the user data. @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUserData(int userData) { this.mUserData = userData; } @@ -76,7 +75,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setStatus(StatusCode status) { this.mStatus = status; } @@ -85,7 +84,7 @@ public class OptionsCmdStatus implements Parcelable { * Constructor for the OptionsCmdStatus class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public OptionsCmdStatus() { mStatus = new StatusCode(); mCapInfo = new CapInfo(); @@ -102,7 +101,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the CapInfo * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java index acea0f03742f..5afddf0c42c0 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -43,7 +42,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the Options command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -60,7 +59,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the request ID * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -77,7 +76,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -94,7 +93,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -111,7 +110,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -120,7 +119,7 @@ public class OptionsSipResponse implements Parcelable { * Constructor for the OptionsSipResponse class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public OptionsSipResponse() { mCmdId = new OptionsCmdId(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl index 572a5f32ee93..65e7fc9756bb 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl @@ -36,7 +36,7 @@ interface IPresenceListener * Gets the version of the presence listener implementation. * @param version, version information. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void getVersionCb(in String version ); /** @@ -44,7 +44,7 @@ interface IPresenceListener * availability. * @param statusCode, UCE_SUCCESS as service availability. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void serviceAvailable(in StatusCode statusCode); /** @@ -52,7 +52,7 @@ interface IPresenceListener * unavailability. * @param statusCode, UCE_SUCCESS as service unAvailability. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void serviceUnAvailable(in StatusCode statusCode); /** @@ -60,14 +60,14 @@ interface IPresenceListener * publish request. * @param publishTrigger, Publish trigger for the network being supported. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void publishTriggering(in PresPublishTriggerType publishTrigger); /** * Callback function to be invoked to inform the client of the status of an asynchronous call. * @param cmdStatus, command status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void cmdStatus( in PresCmdStatus cmdStatus); /** @@ -75,7 +75,7 @@ interface IPresenceListener * such as PUBLISH or SUBSCRIBE, has been received. * @param sipResponse, network response received for the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void sipResponseReceived(in PresSipResponse sipResponse); /** @@ -84,7 +84,7 @@ interface IPresenceListener * @param presentityURI, URI of the remote entity the request was placed. * @param tupleInfo, array of capability information remote entity supports. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void capInfoReceived(in String presentityURI, in PresTupleInfo [] tupleInfo); @@ -94,7 +94,7 @@ interface IPresenceListener * @param rlmiInfo, resource infomation received from network. * @param resInfo, array of capabilities received from network for the list of remore URI. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void listCapInfoReceived(in PresRlmiInfo rlmiInfo, in PresResInfo [] resInfo); @@ -102,7 +102,7 @@ interface IPresenceListener * Callback function to be invoked to inform the client when Unpublish message * is sent to network. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void unpublishMessageSent(); } \ No newline at end of file diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl index de28dfa9f2d7..26a3e83efcfa 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl @@ -33,7 +33,7 @@ interface IPresenceService * @param presenceServiceHdl returned in createPresenceService(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getVersion(int presenceServiceHdl); /** @@ -46,7 +46,7 @@ interface IPresenceService * * @return StatusCode, status of the request placed */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode addListener(int presenceServiceHdl, IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); @@ -56,7 +56,7 @@ interface IPresenceService * @param presenceServiceListenerHdl provided in createPresenceService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode removeListener(int presenceServiceHdl, in UceLong presenceServiceListenerHdl); /** @@ -72,7 +72,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode reenableService(int presenceServiceHdl, int userData); /** @@ -85,7 +85,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode publishMyCap(int presenceServiceHdl, in PresCapInfo myCapInfo , int userData); /** @@ -99,7 +99,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getContactCap(int presenceServiceHdl , String remoteUri, int userData); /** @@ -113,7 +113,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode getContactListCap(int presenceServiceHdl, in String[] remoteUriList, int userData); /** @@ -129,7 +129,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage StatusCode setNewFeatureTag(int presenceServiceHdl, String featureTag, in PresServiceInfo serviceInfo, int userData); diff --git a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java index ec8b6bfa4ef3..1a3a028713f6 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -28,14 +27,14 @@ import com.android.ims.internal.uce.common.CapInfo; public class PresCapInfo implements Parcelable { private CapInfo mCapInfo; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mContactUri = ""; /** * Gets the UCE capability information. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CapInfo getCapInfo() { return mCapInfo; } @@ -52,7 +51,7 @@ public class PresCapInfo implements Parcelable { * Gets the contact URI. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getContactUri() { return mContactUri; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java index 9692b428c792..fba0c77e8dbf 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -59,7 +58,7 @@ public class PresCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -69,7 +68,7 @@ public class PresCmdId implements Parcelable { * Constructor for the PresCmdId class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresCmdId(){}; diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java index 7e22106f3be3..fbc64b83a360 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +43,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -61,7 +60,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the user data. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUserData(int userData) { this.mUserData = userData; } @@ -77,7 +76,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the status code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setStatus(StatusCode status) { this.mStatus = status; } @@ -94,7 +93,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the request ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -103,7 +102,7 @@ public class PresCmdStatus implements Parcelable{ * Constructor for the PresCmdStatus class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresCmdStatus() { mStatus = new StatusCode(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java index 04bbf6cd8e30..fdff86f9669f 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java +++ b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -71,7 +70,7 @@ public class PresPublishTriggerType implements Parcelable { * Sets the publish trigger type. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPublishTrigeerType(int nPublishTriggerType) { this.mPublishTriggerType = nPublishTriggerType; } @@ -81,7 +80,7 @@ public class PresPublishTriggerType implements Parcelable { * Constructor for the PresPublishTriggerType class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresPublishTriggerType(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java index 2f797b41b14f..af9b0568d29b 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +39,7 @@ public class PresResInfo implements Parcelable { * Sets the Presence service resource instance information. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setInstanceInfo(PresResInstanceInfo instanceInfo) { this.mInstanceInfo = instanceInfo; } @@ -57,7 +56,7 @@ public class PresResInfo implements Parcelable { * Sets the resource URI. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setResUri(String resUri) { this.mResUri = resUri; } @@ -74,7 +73,7 @@ public class PresResInfo implements Parcelable { * Sets the display name. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDisplayName(String displayName) { this.mDisplayName = displayName; } @@ -84,7 +83,7 @@ public class PresResInfo implements Parcelable { * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresResInfo() { mInstanceInfo = new PresResInstanceInfo(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java index 733c0afff367..9f3725133452 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -62,7 +61,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource instance state. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setResInstanceState(int nResInstanceState) { this.mResInstanceState = nResInstanceState; } @@ -79,7 +78,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setResId(String resourceId) { this.mId = resourceId; } @@ -98,7 +97,7 @@ public class PresResInstanceInfo implements Parcelable{ * code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setReason(String reason) { this.mReason = reason; } @@ -115,7 +114,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the entity URI. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPresentityUri(String presentityUri) { this.mPresentityUri = presentityUri; } @@ -132,7 +131,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the tuple information. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setTupleInfo(PresTupleInfo[] tupleInfo) { this.mTupleInfoArray = new PresTupleInfo[tupleInfo.length]; this.mTupleInfoArray = tupleInfo; @@ -143,7 +142,7 @@ public class PresResInstanceInfo implements Parcelable{ * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresResInstanceInfo(){ }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java index e33aa1303886..65b9fdbbeb18 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -62,7 +61,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the URI. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setUri(String uri) { this.mUri = uri; } @@ -79,7 +78,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the version. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVersion(int version) { this.mVersion = version; } @@ -96,7 +95,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI state. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFullState(boolean fullState) { this.mFullState = fullState; } @@ -113,7 +112,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI list name. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setListName(String listName) { this.mListName = listName; } @@ -130,7 +129,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the subscription request ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -147,7 +146,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription state. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPresSubscriptionState(PresSubscriptionState presSubscriptionState) { this.mPresSubscriptionState = presSubscriptionState; } @@ -164,7 +163,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription expiration time. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSubscriptionExpireTime(int subscriptionExpireTime) { this.mSubscriptionExpireTime = subscriptionExpireTime; } @@ -181,7 +180,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription terminated reason. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSubscriptionTerminatedReason(String subscriptionTerminatedReason) { this.mSubscriptionTerminatedReason = subscriptionTerminatedReason; } @@ -190,7 +189,7 @@ public class PresRlmiInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresRlmiInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java index aed673e63d94..5eafa0fde8cc 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -47,7 +46,7 @@ public class PresServiceInfo implements Parcelable { * Gets the media type. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getMediaType() { return mMediaCap; } @@ -64,7 +63,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getServiceId() { return mServiceID; } @@ -80,7 +79,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service description. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getServiceDesc() { return mServiceDesc; } @@ -97,7 +96,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service version. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getServiceVer() { return mServiceVer; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java index 9549152ce175..45b02f31eddc 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -34,7 +33,7 @@ public class PresSipResponse implements Parcelable { * Gets the Presence command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresCmdId getCmdId() { return mCmdId; } @@ -43,7 +42,7 @@ public class PresSipResponse implements Parcelable { * Sets the Presence command ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -52,7 +51,7 @@ public class PresSipResponse implements Parcelable { * Gets the request ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRequestId() { return mRequestId; } @@ -61,7 +60,7 @@ public class PresSipResponse implements Parcelable { * Sets the request ID. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -70,7 +69,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP response code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getSipResponseCode() { return mSipResponseCode; } @@ -79,7 +78,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -90,7 +89,7 @@ public class PresSipResponse implements Parcelable { * code. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getReasonPhrase() { return mReasonPhrase; } @@ -99,7 +98,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -108,7 +107,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP retryAfter sec value. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRetryAfter() { return mRetryAfter; } @@ -117,7 +116,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -126,7 +125,7 @@ public class PresSipResponse implements Parcelable { * Constructor for the PresSipResponse class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresSipResponse(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java index 85ec3967f8f3..ab1e17c48e75 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -79,7 +78,7 @@ public class PresSubscriptionState implements Parcelable { * Constructor for the PresSubscriptionState class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresSubscriptionState() { }; /** @@ -95,7 +94,7 @@ public class PresSubscriptionState implements Parcelable { * Sets the Presence subscription state. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPresSubscriptionState(int nPresSubscriptionState) { this.mPresSubscriptionState = nPresSubscriptionState; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java index 34a7b1e3de65..3608eb6a5e8a 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java @@ -17,7 +17,6 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -41,7 +40,7 @@ public class PresTupleInfo implements Parcelable { * Sets the feature tag. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setFeatureTag(String featureTag) { this.mFeatureTag = featureTag; } @@ -57,7 +56,7 @@ public class PresTupleInfo implements Parcelable { * Sets the contact URI. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setContactUri(String contactUri) { this.mContactUri = contactUri; } @@ -74,7 +73,7 @@ public class PresTupleInfo implements Parcelable { * Sets the timestamp. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setTimestamp(String timestamp) { this.mTimestamp = timestamp; } @@ -83,7 +82,7 @@ public class PresTupleInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PresTupleInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl index 2341faed3e15..41abf7d1a1f0 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl @@ -25,6 +25,6 @@ interface IUceListener * @param serviceStatusValue defined in ImsUceManager * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setStatus(int serviceStatusValue); } diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl index 156e9229e256..ec45371689cf 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl @@ -38,7 +38,7 @@ interface IUceService * Service status is returned in setStatus callback in IUceListener. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean startService(IUceListener uceListener); /** @@ -46,7 +46,7 @@ interface IUceService * @return boolean true if the service stop request is processed successfully, FALSE otherwise. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean stopService(); @@ -56,7 +56,7 @@ interface IUceService * @return boolean true if service started else false. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isServiceStarted(); /** @@ -74,7 +74,7 @@ interface IUceService * * @deprecated This is replaced with new API createOptionsServiceForSubscription() */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int createOptionsService(IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); /** @@ -101,7 +101,7 @@ interface IUceService * in IOptionsListener * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void destroyOptionsService(int optionsServiceHandle); /** @@ -119,7 +119,7 @@ interface IUceService * * @deprecated This is replaced with new API createPresenceServiceForSubscription() */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int createPresenceService(IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); /** @@ -147,7 +147,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void destroyPresenceService(int presenceServiceHdl); @@ -159,7 +159,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean getServiceStatus(); /** @@ -171,7 +171,7 @@ interface IUceService * * @deprecated use API getPresenceServiceForSubscription() */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage IPresenceService getPresenceService(); /** @@ -194,7 +194,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage IOptionsService getOptionsService(); /** diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index f690bd3477f0..be43e82c3f88 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -26,7 +26,6 @@ import android.content.DialogInterface; import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Handler; import android.os.Message; import android.text.Layout; @@ -980,7 +979,7 @@ public class AlertController { boolean mRecycleOnMeasure = true; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RecycleListView(Context context) { this(context, null); } diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl index 3a9f3b9c1128..04146bcad083 100644 --- a/core/java/com/android/internal/app/IAppOpsService.aidl +++ b/core/java/com/android/internal/app/IAppOpsService.aidl @@ -89,7 +89,7 @@ interface IAppOpsService { void setUidMode(int code, int uid, int mode); @UnsupportedAppUsage void setMode(int code, int uid, String packageName, int mode); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void resetAllModes(int reqUserId, String reqPackageName); void setAudioRestriction(int code, int usage, int uid, int mode, in String[] exceptionPackages); diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index e6a166140d89..6a0b443b7df8 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -55,7 +55,7 @@ interface IBatteryStats { ParcelFileDescriptor getStatisticsStream(); // Return true if we see the battery as currently charging. - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isCharging(); // Return the computed amount of time remaining on battery, in milliseconds. @@ -64,7 +64,7 @@ interface IBatteryStats { // Return the computed amount of time remaining to fully charge, in milliseconds. // Returns -1 if nothing could be computed. - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage long computeChargeTimeRemaining(); void noteEvent(int code, String name, int uid); @@ -134,7 +134,7 @@ interface IBatteryStats { void noteDeviceIdleMode(int mode, String activeReason, int activeUid); void setBatteryState(int status, int health, int plugType, int level, int temp, int volt, int chargeUAh, int chargeFullUAh, long chargeTimeToFullSeconds); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage long getAwakeTimeBattery(); long getAwakeTimePlugged(); diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index 81c61aa0f250..49b4cd1e6a73 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -61,7 +61,7 @@ interface IVoiceInteractionManagerService { * @param bcp47Locale The BCP47 language tag for the keyphrase's locale. * @RequiresPermission Manifest.permission.MANAGE_VOICE_KEYPHRASES */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage SoundTrigger.KeyphraseSoundModel getKeyphraseSoundModel(int keyphraseId, in String bcp47Locale); /** * Add/Update the given keyphrase sound model for the current user. diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 3e1fa1d5fe59..61a52bcc03f9 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -38,7 +38,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.metrics.LogMaker; -import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; @@ -65,7 +64,7 @@ import java.util.concurrent.Executors; * be passed in and out of a managed profile. */ public class IntentForwarderActivity extends Activity { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String TAG = "IntentForwarderActivity"; public static String FORWARD_INTENT_TO_PARENT diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 3c53d07b6180..105e05a4a6c3 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -27,7 +27,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.os.Build; import android.os.Bundle; import android.os.LocaleList; import android.os.RemoteException; @@ -79,7 +78,7 @@ public class LocalePicker extends ListFragment { return label; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Locale getLocale() { return locale; } diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index 8cab91aab512..0cd12022e17d 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -32,7 +32,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.TypedValue; import android.view.ActionMode; import android.view.ContextThemeWrapper; @@ -81,11 +80,11 @@ public class WindowDecorActionBar extends ActionBar implements private ActionBarOverlayLayout mOverlayLayout; private ActionBarContainer mContainerView; private DecorToolbar mDecorToolbar; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ActionBarContextView mContextView; private ActionBarContainer mSplitView; private View mContentView; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ScrollingTabContainerView mTabScrollView; private ArrayList mTabs = new ArrayList(); @@ -1150,7 +1149,7 @@ public class WindowDecorActionBar extends ActionBar implements * @hide */ public class TabImpl extends ActionBar.Tab { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ActionBar.TabListener mCallback; private Object mTag; private Drawable mIcon; diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index 2d68cb472fa3..1186dfe92906 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -42,7 +42,7 @@ interface IAppWidgetService { void deleteAppWidgetId(String callingPackage, int appWidgetId); void deleteHost(String packageName, int hostId); void deleteAllHosts(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage RemoteViews getAppWidgetViews(String callingPackage, int appWidgetId); int[] getAppWidgetIdsForHost(String callingPackage, int hostId); IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, @@ -64,10 +64,10 @@ interface IAppWidgetService { AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId); boolean hasBindAppWidgetPermission(in String packageName, int userId); void setBindAppWidgetPermission(in String packageName, int userId, in boolean permission); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean bindAppWidgetId(in String callingPackage, int appWidgetId, int providerProfileId, in ComponentName providerComponent, in Bundle options); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean bindRemoteViewsService(String callingPackage, int appWidgetId, in Intent intent, IApplicationThread caller, IBinder token, IServiceConnection connection, int flags); diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 7b6df6c7118a..140c410e8de6 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -63,7 +63,7 @@ public class MetricsLogger { public static final int LOGTAG = EventLogTags.SYSUI_MULTI_ACTION; /** Write an event log record, consisting of content.serialize(). */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void write(LogMaker content) { if (content.getType() == MetricsEvent.TYPE_UNKNOWN) { content.setType(MetricsEvent.TYPE_ACTION); diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index a17f5f5f8910..b4727499d8ef 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -236,7 +236,7 @@ public final class VpnProfile implements Cloneable, Parcelable { * *

See {@link #encode()} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static VpnProfile decode(String key, byte[] value) { try { if (key == null) { diff --git a/core/java/com/android/internal/os/BaseCommand.java b/core/java/com/android/internal/os/BaseCommand.java index c110b263e781..32442f0472bb 100644 --- a/core/java/com/android/internal/os/BaseCommand.java +++ b/core/java/com/android/internal/os/BaseCommand.java @@ -19,13 +19,12 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BasicShellCommandHandler; -import android.os.Build; import java.io.PrintStream; public abstract class BaseCommand { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final protected BasicShellCommandHandler mArgs = new BasicShellCommandHandler() { @Override public int onCommand(String cmd) { return 0; @@ -41,7 +40,7 @@ public abstract class BaseCommand { private String[] mRawArgs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public BaseCommand() { } diff --git a/core/java/com/android/internal/os/BatterySipper.java b/core/java/com/android/internal/os/BatterySipper.java index 5337ac3cc27e..2620ba0749a9 100644 --- a/core/java/com/android/internal/os/BatterySipper.java +++ b/core/java/com/android/internal/os/BatterySipper.java @@ -17,7 +17,6 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BatteryStats.Uid; -import android.os.Build; import java.util.List; @@ -121,7 +120,7 @@ public class BatterySipper implements Comparable { public double audioPowerMah; public double bluetoothPowerMah; public double cameraPowerMah; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public double cpuPowerMah; public double flashlightPowerMah; public double gpsPowerMah; diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java index 92dd4dda39df..3dfa3c3f6906 100644 --- a/core/java/com/android/internal/os/BatteryStatsHelper.java +++ b/core/java/com/android/internal/os/BatteryStatsHelper.java @@ -26,7 +26,6 @@ import android.hardware.SensorManager; import android.net.ConnectivityManager; import android.os.BatteryStats; import android.os.BatteryStats.Uid; -import android.os.Build; import android.os.Bundle; import android.os.MemoryFile; import android.os.Parcel; @@ -273,7 +272,7 @@ public class BatteryStatsHelper { return mStats; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Intent getBatteryBroadcast() { if (mBatteryBroadcast == null && mCollectBatteryBroadcast) { load(); @@ -362,7 +361,7 @@ public class BatteryStatsHelper { /** * Refreshes the power usage list. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void refreshStats(int statsType, SparseArray asUsers) { refreshStats(statsType, asUsers, SystemClock.elapsedRealtime() * 1000, SystemClock.uptimeMillis() * 1000); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index e7e75a84643b..b986463a62f7 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -13558,7 +13558,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDischargeStartLevel() { synchronized(this) { return getDischargeStartLevelLocked(); @@ -13570,7 +13570,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDischargeCurrentLevel() { synchronized(this) { return getDischargeCurrentLevelLocked(); diff --git a/core/java/com/android/internal/os/ClassLoaderFactory.java b/core/java/com/android/internal/os/ClassLoaderFactory.java index d347f2e21dd2..f83c5bdc4e28 100644 --- a/core/java/com/android/internal/os/ClassLoaderFactory.java +++ b/core/java/com/android/internal/os/ClassLoaderFactory.java @@ -17,7 +17,6 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Trace; import dalvik.system.DelegateLastClassLoader; @@ -140,7 +139,7 @@ public class ClassLoaderFactory { return classLoader; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native String createClassloaderNamespace(ClassLoader classLoader, int targetSdkVersion, String librarySearchPath, diff --git a/core/java/com/android/internal/os/FuseAppLoop.java b/core/java/com/android/internal/os/FuseAppLoop.java index 1c6c6a73b44d..2393036b5a38 100644 --- a/core/java/com/android/internal/os/FuseAppLoop.java +++ b/core/java/com/android/internal/os/FuseAppLoop.java @@ -19,7 +19,6 @@ package com.android.internal.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.ParcelFileDescriptor; @@ -231,7 +230,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void onCommand(int command, long unique, long inode, long offset, int size, byte[] data) { synchronized (mLock) { @@ -260,7 +259,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private byte[] onOpen(long unique, long inode) { synchronized (mLock) { try { diff --git a/core/java/com/android/internal/os/ProcessCpuTracker.java b/core/java/com/android/internal/os/ProcessCpuTracker.java index 6d5cb67352b3..8e0546e6a86c 100644 --- a/core/java/com/android/internal/os/ProcessCpuTracker.java +++ b/core/java/com/android/internal/os/ProcessCpuTracker.java @@ -24,7 +24,6 @@ import static android.os.Process.PROC_PARENS; import static android.os.Process.PROC_SPACE_TERM; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.CpuUsageProto; import android.os.Process; import android.os.StrictMode; @@ -201,7 +200,7 @@ public class ProcessCpuTracker { public boolean interesting; public String baseName; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String name; public int nameWidth; @@ -217,7 +216,7 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long rel_uptime; /** @@ -233,13 +232,13 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int rel_utime; /** * Time in milliseconds. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int rel_stime; public long base_minfaults; @@ -733,13 +732,13 @@ public class ProcessCpuTracker { return statses; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final public int countWorkingStats() { buildWorkingProcs(); return mWorkingProcs.size(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final public Stats getWorkingStats(int index) { return mWorkingProcs.get(index); } diff --git a/core/java/com/android/internal/os/SomeArgs.java b/core/java/com/android/internal/os/SomeArgs.java index 5ec882cee3c8..003f61079dcf 100644 --- a/core/java/com/android/internal/os/SomeArgs.java +++ b/core/java/com/android/internal/os/SomeArgs.java @@ -17,7 +17,6 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * Helper class for passing more arguments though a message @@ -43,11 +42,11 @@ public final class SomeArgs { static final int WAIT_FINISHED = 2; int mWaitState = WAIT_NONE; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Object arg1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Object arg2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Object arg3; public Object arg4; public Object arg5; @@ -56,9 +55,9 @@ public final class SomeArgs { public Object arg8; public Object arg9; public int argi1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int argi2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int argi3; public int argi4; public int argi5; @@ -68,7 +67,7 @@ public final class SomeArgs { /* do nothing - reduce visibility */ } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SomeArgs obtain() { synchronized (sPoolLock) { if (sPoolSize > 0) { @@ -94,7 +93,7 @@ public final class SomeArgs { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void recycle() { if (mInPool) { throw new IllegalStateException("Already recycled."); diff --git a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl index a28a66376497..313bd42fe8c1 100644 --- a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -51,7 +51,7 @@ interface ITelephonyRegistry { boolean notifyNow); void listenForSubscriber(in int subId, String pkg, String featureId, IPhoneStateListener callback, long events, boolean notifyNow); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void notifyCallStateForAllSubs(int state, String incomingNumber); void notifyCallState(in int phoneId, in int subId, int state, String incomingNumber); void notifyServiceStateForPhoneId(in int phoneId, in int subId, in ServiceState state); diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java index 5571a58a8999..c6dea18d77d1 100644 --- a/core/java/com/android/internal/util/ArrayUtils.java +++ b/core/java/com/android/internal/util/ArrayUtils.java @@ -19,7 +19,6 @@ package com.android.internal.util; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.ArraySet; import dalvik.system.VMRuntime; @@ -57,7 +56,7 @@ public class ArrayUtils { return (char[])VMRuntime.getRuntime().newUnpaddedArray(char.class, minLen); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int[] newUnpaddedIntArray(int minLen) { return (int[])VMRuntime.getRuntime().newUnpaddedArray(int.class, minLen); } @@ -78,7 +77,7 @@ public class ArrayUtils { return (Object[])VMRuntime.getRuntime().newUnpaddedArray(Object.class, minLen); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SuppressWarnings("unchecked") public static T[] newUnpaddedArray(Class clazz, int minLen) { return (T[])VMRuntime.getRuntime().newUnpaddedArray(clazz, minLen); @@ -387,7 +386,7 @@ public class ArrayUtils { * Adds value to given array if not already present, providing set-like * behavior. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SuppressWarnings("unchecked") public static @NonNull T[] appendElement(Class kind, @Nullable T[] array, T element) { return appendElement(kind, array, element, false); @@ -417,7 +416,7 @@ public class ArrayUtils { /** * Removes value from given array if present, providing set-like behavior. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @SuppressWarnings("unchecked") public static @Nullable T[] removeElement(Class kind, @Nullable T[] array, T element) { if (array != null) { diff --git a/core/java/com/android/internal/util/AsyncChannel.java b/core/java/com/android/internal/util/AsyncChannel.java index 0e8c92991b66..7e3c171abfa6 100644 --- a/core/java/com/android/internal/util/AsyncChannel.java +++ b/core/java/com/android/internal/util/AsyncChannel.java @@ -401,7 +401,7 @@ public class AsyncChannel { * @param srcHandler * @param dstMessenger */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void connected(Context srcContext, Handler srcHandler, Messenger dstMessenger) { if (DBG) log("connected srcHandler to the dstMessenger E"); @@ -514,7 +514,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void sendMessage(int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -606,7 +606,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void replyToMessage(Message srcMsg, int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -639,7 +639,7 @@ public class AsyncChannel { * @param arg2 * @param obj */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void replyToMessage(Message srcMsg, int what, int arg1, int arg2, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -656,7 +656,7 @@ public class AsyncChannel { * @param what * @param obj */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void replyToMessage(Message srcMsg, int what, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -670,7 +670,7 @@ public class AsyncChannel { * @param msg to send * @return reply message or null if an error. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Message sendMessageSynchronously(Message msg) { Message resultMsg = SyncMessenger.sendMessageSynchronously(mDstMessenger, msg); return resultMsg; @@ -712,7 +712,7 @@ public class AsyncChannel { * @param arg2 * @return reply message or null if an error. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Message sendMessageSynchronously(int what, int arg1, int arg2) { Message msg = Message.obtain(); msg.what = what; diff --git a/core/java/com/android/internal/util/GrowingArrayUtils.java b/core/java/com/android/internal/util/GrowingArrayUtils.java index 8c12e36a27d1..597fe6b53d11 100644 --- a/core/java/com/android/internal/util/GrowingArrayUtils.java +++ b/core/java/com/android/internal/util/GrowingArrayUtils.java @@ -17,7 +17,6 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A helper class that aims to provide comparable growth performance to ArrayList, but on primitive @@ -40,7 +39,7 @@ public final class GrowingArrayUtils { * @return the array to which the element was appended. This may be different than the given * array. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static T[] append(T[] array, int currentSize, T element) { assert currentSize <= array.length; @@ -58,7 +57,7 @@ public final class GrowingArrayUtils { /** * Primitive int version of {@link #append(Object[], int, Object)}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int[] append(int[] array, int currentSize, int element) { assert currentSize <= array.length; diff --git a/core/java/com/android/internal/util/HexDump.java b/core/java/com/android/internal/util/HexDump.java index 6468cafe85d4..ad88dd6deec6 100644 --- a/core/java/com/android/internal/util/HexDump.java +++ b/core/java/com/android/internal/util/HexDump.java @@ -107,7 +107,7 @@ public class HexDump return toHexString(array, 0, array.length, true); } - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage public static String toHexString(byte[] array, boolean upperCase) { return toHexString(array, 0, array.length, upperCase); diff --git a/core/java/com/android/internal/util/IndentingPrintWriter.java b/core/java/com/android/internal/util/IndentingPrintWriter.java index 520f5184260a..2435afb61083 100644 --- a/core/java/com/android/internal/util/IndentingPrintWriter.java +++ b/core/java/com/android/internal/util/IndentingPrintWriter.java @@ -17,7 +17,6 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.io.Writer; @@ -27,7 +26,7 @@ import java.io.Writer; @Deprecated public class IndentingPrintWriter extends android.util.IndentingPrintWriter { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IndentingPrintWriter(Writer writer, String singleIndent) { super(writer, singleIndent, -1); } @@ -50,13 +49,13 @@ public class IndentingPrintWriter extends android.util.IndentingPrintWriter { return this; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IndentingPrintWriter increaseIndent() { super.increaseIndent(); return this; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IndentingPrintWriter decreaseIndent() { super.decreaseIndent(); return this; diff --git a/core/java/com/android/internal/util/MemInfoReader.java b/core/java/com/android/internal/util/MemInfoReader.java index 0c5c8537e85a..5de77d9b0545 100644 --- a/core/java/com/android/internal/util/MemInfoReader.java +++ b/core/java/com/android/internal/util/MemInfoReader.java @@ -17,7 +17,6 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Debug; import android.os.StrictMode; @@ -52,7 +51,7 @@ public final class MemInfoReader { /** * Amount of RAM that is not being used for anything. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getFreeSize() { return mInfos[Debug.MEMINFO_FREE] * 1024; } @@ -61,7 +60,7 @@ public final class MemInfoReader { * Amount of RAM that the kernel is being used for caches, not counting caches * that are mapped in to processes. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getCachedSize() { return getCachedSizeKb() * 1024; } diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java index 88e4e355000a..4d441cd98a96 100644 --- a/core/java/com/android/internal/util/Preconditions.java +++ b/core/java/com/android/internal/util/Preconditions.java @@ -19,7 +19,6 @@ package com.android.internal.util; import android.annotation.IntRange; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.text.TextUtils; import java.util.Arrays; @@ -53,7 +52,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalArgumentException if {@code expression} is false */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void checkArgument(boolean expression, final Object errorMessage) { if (!expression) { throw new IllegalArgumentException(String.valueOf(errorMessage)); @@ -209,7 +208,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalStateException if {@code expression} is false */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void checkState(final boolean expression, String errorMessage) { if (!expression) { throw new IllegalStateException(errorMessage); @@ -519,7 +518,7 @@ public class Preconditions { * * @throws IllegalArgumentException if {@code value} was not within the range */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int checkArgumentInRange(int value, int lower, int upper, String valueName) { if (value < lower) { diff --git a/core/java/com/android/internal/util/State.java b/core/java/com/android/internal/util/State.java index 4613dad8cc67..636378e32091 100644 --- a/core/java/com/android/internal/util/State.java +++ b/core/java/com/android/internal/util/State.java @@ -17,7 +17,6 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Message; /** @@ -45,7 +44,7 @@ public class State implements IState { /* (non-Javadoc) * @see com.android.internal.util.IState#exit() */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Override public void exit() { } diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java index 4cff785cd671..7a79cc9ef868 100644 --- a/core/java/com/android/internal/util/StateMachine.java +++ b/core/java/com/android/internal/util/StateMachine.java @@ -17,7 +17,6 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -1325,7 +1324,7 @@ public class StateMachine { * * @param name of the state machine */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected StateMachine(String name, Handler handler) { initStateMachine(name, handler.getLooper()); } @@ -1358,7 +1357,7 @@ public class StateMachine { * Add a new state to the state machine, parent will be null * @param state to add */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void addState(State state) { mSmHandler.addState(state, null); } @@ -1377,7 +1376,7 @@ public class StateMachine { * * @param initialState is the state which will receive the first message. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void setInitialState(State initialState) { mSmHandler.setInitialState(initialState); } @@ -1416,7 +1415,7 @@ public class StateMachine { * * @param destState will be the state that receives the next message. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final void transitionTo(IState destState) { mSmHandler.transitionTo(destState); } @@ -1701,7 +1700,7 @@ public class StateMachine { * @param obj is assigned to Message.obj * @return A Message object from the global pool */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final Message obtainMessage(int what, int arg1, int arg2, Object obj) { return Message.obtain(mSmHandler, what, arg1, arg2, obj); } @@ -1739,7 +1738,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void sendMessage(int what, int arg1) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -1766,7 +1765,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void sendMessage(int what, int arg1, int arg2, Object obj) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2067,7 +2066,7 @@ public class StateMachine { /** * Start the state machine. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void start() { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2084,7 +2083,7 @@ public class StateMachine { * @param pw * @param args */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(getName() + ":"); pw.println(" total records=" + getLogRecCount()); diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index 33ebe43cb23a..cd5502c9f270 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -82,7 +82,7 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { private Looper mMainLooper; private Handler mH; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Object mLock = new Object(); @GuardedBy("mLock") private boolean mFinished = false; diff --git a/core/java/com/android/internal/view/menu/ActionMenu.java b/core/java/com/android/internal/view/menu/ActionMenu.java index c699ca193f2b..648262965ab1 100644 --- a/core/java/com/android/internal/view/menu/ActionMenu.java +++ b/core/java/com/android/internal/view/menu/ActionMenu.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.os.Build; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -41,7 +40,7 @@ public class ActionMenu implements Menu { private ArrayList mItems; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ActionMenu(Context context) { mContext = context; mItems = new ArrayList(); diff --git a/core/java/com/android/internal/view/menu/ActionMenuItem.java b/core/java/com/android/internal/view/menu/ActionMenuItem.java index acb233e39cc8..bd8bcb9cf81e 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItem.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItem.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; @@ -71,7 +70,7 @@ public class ActionMenuItem implements MenuItem { private static final int HIDDEN = 0x00000008; private static final int ENABLED = 0x00000010; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ActionMenuItem(Context context, int group, int id, int categoryOrder, int ordering, CharSequence title) { mContext = context; diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java index 61536e8960e2..7622b939b6eb 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java @@ -22,7 +22,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Parcelable; import android.text.TextUtils; import android.util.AttributeSet; @@ -226,7 +225,7 @@ public class ActionMenuItemView extends TextView updateTextButtonVisibility(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean hasText() { return !TextUtils.isEmpty(getText()); } diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java index 0b490b20df0e..b31ae38b4566 100644 --- a/core/java/com/android/internal/view/menu/MenuBuilder.java +++ b/core/java/com/android/internal/view/menu/MenuBuilder.java @@ -27,7 +27,6 @@ import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.SparseArray; @@ -211,7 +210,7 @@ public class MenuBuilder implements Menu { setShortcutsVisibleInner(true); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MenuBuilder setDefaultShowAsAction(int defaultShowAsAction) { mDefaultShowAsAction = defaultShowAsAction; return this; @@ -224,7 +223,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to add */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addMenuPresenter(MenuPresenter presenter) { addMenuPresenter(presenter, mContext); } @@ -251,7 +250,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to remove */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void removeMenuPresenter(MenuPresenter presenter) { for (WeakReference ref : mPresenters) { final MenuPresenter item = ref.get(); @@ -1016,7 +1015,7 @@ public class MenuBuilder implements Menu { * {@link #startDispatchingItemsChanged()} is called. Useful when * many menu operations are going to be performed as a batch. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void stopDispatchingItemsChanged() { if (!mPreventDispatchingItemsChanged) { mPreventDispatchingItemsChanged = true; @@ -1024,7 +1023,7 @@ public class MenuBuilder implements Menu { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void startDispatchingItemsChanged() { mPreventDispatchingItemsChanged = false; @@ -1146,7 +1145,7 @@ public class MenuBuilder implements Menu { return mActionItems; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ArrayList getNonActionItems() { flagActionItems(); return mNonActionItems; diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 2452398a5348..218f5185ec47 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -25,7 +25,6 @@ import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.Log; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; @@ -663,17 +662,17 @@ public final class MenuItemImpl implements MenuItem { return mMenu.getOptionalIconsVisible(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isActionButton() { return (mFlags & IS_ACTION) == IS_ACTION; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean requestsActionButton() { return (mShowAsAction & SHOW_AS_ACTION_IF_ROOM) == SHOW_AS_ACTION_IF_ROOM; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean requiresActionButton() { return (mShowAsAction & SHOW_AS_ACTION_ALWAYS) == SHOW_AS_ACTION_ALWAYS; } diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index c266d0218b31..980943ebea5a 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -23,7 +23,6 @@ import android.annotation.StyleRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; -import android.os.Build; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -48,14 +47,14 @@ public class MenuPopupHelper implements MenuHelper { // Mutable cached popup menu properties. private View mAnchorView; private int mDropDownGravity = Gravity.START; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mForceShowIcon; private Callback mPresenterCallback; private MenuPopup mPopup; private OnDismissListener mOnDismissListener; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu) { this(context, menu, null, false, com.android.internal.R.attr.popupMenuStyle, 0); } @@ -94,7 +93,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param anchor the view to which the popup window should be anchored */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setAnchorView(@NonNull View anchor) { mAnchorView = anchor; } @@ -126,7 +125,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param gravity alignment of the popup relative to the anchor */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setGravity(int gravity) { mDropDownGravity = gravity; } @@ -152,7 +151,7 @@ public class MenuPopupHelper implements MenuHelper { } @NonNull - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MenuPopup getPopup() { if (mPopup == null) { mPopup = createPopup(); @@ -166,7 +165,7 @@ public class MenuPopupHelper implements MenuHelper { * @return {@code true} if the popup was shown or was already showing prior to calling this * method, {@code false} otherwise */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean tryShow() { if (isShowing()) { return true; diff --git a/core/java/com/android/internal/view/menu/MenuPresenter.java b/core/java/com/android/internal/view/menu/MenuPresenter.java index 37155b9ff7fe..35b8fefe75ab 100644 --- a/core/java/com/android/internal/view/menu/MenuPresenter.java +++ b/core/java/com/android/internal/view/menu/MenuPresenter.java @@ -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.Parcelable; import android.view.ViewGroup; @@ -49,7 +48,7 @@ public interface MenuPresenter { * @return true if the Callback will handle presenting the submenu, false if * the presenter should attempt to do so. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean onOpenSubMenu(MenuBuilder subMenu); } diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java index 914de6102fef..0f0c1a3de3a2 100644 --- a/core/java/com/android/internal/widget/AbsActionBarView.java +++ b/core/java/com/android/internal/widget/AbsActionBarView.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; -import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.ContextThemeWrapper; @@ -295,7 +294,7 @@ public abstract class AbsActionBarView extends ViewGroup { return isOverflowReserved() && getVisibility() == VISIBLE; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void dismissPopupMenus() { if (mActionMenuPresenter != null) { mActionMenuPresenter.dismissPopupMenus(); diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 80fc218839d5..051526ef2da7 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java @@ -19,7 +19,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ActionMode; @@ -59,7 +58,7 @@ public class ActionBarContextView extends AbsActionBarView { this(context, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ActionBarContextView(Context context, AttributeSet attrs) { this(context, attrs, com.android.internal.R.attr.actionModeStyle); } diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index adbf645de74e..aca0b713686f 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -170,7 +170,7 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar init(context); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ActionBarOverlayLayout(Context context, AttributeSet attrs) { super(context, attrs); init(context); diff --git a/core/java/com/android/internal/widget/CachingIconView.java b/core/java/com/android/internal/widget/CachingIconView.java index 4a70f7416075..0bf323f8f493 100644 --- a/core/java/com/android/internal/widget/CachingIconView.java +++ b/core/java/com/android/internal/widget/CachingIconView.java @@ -28,7 +28,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; -import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.RemotableViewMethod; @@ -55,7 +54,7 @@ public class CachingIconView extends ImageView { private int mBackgroundColor; private boolean mWillBeForceHidden; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CachingIconView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); } diff --git a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl index c06dab9f75d6..d6efca5d36eb 100644 --- a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl +++ b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl @@ -21,23 +21,23 @@ import android.widget.RemoteViews; /** {@hide} */ interface IRemoteViewsFactory { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onDataSetChanged(); oneway void onDataSetChangedAsync(); oneway void onDestroy(in Intent intent); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int getCount(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage RemoteViews getViewAt(int position); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage RemoteViews getLoadingView(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int getViewTypeCount(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage long getItemId(int position); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean hasStableIds(); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isCreated(); } diff --git a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java index f230ddb8b5ea..9ef9f697c46c 100644 --- a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java +++ b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java @@ -19,7 +19,6 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -47,7 +46,7 @@ public class LinearLayoutWithDefaultTouchRecepient extends LinearLayout { super(context, attrs); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDefaultTouchRecepient(View defaultTouchRecepient) { mDefaultTouchRecepient = defaultTouchRecepient; } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index b562ef838633..c0c7f100ef21 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -35,7 +35,6 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.UserInfo; import android.os.AsyncTask; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -730,13 +729,13 @@ public class LockPatternUtils { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setOwnerInfo(String info, int userId) { setString(LOCK_SCREEN_OWNER_INFO, info, userId); updateCryptoUserInfo(userId); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setOwnerInfoEnabled(boolean enabled, int userId) { setBoolean(LOCK_SCREEN_OWNER_INFO_ENABLED, enabled, userId); updateCryptoUserInfo(userId); @@ -1114,7 +1113,7 @@ public class LockPatternUtils { return type != CREDENTIAL_TYPE_NONE; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isLockPasswordEnabled(int userId) { int type = getCredentialTypeForUser(userId); return type == CREDENTIAL_TYPE_PASSWORD || type == CREDENTIAL_TYPE_PIN; diff --git a/core/java/com/android/internal/widget/NumericTextView.java b/core/java/com/android/internal/widget/NumericTextView.java index e6cb24de9f94..c8f901133be6 100644 --- a/core/java/com/android/internal/widget/NumericTextView.java +++ b/core/java/com/android/internal/widget/NumericTextView.java @@ -19,7 +19,6 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; import android.view.KeyEvent; @@ -55,7 +54,7 @@ public class NumericTextView extends TextView { private OnValueChangedListener mListener; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NumericTextView(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/core/java/com/android/internal/widget/PreferenceImageView.java b/core/java/com/android/internal/widget/PreferenceImageView.java index 0ca98cfbdfb8..43b6b5a169c5 100644 --- a/core/java/com/android/internal/widget/PreferenceImageView.java +++ b/core/java/com/android/internal/widget/PreferenceImageView.java @@ -18,7 +18,6 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.util.AttributeSet; import android.widget.ImageView; @@ -31,7 +30,7 @@ public class PreferenceImageView extends ImageView { this(context, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PreferenceImageView(Context context, AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/com/android/internal/widget/RecyclerView.java b/core/java/com/android/internal/widget/RecyclerView.java index fd9e43081d10..d7a01c4762f1 100644 --- a/core/java/com/android/internal/widget/RecyclerView.java +++ b/core/java/com/android/internal/widget/RecyclerView.java @@ -4968,7 +4968,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro * constructed by {@link GapWorker} prefetch from being bound to a lower priority prefetch. */ static class ScrapData { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ArrayList mScrapHeap = new ArrayList<>(); int mMaxScrap = DEFAULT_MAX_SCRAP; long mCreateRunningAverageNs = 0; diff --git a/core/java/com/android/internal/widget/ScrollBarUtils.java b/core/java/com/android/internal/widget/ScrollBarUtils.java index 0108bd4a27cf..3e9d697a0ace 100644 --- a/core/java/com/android/internal/widget/ScrollBarUtils.java +++ b/core/java/com/android/internal/widget/ScrollBarUtils.java @@ -17,11 +17,10 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; public class ScrollBarUtils { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getThumbLength(int size, int thickness, int extent, int range) { // Avoid the tiny thumb. final int minLength = thickness * 2; diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index d3029676cbb2..aa0b0bbd4c19 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; -import android.os.Build; import android.text.TextUtils; import android.text.TextUtils.TruncateAt; import android.view.Gravity; @@ -225,7 +224,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView mStackedTabMaxWidth = abp.getStackedTabMaxWidth(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void animateToVisibility(int visibility) { if (mVisibilityAnim != null) { mVisibilityAnim.cancel(); @@ -250,7 +249,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void animateToTab(final int position) { final View tabView = mTabLayout.getChildAt(position); if (mTabSelector != null) { @@ -332,7 +331,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void updateTab(int position) { ((TabView) mTabLayout.getChildAt(position)).update(); if (mTabSpinner != null) { diff --git a/core/java/com/android/server/net/NetlinkTracker.java b/core/java/com/android/server/net/NetlinkTracker.java index 197984fc7dcd..b57397f46a7e 100644 --- a/core/java/com/android/server/net/NetlinkTracker.java +++ b/core/java/com/android/server/net/NetlinkTracker.java @@ -20,7 +20,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.RouteInfo; -import android.os.Build; import android.util.Log; import java.net.InetAddress; @@ -81,7 +80,7 @@ public class NetlinkTracker extends BaseNetworkObserver { private static final boolean DBG = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public NetlinkTracker(String iface, Callback callback) { TAG = "NetlinkTracker/" + iface; mInterfaceName = iface; @@ -190,12 +189,12 @@ public class NetlinkTracker extends BaseNetworkObserver { /** * Returns a copy of this object's LinkProperties. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public synchronized LinkProperties getLinkProperties() { return new LinkProperties(mLinkProperties); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public synchronized void clearLinkProperties() { // Clear the repository before clearing mLinkProperties. That way, if a clear() happens // while interfaceDnsServerInfo() is being called, we'll end up with no DNS servers in diff --git a/core/java/com/google/android/collect/Sets.java b/core/java/com/google/android/collect/Sets.java index e2429157d529..c67a88a19080 100644 --- a/core/java/com/google/android/collect/Sets.java +++ b/core/java/com/google/android/collect/Sets.java @@ -17,7 +17,6 @@ package com.google.android.collect; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.ArraySet; import java.util.Collections; @@ -108,7 +107,7 @@ public class Sets { /** * Creates a {@code ArraySet} instance containing the given elements. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ArraySet newArraySet(E... elements) { int capacity = elements.length * 4 / 3 + 1; ArraySet set = new ArraySet(capacity); diff --git a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java index 25091263b2b0..e1fe1bdbdd5f 100644 --- a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -182,7 +182,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { private final SSLContext sslcontext; @UnsupportedAppUsage private final javax.net.ssl.SSLSocketFactory socketfactory; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final HostNameResolver nameResolver; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; @@ -262,7 +262,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { this.nameResolver = null; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static KeyManager[] createKeyManagers(final KeyStore keystore, final String password) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException { if (keystore == null) { @@ -274,7 +274,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { return kmfactory.getKeyManagers(); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static TrustManager[] createTrustManagers(final KeyStore keystore) throws KeyStoreException, NoSuchAlgorithmException { if (keystore == null) { diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 055e5ad17def..4f95a53e0ec8 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -80,7 +80,7 @@ public final class Bitmap implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123769491) private byte[] mNinePatchChunk; // may be null - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private NinePatch.InsetStruct mNinePatchInsets; // may be null @UnsupportedAppUsage private int mWidth; @@ -176,7 +176,7 @@ public final class Bitmap implements Parcelable { * width/height values */ @SuppressWarnings("unused") // called from JNI - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage void reinit(int width, int height, boolean requestPremultiplied) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index ef1e7bfc6651..bad487b47682 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; -import android.os.Build; import android.os.Trace; import android.util.DisplayMetrics; import android.util.Log; @@ -876,7 +875,7 @@ public class BitmapFactory { @UnsupportedAppUsage private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); @UnsupportedAppUsage diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 42e6ab9c830c..829d0f4be513 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1355,7 +1355,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1379,7 +1379,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index e949584b0659..4263772c1c2c 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -17,7 +17,6 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.android.internal.util.VirtualRefBasePtr; @@ -29,12 +28,12 @@ public final class CanvasProperty { private VirtualRefBasePtr mProperty; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CanvasProperty createFloat(float initialValue) { return new CanvasProperty(nCreateFloat(initialValue)); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CanvasProperty createPaint(Paint initialValue) { return new CanvasProperty(nCreatePaint(initialValue.getNativeInstance())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index 90ff1899f34d..a8b18a9fcb1f 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -19,7 +19,6 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A color filter that transforms colors through a 4x5 color matrix. This filter @@ -108,7 +107,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setColorMatrixArray(@Nullable float[] array) { // called '...Array' so that passing null isn't ambiguous discardNativeInstance(); diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index 0782f8dfd9d3..c146bbd4441b 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -18,7 +18,6 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; -import android.os.Build; import android.text.FontConfig; import android.util.Xml; @@ -39,7 +38,7 @@ import java.util.regex.Pattern; public class FontListParser { /* Parse fallback list (no names) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static FontConfig parse(InputStream in) throws XmlPullParserException, IOException { return parse(in, "/system/fonts"); } diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index f9113a21405c..2c25f4546771 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -18,7 +18,6 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.HardwareBuffer; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -56,7 +55,7 @@ public class GraphicBuffer implements Parcelable { private final int mFormat; private final int mUsage; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final long mNativeObject; // These two fields are only used by lock/unlockCanvas() @@ -88,7 +87,7 @@ public class GraphicBuffer implements Parcelable { /** * Private use only. See {@link #create(int, int, int, int)}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index df91c5d492bd..221dfa192795 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -23,7 +23,6 @@ package android.graphics; import android.annotation.ColorInt; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A color filter that can be used to simulate simple lighting effects. @@ -74,7 +73,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setColorMultiply(@ColorInt int mul) { if (mMul != mul) { mMul = mul; @@ -100,7 +99,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setColorAdd(@ColorInt int add) { if (mAdd != add) { mAdd = add; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index 4eedbf563865..ebe34cad0654 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -21,21 +21,20 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; public class LinearGradient extends Shader { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mX0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mY0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mX1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mY1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float[] mPositions; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private TileMode mTileMode; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. @@ -45,7 +44,7 @@ public class LinearGradient extends Shader { @UnsupportedAppUsage @ColorInt private int mColor0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index 9c9535d16aab..4b3924f0d55f 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -28,7 +28,7 @@ import java.io.InputStream; */ @Deprecated public class Movie { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeMovie; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 4b6e4d124b48..a191fe56b31d 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -53,7 +53,7 @@ import java.util.Locale; */ public class Paint { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index e5ef10d1d555..7811671b80d6 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -49,12 +48,12 @@ public class Path { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isSimplePath = true; /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 0700f217ecf0..50ecb62e7fcc 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -19,7 +19,6 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A color filter that can be used to tint the source pixels using a single @@ -65,7 +64,7 @@ public class PorterDuffColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PorterDuff.Mode getMode() { return mMode; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index dd1be1570d79..864331a9674e 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -22,18 +22,17 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; public class RadialGradient extends Shader { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mX; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mY; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mRadius; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float[] mPositions; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private TileMode mTileMode; private final float mFocalX; @@ -41,13 +40,13 @@ public class RadialGradient extends Shader { private final float mFocalRadius; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int[] mColors; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int mCenterColor; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int mEdgeColor; diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index 29708738d2db..43373ffbd3f4 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -18,7 +18,6 @@ package android.graphics; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Pools.SynchronizedPool; @@ -33,7 +32,7 @@ public class Region implements Parcelable { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long mNativeRegion; // the native values for these must match up with the enum in SkRegion.h @@ -338,7 +337,7 @@ public class Region implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void recycle() { setEmpty(); sPool.release(this); @@ -412,7 +411,7 @@ public class Region implements Parcelable { /* Add an unused parameter so constructor can be called from jni without triggering 'not cloneable' exception */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Region(long ni, int unused) { this(ni); } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 7a2e5843ffc7..228d03a1dd10 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -18,7 +18,6 @@ package android.graphics; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -70,17 +69,17 @@ import java.lang.ref.WeakReference; */ public class SurfaceTexture { private final Looper mCreatorLooper; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Handler mOnFrameAvailableHandler; /** * These fields are used by native code, do not access or modify. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mSurfaceTexture; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mProducer; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mFrameAvailableListener; private boolean mIsSingleBuffered; @@ -391,7 +390,7 @@ public class SurfaceTexture { * This method is invoked from native code only. */ @SuppressWarnings({"UnusedDeclaration"}) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(WeakReference weakSelf) { SurfaceTexture st = weakSelf.get(); if (st != null) { diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index 22807805e7fa..f1ca1986bfa0 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -21,24 +21,23 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; public class SweepGradient extends Shader { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mCx; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mCy; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float[] mPositions; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int[] mColors; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int mColor0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index b143be7b4d6a..ecb0ff43a9e2 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -1217,7 +1217,7 @@ public class Typeface { long native_instance, List axes); @UnsupportedAppUsage private static native long nativeCreateWeightAlias(long native_instance, int weight); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index 81769e2e21bf..e79fb76d806e 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -22,7 +22,6 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * Xfermode is the base class for objects that are called to implement custom @@ -33,6 +32,6 @@ import android.os.Build; */ public class Xfermode { static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int porterDuffMode = DEFAULT; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 33a6d38b698d..06159d8a0558 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -561,9 +561,9 @@ public class AnimatedStateListDrawable extends StateListDrawable { int[] mAnimThemeAttrs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage LongSparseLongArray mTransitions; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage SparseIntArray mStateIds; AnimatedStateListState(@Nullable AnimatedStateListState orig, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 33b09b8831ce..73dbe65bd25b 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -315,7 +315,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -1773,7 +1773,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } // onFinished: should be called from native - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void callOnFinished(VectorDrawableAnimatorRT set, int id) { set.mHandler.post(() -> set.onAnimationEnd(id)); } diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index f8dc61526ce6..2457ab85144f 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -34,7 +34,6 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Xfermode; -import android.os.Build; import android.util.AttributeSet; import android.view.ViewDebug; @@ -54,7 +53,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 28b3b04b827d..ed210ab40b7a 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -45,7 +45,6 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Region; import android.graphics.Xfermode; -import android.os.Build; import android.os.Trace; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -1716,7 +1715,7 @@ public abstract class Drawable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static BlendMode parseBlendMode(int value, BlendMode defaultMode) { switch (value) { case 3: return BlendMode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index 66752a2536d3..3408b64e7536 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.Theme; -import android.os.Build; import android.util.AttributeSet; import android.view.InflateException; @@ -51,7 +50,7 @@ public final class DrawableInflater { new HashMap<>(); private final Resources mRes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final ClassLoader mClassLoader; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index ebde75775e84..98c38214adab 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -32,7 +32,6 @@ import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.Xfermode; -import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; @@ -48,7 +47,7 @@ import java.io.IOException; * Drawable container with only one child element. */ public abstract class DrawableWrapper extends Drawable implements Drawable.Callback { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private DrawableWrapperState mState; private Drawable mDrawable; private boolean mMutated; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index 32b310353b6c..abf0e8a1fe89 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -170,7 +170,7 @@ public final class Icon implements Parcelable { * @return The length of the compressed bitmap byte array held by this {@link #TYPE_DATA} Icon. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDataLength() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataLength() on " + this); @@ -599,7 +599,7 @@ public final class Icon implements Parcelable { * Version of createWithResource that takes Resources. Do not use. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static Icon createWithResource(Resources res, @DrawableRes int resId) { if (res == null) { throw new IllegalArgumentException("Resource must not be null."); @@ -771,7 +771,7 @@ public final class Icon implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean hasTint() { return (mTintList != null) || (mBlendMode != DEFAULT_BLEND_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 87c0a061c9f2..005a4d175fd5 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -27,7 +27,6 @@ import android.graphics.Insets; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -59,7 +58,7 @@ public class InsetDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); private final Rect mTmpInsetRect = new Rect(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private InsetState mState; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index a03f8b566ddd..19f29aed203f 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -30,7 +30,6 @@ import android.graphics.ColorFilter; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.LayoutDirection; @@ -435,7 +434,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param layer The layer to add. * @return The index of the layer. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int addLayer(@NonNull ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 8677fb1b7c1e..16ffd132a41b 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -36,7 +36,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; -import android.os.Build; import android.util.AttributeSet; import com.android.internal.R; @@ -122,7 +121,7 @@ public class RippleDrawable extends LayerDrawable { private final Rect mDirtyBounds = new Rect(); /** Mirrors mLayerState with some extra information. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private RippleState mState; /** The masking layer, e.g. the layer with id R.id.mask. */ @@ -160,7 +159,7 @@ public class RippleDrawable extends LayerDrawable { private Paint mRipplePaint; /** Target density of the display into which ripples are drawn. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mDensity; /** Whether bounds are being overridden. */ @@ -980,7 +979,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index 7e246e552bec..af7eed4b3897 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -25,7 +25,6 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.PixelFormat; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; @@ -68,7 +67,7 @@ public class ScaleDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private ScaleState mState; ScaleDrawable() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index af69029da9d7..88cd4625394b 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -22,7 +22,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; -import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; @@ -131,7 +130,7 @@ public class StateListDrawable extends DrawableContainer { /** * Updates the constant state from the values in the typed array. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void updateStateFromTypedArray(TypedArray a) { final StateListState state = mStateListState; @@ -209,7 +208,7 @@ public class StateListDrawable extends DrawableContainer { * @param attrs The attribute set. * @return An array of state_ attributes. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int[] extractStateSet(AttributeSet attrs) { int j = 0; final int numAttrs = attrs.getAttributeCount(); diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 6dcc251c2ddc..a1ccc7b7b5e4 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -34,7 +34,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; -import android.os.Build; import android.os.Trace; import android.util.ArrayMap; import android.util.AttributeSet; @@ -325,7 +324,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private PorterDuffColorFilter mTintFilter; private BlendModeColorFilter mBlendModeColorFilter; diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 7bd581723d18..4e6580ea5f53 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -33,7 +33,7 @@ public final class FontVariationAxis { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mTag; private final String mTagString; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final float mStyleValue; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 4666963b5dd4..43de4699381f 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -25,7 +25,6 @@ import android.graphics.Bitmap.Config; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.ErrnoException; import android.system.Os; @@ -122,7 +121,7 @@ public final class PdfRenderer implements AutoCloseable { private ParcelFileDescriptor mInput; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Page mCurrentPage; /** @hide */ @@ -247,7 +246,7 @@ public final class PdfRenderer implements AutoCloseable { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void doClose() { if (mCurrentPage != null) { mCurrentPage.close(); diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index 8f5982cd4528..f53a7dc922f0 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -17,7 +17,6 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.org.bouncycastle.util.io.pem.PemReader; @@ -138,7 +137,7 @@ public class Credentials { * Convert objects to a PEM format which is used for * CA_CERTIFICATE and USER_CERTIFICATE entries. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static byte[] convertToPem(Certificate... objects) throws IOException, CertificateEncodingException { ByteArrayOutputStream bao = new ByteArrayOutputStream(); diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index c70c986fcd6b..88b614dc7eef 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -71,7 +71,7 @@ public class KeyStore { private static final String TAG = "KeyStore"; // ResponseCodes - see system/security/keystore/include/keystore/keystore.h - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int NO_ERROR = 1; public static final int LOCKED = 2; public static final int UNINITIALIZED = 3; @@ -191,7 +191,7 @@ public class KeyStore { return mToken; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public State state(int userId) { final int ret; try { @@ -222,7 +222,7 @@ public class KeyStore { return get(key, uid, false); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public byte[] get(String key) { return get(key, UID_SELF); } @@ -282,7 +282,7 @@ public class KeyStore { return ret == NO_ERROR || ret == KEY_NOT_FOUND; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean delete(String key) { return delete(key, UID_SELF); } @@ -319,7 +319,7 @@ public class KeyStore { * List uids of all keys that are auth bound to the current user. * Only system is allowed to call this method. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int[] listUidsOfAuthBoundKeys() { // uids are returned as a list of strings because list of integers // as an output parameter is not supported by aidl-cpp. @@ -386,7 +386,7 @@ public class KeyStore { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean unlock(String password) { return unlock(UserHandle.getUserId(Process.myUid()), password); } @@ -1262,7 +1262,7 @@ public class KeyStore { * Returns a {@link KeyStoreException} corresponding to the provided keystore/keymaster error * code. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static KeyStoreException getKeyStoreException(int errorCode) { if (errorCode > 0) { // KeyStore layer error diff --git a/location/java/android/location/IGeofenceProvider.aidl b/location/java/android/location/IGeofenceProvider.aidl index b1ef672024ac..426ebef86b96 100644 --- a/location/java/android/location/IGeofenceProvider.aidl +++ b/location/java/android/location/IGeofenceProvider.aidl @@ -24,6 +24,6 @@ import android.hardware.location.IGeofenceHardware; * {@hide} */ oneway interface IGeofenceProvider { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setGeofenceHardware(in IGeofenceHardware proxy); } diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 20175d70e735..62b4bc173bb9 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -129,7 +129,7 @@ public class Location implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mProvider; private long mTime = 0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mElapsedRealtimeNanos = 0; // Estimate of the relative precision of the alignment of this SystemClock // timestamp, with the reported measurements in nanoseconds (68% confidence). diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 717074cba26f..158482a6a833 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -502,7 +502,7 @@ public final class AudioAttributes implements Parcelable { @Retention(RetentionPolicy.SOURCE) public @interface CapturePolicy {} - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mUsage = USAGE_UNKNOWN; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mContentType = CONTENT_TYPE_UNKNOWN; @@ -511,7 +511,7 @@ public final class AudioAttributes implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mFlags = 0x0; private HashSet mTags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mFormattedTags; private Bundle mBundle; // lazy-initialized, may be null diff --git a/media/java/android/media/AudioDevicePort.java b/media/java/android/media/AudioDevicePort.java index 0f79675862c7..f6b04540c5c7 100644 --- a/media/java/android/media/AudioDevicePort.java +++ b/media/java/android/media/AudioDevicePort.java @@ -18,7 +18,6 @@ package android.media; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.util.Arrays; @@ -42,7 +41,7 @@ public class AudioDevicePort extends AudioPort { private final int[] mEncapsulationModes; private final int[] mEncapsulationMetadataTypes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioDevicePort(AudioHandle handle, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains, int type, String address, int[] encapsulationModes, diff --git a/media/java/android/media/AudioDevicePortConfig.java b/media/java/android/media/AudioDevicePortConfig.java index 69fd82be179b..51b8037b82f8 100644 --- a/media/java/android/media/AudioDevicePortConfig.java +++ b/media/java/android/media/AudioDevicePortConfig.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * An AudioDevicePortConfig describes a possible configuration of an output or input device @@ -29,7 +28,7 @@ import android.os.Build; */ public class AudioDevicePortConfig extends AudioPortConfig { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioDevicePortConfig(AudioDevicePort devicePort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)devicePort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 1d06e2837841..8a60bdebbf09 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -21,7 +21,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -686,7 +685,7 @@ public final class AudioFormat implements Parcelable { */ // Update sound trigger JNI in core/jni/android_hardware_SoundTrigger.cpp when modifying this // constructor - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AudioFormat(int encoding, int sampleRate, int channelMask, int channelIndexMask) { this( AUDIO_FORMAT_HAS_PROPERTY_ENCODING @@ -745,11 +744,11 @@ public final class AudioFormat implements Parcelable { // This is an immutable class, all member variables are final. // Essential values. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mEncoding; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mSampleRate; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mChannelMask; private final int mChannelIndexMask; private final int mPropertySetMask; diff --git a/media/java/android/media/AudioGain.java b/media/java/android/media/AudioGain.java index 98dc06a6a996..cae1b59d46a7 100644 --- a/media/java/android/media/AudioGain.java +++ b/media/java/android/media/AudioGain.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * The AudioGain describes a gain controller. Gain controllers are exposed by @@ -72,7 +71,7 @@ public class AudioGain { // The channel mask passed to the constructor is as specified in AudioFormat // (e.g. AudioFormat.CHANNEL_OUT_STEREO) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioGain(int index, int mode, int channelMask, int minValue, int maxValue, int defaultValue, int stepValue, int rampDurationMinMs, int rampDurationMaxMs) { diff --git a/media/java/android/media/AudioHandle.java b/media/java/android/media/AudioHandle.java index ce51b5a33a9a..8fc834f8d0a9 100644 --- a/media/java/android/media/AudioHandle.java +++ b/media/java/android/media/AudioHandle.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * The AudioHandle is used by the audio framework implementation to @@ -29,7 +28,7 @@ class AudioHandle { @UnsupportedAppUsage private final int mId; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioHandle(int id) { mId = id; } diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 29477366379b..8b28cc45fda2 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -709,7 +709,7 @@ public class AudioManager { * @hide * For test purposes only, will throw NPE with some methods that require a Context. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public AudioManager() { } @@ -959,7 +959,7 @@ public class AudioManager { * @see #setRingerMode(int) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isValidRingerMode(int ringerMode) { if (ringerMode < 0 || ringerMode > RINGER_MODE_MAX) { return false; @@ -2478,7 +2478,7 @@ public class AudioManager { * @see #stopBluetoothSco() * @see #ACTION_SCO_AUDIO_STATE_UPDATED */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void startBluetoothScoVirtualCall() { final IAudioService service = getService(); try { @@ -2630,7 +2630,7 @@ public class AudioManager { * @param on set true to mute the microphone; * false to turn mute off */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setMicrophoneMuteFromSwitch(boolean on) { final IAudioService service = getService(); try { @@ -2890,7 +2890,7 @@ public class AudioManager { * display). Note that BT audio sinks are not considered remote devices. * @return true if {@link AudioManager#STREAM_MUSIC} is active on a remote device */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isMusicActiveRemotely() { return AudioSystem.isStreamActiveRemotely(STREAM_MUSIC, 0); } @@ -3041,7 +3041,7 @@ public class AudioManager { /** * @hide Number of sound effects */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int NUM_SOUND_EFFECTS = 10; /** @@ -3875,7 +3875,7 @@ public class AudioManager { * @param durationHint the type of focus request. AUDIOFOCUS_GAIN_TRANSIENT is recommended so * media applications resume after a call */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void requestAudioFocusForCall(int streamType, int durationHint) { final IAudioService service = getService(); try { @@ -3979,7 +3979,7 @@ public class AudioManager { * when ringing ends and the call is rejected or not answered. * Should match one or more calls to {@link #requestAudioFocusForCall(int, int)}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void abandonAudioFocusForCall() { final IAudioService service = getService(); try { @@ -4715,7 +4715,7 @@ public class AudioManager { * agent when audio settings are restored and causes the AudioService * to read and apply restored settings. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void reloadAudioSettings() { final IAudioService service = getService(); try { diff --git a/media/java/android/media/AudioMixPort.java b/media/java/android/media/AudioMixPort.java index 0e286b0f1f89..33d603f0b9da 100644 --- a/media/java/android/media/AudioMixPort.java +++ b/media/java/android/media/AudioMixPort.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * The AudioMixPort is a specialized type of AudioPort @@ -33,7 +32,7 @@ public class AudioMixPort extends AudioPort { private final int mIoHandle; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioMixPort(AudioHandle handle, int ioHandle, int role, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -54,7 +53,7 @@ public class AudioMixPort extends AudioPort { /** * Get the device type (e.g AudioManager.DEVICE_OUT_SPEAKER) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int ioHandle() { return mIoHandle; } diff --git a/media/java/android/media/AudioMixPortConfig.java b/media/java/android/media/AudioMixPortConfig.java index 483524a8c168..9d8120624a45 100644 --- a/media/java/android/media/AudioMixPortConfig.java +++ b/media/java/android/media/AudioMixPortConfig.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * An AudioMixPortConfig describes a possible configuration of an output or input mixer. @@ -29,7 +28,7 @@ import android.os.Build; public class AudioMixPortConfig extends AudioPortConfig { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioMixPortConfig(AudioMixPort mixPort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)mixPort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioPatch.java b/media/java/android/media/AudioPatch.java index 99663bf3aab8..e5107d4e3309 100644 --- a/media/java/android/media/AudioPatch.java +++ b/media/java/android/media/AudioPatch.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** @@ -37,7 +36,7 @@ public class AudioPatch { private final AudioPortConfig[] mSources; private final AudioPortConfig[] mSinks; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioPatch(AudioHandle patchHandle, AudioPortConfig[] sources, AudioPortConfig[] sinks) { mHandle = patchHandle; mSources = sources; diff --git a/media/java/android/media/AudioPort.java b/media/java/android/media/AudioPort.java index e6dc622a11c1..7c3ca24e1c9a 100644 --- a/media/java/android/media/AudioPort.java +++ b/media/java/android/media/AudioPort.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * An audio port is a node of the audio framework or hardware that can be connected to or @@ -83,7 +82,7 @@ public class AudioPort { @UnsupportedAppUsage private AudioPortConfig mActiveConfig; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage AudioPort(AudioHandle handle, int role, String name, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -114,7 +113,7 @@ public class AudioPort { /** * Get the audio port role */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int role() { return mRole; } diff --git a/media/java/android/media/AudioPortConfig.java b/media/java/android/media/AudioPortConfig.java index 4dd3cb699a7d..16fb5b80eb3e 100644 --- a/media/java/android/media/AudioPortConfig.java +++ b/media/java/android/media/AudioPortConfig.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * An AudioPortConfig contains a possible configuration of an audio port chosen @@ -51,7 +50,7 @@ public class AudioPortConfig { static final int CHANNEL_MASK = 0x2; static final int FORMAT = 0x4; static final int GAIN = 0x8; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mConfigMask; @UnsupportedAppUsage diff --git a/media/java/android/media/AudioPortEventHandler.java b/media/java/android/media/AudioPortEventHandler.java index 763eb2944d19..8e8dfaf24b9a 100644 --- a/media/java/android/media/AudioPortEventHandler.java +++ b/media/java/android/media/AudioPortEventHandler.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -55,7 +54,7 @@ class AudioPortEventHandler { * Accessed by native methods: JNI Callback context. */ @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mJniCallback; void init() { @@ -179,7 +178,7 @@ class AudioPortEventHandler { } @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(Object module_ref, int what, int arg1, int arg2, Object obj) { AudioPortEventHandler eventHandler = diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 07c8ee514e07..c9cdbb0ed277 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -30,7 +30,6 @@ import android.media.audiopolicy.AudioMix; import android.media.audiopolicy.AudioPolicy; import android.media.projection.MediaProjection; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -175,14 +174,14 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, * Accessed by native methods: provides access to the callback data. */ @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeCallbackCookie; /** * Accessed by native methods: provides access to the JNIDeviceCallback instance. */ @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeDeviceCallback; @@ -262,7 +261,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, /** * AudioAttributes */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AudioAttributes mAudioAttributes; private boolean mIsSubmixFullVolume = false; @@ -1966,7 +1965,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(Object audiorecord_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/AudioRecordingConfiguration.java b/media/java/android/media/AudioRecordingConfiguration.java index 6febabe0aefc..42841d178401 100644 --- a/media/java/android/media/AudioRecordingConfiguration.java +++ b/media/java/android/media/AudioRecordingConfiguration.java @@ -23,7 +23,6 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.audiofx.AudioEffect; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -223,7 +222,7 @@ public final class AudioRecordingConfiguration implements Parcelable { *
When called without the permission, the result is an empty string. * @return the package name */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getClientPackageName() { return mClientPackageName; } /** diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 39bdf9557595..279ba0a55be0 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -25,7 +25,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.media.audiofx.AudioEffect; import android.media.audiopolicy.AudioMix; -import android.os.Build; import android.telephony.TelephonyManager; import android.util.Log; import android.util.Pair; @@ -84,7 +83,7 @@ public class AudioSystem public static final int STREAM_BLUETOOTH_SCO = 6; /** @hide Used to identify the volume of audio streams for enforced system sounds in certain * countries (e.g camera in Japan) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int STREAM_SYSTEM_ENFORCED = 7; /** @hide Used to identify the volume of audio streams for DTMF tones */ public static final int STREAM_DTMF = 8; @@ -597,7 +596,7 @@ public class AudioSystem } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void dynamicPolicyCallbackFromNative(int event, String regId, int val) { DynamicPolicyCallback cb; @@ -674,7 +673,7 @@ public class AudioSystem * @param effects * @param activeSource */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void recordingCallbackFromNative(int event, int riid, int uid, int session, int source, int portId, boolean silenced, int[] recordingFormat, AudioEffect.Descriptor[] clientEffects, AudioEffect.Descriptor[] effects, @@ -1499,7 +1498,7 @@ public class AudioSystem @UnsupportedAppUsage public static native int setMasterMute(boolean mute); /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static native boolean getMasterMute(); /** @hide */ @UnsupportedAppUsage diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index b2c2c4b1bbb4..fa6a4ff5af67 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -27,7 +27,6 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -580,7 +579,7 @@ public class AudioTrack extends PlayerBase * the native AudioTrack object, but not stored in it). */ @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mJniData; @@ -876,7 +875,7 @@ public class AudioTrack extends PlayerBase /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ void deferred_connect(long nativeTrackInJavaObj) { if (mState != STATE_INITIALIZED) { // Note that for this native_setup, we are providing an already created/initialized @@ -4013,7 +4012,7 @@ public class AudioTrack extends PlayerBase // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(Object audiotrack_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index 06bf5f70d9ec..45f1ca044afb 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -565,7 +565,7 @@ public class CamcorderProfile // Methods implemented by JNI @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native final void native_init(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native final CamcorderProfile native_get_camcorder_profile( int cameraId, int quality); private static native final boolean native_has_camcorder_profile( diff --git a/media/java/android/media/EncoderCapabilities.java b/media/java/android/media/EncoderCapabilities.java index 768b6431f1a9..67ce0f7cc0b9 100644 --- a/media/java/android/media/EncoderCapabilities.java +++ b/media/java/android/media/EncoderCapabilities.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.util.ArrayList; import java.util.List; @@ -45,19 +44,19 @@ public class EncoderCapabilities */ static public class VideoEncoderCap { // These are not modifiable externally, thus are public accessible - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int mCodec; // @see android.media.MediaRecorder.VideoEncoder public final int mMinBitRate; // min bit rate (bps) public final int mMaxBitRate; // max bit rate (bps) public final int mMinFrameRate; // min frame rate (fps) public final int mMaxFrameRate; // max frame rate (fps) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int mMinFrameWidth; // min frame width (pixel) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int mMaxFrameWidth; // max frame width (pixel) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int mMinFrameHeight; // min frame height (pixel) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int mMaxFrameHeight; // max frame height (pixel) // Private constructor called by JNI @@ -135,7 +134,7 @@ public class EncoderCapabilities * Returns the capabilities of the supported video encoders. * @see android.media.EncoderCapabilities.VideoEncoderCap */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static List getVideoEncoders() { int nEncoders = native_get_num_video_encoders(); if (nEncoders == 0) return null; diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 5c012bef9a68..47e60000cd04 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -79,7 +79,7 @@ interface IAudioService { void adjustStreamVolume(int streamType, int direction, int flags, String callingPackage); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setStreamVolume(int streamType, int index, int flags, String callingPackage); oneway void handleVolumeKey(in KeyEvent event, boolean isOnTv, diff --git a/media/java/android/media/IRemoteDisplayCallback.aidl b/media/java/android/media/IRemoteDisplayCallback.aidl index 75813c9ba593..584417d65121 100644 --- a/media/java/android/media/IRemoteDisplayCallback.aidl +++ b/media/java/android/media/IRemoteDisplayCallback.aidl @@ -22,6 +22,6 @@ import android.media.RemoteDisplayState; * {@hide} */ oneway interface IRemoteDisplayCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onStateChanged(in RemoteDisplayState state); } diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java index 875c6f52d9b2..84ee09b35b81 100644 --- a/media/java/android/media/JetPlayer.java +++ b/media/java/android/media/JetPlayer.java @@ -19,7 +19,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetFileDescriptor; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -131,7 +130,7 @@ public class JetPlayer * Accessed by native methods: provides access to C++ JetPlayer object */ @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativePlayerInJavaObj; @@ -565,7 +564,7 @@ public class JetPlayer // Called exclusively by native code //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void postEventFromNative(Object jetplayer_ref, int what, int arg1, int arg2) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java index 9976fa11d177..78eeca1ccc05 100644 --- a/media/java/android/media/MediaMetadata.java +++ b/media/java/android/media/MediaMetadata.java @@ -26,7 +26,6 @@ import android.media.browse.MediaBrowser; import android.media.session.MediaController; import android.media.session.MediaSession; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -651,7 +650,7 @@ public final class MediaMetadata implements Parcelable { * @return The key used by this class or null if no mapping exists * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String getKeyFromMetadataEditorKey(int editorKey) { return EDITOR_KEY_MAPPING.get(editorKey, null); } diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index ac19c21ae085..54675d018038 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.media.MediaCodec.BufferInfo; -import android.os.Build; import dalvik.system.CloseGuard; @@ -287,10 +286,10 @@ final public class MediaMuxer { public @interface Format {} // All the native functions are listed here. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native long nativeSetup(@NonNull FileDescriptor fd, int format) throws IllegalArgumentException, IOException; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static native void nativeRelease(long nativeObject); private static native void nativeStart(long nativeObject); private static native void nativeStop(long nativeObject); @@ -304,22 +303,22 @@ final public class MediaMuxer { int offset, int size, long presentationTimeUs, @MediaCodec.BufferFlag int flags); // Muxer internal states. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int MUXER_STATE_UNINITIALIZED = -1; private static final int MUXER_STATE_INITIALIZED = 0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int MUXER_STATE_STARTED = 1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int MUXER_STATE_STOPPED = 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mState = MUXER_STATE_UNINITIALIZED; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final CloseGuard mCloseGuard = CloseGuard.get(); private int mLastTrackIndex = -1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeObject; private String convertMuxerStateCodeToString(int aState) { diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 42e39101de13..47d276a50034 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -31,7 +31,6 @@ import android.graphics.SurfaceTexture; import android.media.SubtitleController.Anchor; import android.media.SubtitleTrack.RenderingWidget; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.FileUtils; import android.os.Handler; @@ -1153,7 +1152,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, headers, null); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void setDataSource(String path, Map headers, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -1174,7 +1173,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, keys, values, cookies); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void setDataSource(String path, String[] keys, String[] values, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -4411,7 +4410,7 @@ public class MediaPlayer extends PlayerBase * JAVA framework to avoid triggering track scanning. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int MEDIA_INFO_EXTERNAL_METADATA_UPDATE = 803; /** Informs that audio is not playing. Note that playback of the video @@ -4431,7 +4430,7 @@ public class MediaPlayer extends PlayerBase * * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int MEDIA_INFO_TIMED_TEXT_ERROR = 900; /** Subtitle track was not supported by the media framework. diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index c61a2eb02921..1db02beaea1a 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -108,7 +108,7 @@ public class MediaRecorder implements AudioRouting, private long mNativeContext; @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Surface mSurface; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 4940c7647dbc..4d87fb3fa81f 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -846,7 +846,7 @@ public class MediaRouter { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RouteInfo getSelectedRoute() { return getSelectedRoute(ROUTE_TYPE_ANY); } @@ -1776,7 +1776,7 @@ public class MediaRouter { return getName(context.getResources()); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage CharSequence getName(Resources res) { if (mNameResId != 0) { return res.getText(mNameResId); diff --git a/media/java/android/media/MicrophoneInfo.java b/media/java/android/media/MicrophoneInfo.java index 9e2e25fa1a7f..acd284f3fad9 100644 --- a/media/java/android/media/MicrophoneInfo.java +++ b/media/java/android/media/MicrophoneInfo.java @@ -19,7 +19,6 @@ package android.media; import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.Pair; import java.lang.annotation.Retention; @@ -165,7 +164,7 @@ public final class MicrophoneInfo { private int mType; private int mDirectionality; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage MicrophoneInfo(String deviceId, int type, String address, int location, int group, int indexInTheGroup, Coordinate3F position, Coordinate3F orientation, List> frequencyResponse, diff --git a/media/java/android/media/PlaybackParams.java b/media/java/android/media/PlaybackParams.java index 080b9a4513ee..f24f831d0333 100644 --- a/media/java/android/media/PlaybackParams.java +++ b/media/java/android/media/PlaybackParams.java @@ -87,23 +87,23 @@ public final class PlaybackParams implements Parcelable { public static final int AUDIO_STRETCH_MODE_VOICE = 1; // flags to indicate which params are actually set - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int SET_SPEED = 1 << 0; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int SET_PITCH = 1 << 1; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int SET_AUDIO_FALLBACK_MODE = 1 << 2; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final int SET_AUDIO_STRETCH_MODE = 1 << 3; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSet = 0; // params - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mAudioFallbackMode = AUDIO_FALLBACK_MODE_DEFAULT; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mAudioStretchMode = AUDIO_STRETCH_MODE_DEFAULT; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mPitch = 1.0f; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private float mSpeed = 1.0f; diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 60a00529cb5d..c5fd3c30236d 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -24,7 +24,6 @@ import android.graphics.Bitmap; import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.PlaybackState; -import android.os.Build; import android.os.Bundle; import android.os.Looper; import android.os.SystemClock; @@ -817,7 +816,7 @@ import android.util.Log; * position updates. The playback position being "readable" is considered from the application's * point of view. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int MEDIA_POSITION_READABLE = 1 << 0; /** * @hide @@ -825,7 +824,7 @@ import android.util.Log; * playback position updates. The playback position being "writable" * is considered from the application's point of view. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int MEDIA_POSITION_WRITABLE = 1 << 1; /** @hide */ diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java index 00fc2757a702..35cfaca8562a 100644 --- a/media/java/android/media/RemoteController.java +++ b/media/java/android/media/RemoteController.java @@ -26,7 +26,6 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -79,7 +78,7 @@ import java.util.List; private int mArtworkHeight = -1; private boolean mEnabled = true; // synchronized on mInfoLock, for USE_SESSION apis. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private MediaController mCurrentSession; /** diff --git a/media/java/android/media/RemoteDisplay.java b/media/java/android/media/RemoteDisplay.java index 2a0e54d1b767..e529af9da935 100644 --- a/media/java/android/media/RemoteDisplay.java +++ b/media/java/android/media/RemoteDisplay.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.view.Surface; @@ -128,7 +127,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void notifyDisplayConnected(final Surface surface, final int width, final int height, final int flags, final int session) { mHandler.post(new Runnable() { @@ -140,7 +139,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void notifyDisplayDisconnected() { mHandler.post(new Runnable() { @Override @@ -151,7 +150,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private void notifyDisplayError(final int error) { mHandler.post(new Runnable() { @Override diff --git a/media/java/android/media/RemoteDisplayState.java b/media/java/android/media/RemoteDisplayState.java index 370f5b1326f8..fed361a960e6 100644 --- a/media/java/android/media/RemoteDisplayState.java +++ b/media/java/android/media/RemoteDisplayState.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -42,10 +41,10 @@ public final class RemoteDisplayState implements Parcelable { /** * A list of all remote displays. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final ArrayList displays; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RemoteDisplayState() { displays = new ArrayList(); } diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index bd783ce9f6b2..d02b49697821 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -26,7 +26,6 @@ import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; import android.os.Binder; -import android.os.Build; import android.os.RemoteException; import android.provider.MediaStore; import android.provider.MediaStore.MediaColumns; @@ -74,7 +73,7 @@ public class Ringtone { private final IRingtonePlayer mRemotePlayer; private final Binder mRemoteToken; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private MediaPlayer mLocalPlayer; private final MyOnCompletionListener mCompletionListener = new MyOnCompletionListener(); diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index e2e13b048cf7..9deeb8fbab16 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -36,7 +36,6 @@ import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.database.StaleDataException; import android.net.Uri; -import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.IBinder; @@ -586,7 +585,7 @@ public class RingtoneManager { return new ExternalRingtonesCursorWrapper(res, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Cursor getMediaRingtones(Context context) { // MediaStore now returns ringtones on other storage devices, even when // we don't have storage or audio permissions @@ -729,7 +728,7 @@ public class RingtoneManager { * @param volumeShaperConfig config for volume shaper of the ringtone if applied. * @see #getRingtone(Context, Uri) */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static Ringtone getRingtone( final Context context, Uri ringtoneUri, int streamType, @Nullable VolumeShaper.Configuration volumeShaperConfig) { diff --git a/media/java/android/media/TimedText.java b/media/java/android/media/TimedText.java index fd615472903d..120642a8e7cb 100644 --- a/media/java/android/media/TimedText.java +++ b/media/java/android/media/TimedText.java @@ -18,7 +18,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Rect; -import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -737,7 +736,7 @@ public final class TimedText * List of CharPos, Karaoke, Font, Style, and HyperText, or 3) an instance of * Justification. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Object getObject(final int key) { if (containsKey(key)) { return mKeyObjectMap.get(key); diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index 140e70d32c78..cc114a9092e1 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -17,7 +17,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; @@ -896,6 +895,6 @@ public class ToneGenerator protected void finalize() { native_finalize(); } @SuppressWarnings("unused") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private long mNativeContext; // accessed by native methods } diff --git a/media/java/android/media/TtmlRenderer.java b/media/java/android/media/TtmlRenderer.java index 3a6c3909bbaf..e5782642f4eb 100644 --- a/media/java/android/media/TtmlRenderer.java +++ b/media/java/android/media/TtmlRenderer.java @@ -18,7 +18,6 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; @@ -50,7 +49,7 @@ public class TtmlRenderer extends SubtitleController.Renderer { private TtmlRenderingWidget mRenderingWidget; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TtmlRenderer(Context context) { mContext = context; } diff --git a/media/java/android/media/VolumeShaper.java b/media/java/android/media/VolumeShaper.java index df8d08e8e846..99dfe1e8e32f 100644 --- a/media/java/android/media/VolumeShaper.java +++ b/media/java/android/media/VolumeShaper.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -414,23 +413,23 @@ public final class VolumeShaper implements AutoCloseable { */ // type of VolumeShaper - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mType; // valid when mType is TYPE_ID - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mId; // valid when mType is TYPE_SCALE - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mOptionFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final double mDurationMs; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mInterpolatorType; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final float[] mTimes; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final float[] mVolumes; @Override @@ -573,7 +572,7 @@ public final class VolumeShaper implements AutoCloseable { * Direct constructor for VolumeShaper. * Use the Builder instead. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Configuration(@Type int type, int id, @OptionFlag int optionFlags, @@ -1133,11 +1132,11 @@ public final class VolumeShaper implements AutoCloseable { private static final int FLAG_PUBLIC_ALL = FLAG_REVERSE | FLAG_TERMINATE; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mReplaceId; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final float mXOffset; @Override @@ -1199,7 +1198,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Operation(@Flag int flags, int replaceId, float xOffset) { mFlags = flags; mReplaceId = replaceId; @@ -1359,9 +1358,9 @@ public final class VolumeShaper implements AutoCloseable { * Not for public use. */ public static final class State implements Parcelable { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mVolume; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private float mXOffset; @Override @@ -1412,7 +1411,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage /* package */ State(float volume, float xOffset) { mVolume = volume; mXOffset = xOffset; diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index 67a4a4b1f851..f4fd1fca2ff9 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -914,7 +914,7 @@ public class AudioEffect { * In case of success, the returns the number of meaningful integers in value array. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getParameter(int[] param, int[] value) throws IllegalStateException { if (param.length > 2 || value.length > 2) { @@ -983,7 +983,7 @@ public class AudioEffect { * @see #getParameter(byte[], byte[]) * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getParameter(int[] param, byte[] value) throws IllegalStateException { if (param.length > 2) { diff --git a/media/java/android/media/audiopolicy/AudioMix.java b/media/java/android/media/audiopolicy/AudioMix.java index 221147dcad8f..4e451c6e42b1 100644 --- a/media/java/android/media/audiopolicy/AudioMix.java +++ b/media/java/android/media/audiopolicy/AudioMix.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioSystem; -import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -35,24 +34,24 @@ import java.util.Objects; @SystemApi public class AudioMix { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AudioMixingRule mRule; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AudioFormat mFormat; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mRouteFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mMixType = MIX_TYPE_INVALID; // written by AudioPolicy int mMixState = MIX_STATE_DISABLED; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mCallbackFlags; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage String mDeviceAddress; // initialized in constructor, read by AudioPolicyConfig - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final int mDeviceSystemType; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_* /** diff --git a/media/java/android/media/audiopolicy/AudioMixingRule.java b/media/java/android/media/audiopolicy/AudioMixingRule.java index de153135eeb9..f6f982a4ebe2 100644 --- a/media/java/android/media/audiopolicy/AudioMixingRule.java +++ b/media/java/android/media/audiopolicy/AudioMixingRule.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioAttributes; -import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -110,11 +109,11 @@ public class AudioMixingRule { /** @hide */ public static final class AudioMixMatchCriterion { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final AudioAttributes mAttr; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final int mIntProp; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage final int mRule; /** input parameters must be valid */ @@ -200,13 +199,13 @@ public class AudioMixingRule { private final int mTargetMixType; int getTargetMixType() { return mTargetMixType; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final ArrayList mCriteria; /** @hide */ public ArrayList getCriteria() { return mCriteria; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mAllowPrivilegedPlaybackCapture = false; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private boolean mVoiceCommunicationCaptureAllowed = false; /** @hide */ diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index 14b236890e4a..f582d2addf17 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -33,7 +33,6 @@ import android.media.VolumeProvider; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.net.Uri; import android.os.BadParcelableException; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -1391,7 +1390,7 @@ public final class MediaSession { public static final int UNKNOWN_ID = -1; private final MediaDescription mDescription; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final long mId; /** diff --git a/media/java/android/media/soundtrigger/SoundTriggerDetector.java b/media/java/android/media/soundtrigger/SoundTriggerDetector.java index 0a1eefae59d6..16a517b72119 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerDetector.java +++ b/media/java/android/media/soundtrigger/SoundTriggerDetector.java @@ -28,7 +28,6 @@ import android.hardware.soundtrigger.SoundTrigger; import android.hardware.soundtrigger.SoundTrigger.ModuleProperties; import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; import android.media.AudioFormat; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -193,7 +192,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public byte[] getData() { if (!mTriggerAvailable) { return mData; @@ -221,7 +220,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Integer getCaptureSession() { if (mCaptureAvailable) { return mCaptureSession; diff --git a/media/java/android/media/soundtrigger/SoundTriggerManager.java b/media/java/android/media/soundtrigger/SoundTriggerManager.java index 00e3bcebd0f3..0ff8d9e96220 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerManager.java +++ b/media/java/android/media/soundtrigger/SoundTriggerManager.java @@ -38,7 +38,6 @@ import android.media.permission.ClearCallingIdentityContext; import android.media.permission.Identity; import android.media.permission.SafeCloseable; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.ParcelUuid; @@ -383,7 +382,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int stopRecognition(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; @@ -400,7 +399,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int unloadSoundModel(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 195ad5bc10f9..377b2bc19c6b 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -38,7 +38,6 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiUtils; import android.hardware.hdmi.HdmiUtils.HdmiAddressRelativePosition; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -327,7 +326,7 @@ public final class TvInputInfo implements Parcelable { * Returns the component of the service that implements this TV input. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ComponentName getComponent() { return new ComponentName(mService.serviceInfo.packageName, mService.serviceInfo.name); } diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 945fb3bff936..95c4f2a025d7 100755 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -34,7 +34,6 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.media.PlaybackParams; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -407,7 +406,7 @@ public abstract class TvInputService extends Service { private OverlayViewCleanUpTask mOverlayViewCleanUpTask; private boolean mOverlayViewEnabled; private IBinder mWindowToken; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private Rect mOverlayFrame; private long mStartPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; private long mCurrentPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index ee70714ce763..1386cba5f9ca 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -32,7 +32,6 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -88,7 +87,7 @@ public abstract class MediaBrowserService extends Service { * A key for passing the MediaItem to the ResultReceiver in getItem. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String KEY_MEDIA_ITEM = "media_item"; private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 1 << 0; diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 80e64e01559a..90b46fd5901a 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -20,7 +20,6 @@ package android.opengl; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; -import android.os.Build; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -165,7 +164,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; /** * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static native EGLDisplay eglGetDisplay( long display_id ); diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index abdbd11828db..ea571c7311a1 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -17,7 +17,6 @@ package javax.microedition.khronos.egl; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; public interface EGL10 extends EGL { int EGL_SUCCESS = 0x3000; @@ -117,7 +116,7 @@ public interface EGL10 extends EGL { String eglQueryString(EGLDisplay display, int name); boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); /** @hide **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage boolean eglReleaseThread(); boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface); boolean eglTerminate(EGLDisplay display); diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index e47ec4b31700..df9d8019f28d 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -19,7 +19,6 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; -import android.os.Build; import android.os.Environment; import java.io.File; @@ -238,7 +237,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); String fontPath = Environment.getRootDirectory().getAbsolutePath(); diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 1a4d1fd5afbb..826225a70d86 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -17,7 +17,6 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.util.Vector; @@ -607,7 +606,7 @@ public class Mesh extends BaseObj { * channels are present in the mesh * **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TriangleMeshBuilder(RenderScript rs, int vtxSize, int flags) { mRS = rs; mVtxCount = 0; @@ -664,7 +663,7 @@ public class Mesh extends BaseObj { * @return this * **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TriangleMeshBuilder addVertex(float x, float y) { if (mVtxSize != 2) { throw new IllegalStateException("add mistmatch with declared components."); @@ -770,7 +769,7 @@ public class Mesh extends BaseObj { * * @return this **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public TriangleMeshBuilder addTriangle(int idx1, int idx2, int idx3) { if((idx1 >= mMaxIndex) || (idx1 < 0) || (idx2 >= mMaxIndex) || (idx2 < 0) || @@ -803,7 +802,7 @@ public class Mesh extends BaseObj { * accessible memory * **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Mesh create(boolean uploadToBufferObject) { Element.Builder b = new Element.Builder(mRS); b.add(Element.createVector(mRS, diff --git a/rs/java/android/renderscript/ProgramStore.java b/rs/java/android/renderscript/ProgramStore.java index 1952b8860033..7e61347ee218 100644 --- a/rs/java/android/renderscript/ProgramStore.java +++ b/rs/java/android/renderscript/ProgramStore.java @@ -17,7 +17,6 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** @@ -309,7 +308,7 @@ public class ProgramStore extends BaseObj { * * @param rs Context to which the program will belong. **/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ProgramStore BLEND_ALPHA_DEPTH_NONE(RenderScript rs) { if(rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH == null) { ProgramStore.Builder builder = new ProgramStore.Builder(rs); diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index 2983e6339d4b..aff2f0183a3b 100644 --- a/telecomm/java/android/telecom/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -27,7 +27,6 @@ import android.graphics.drawable.Drawable; import android.location.Country; import android.location.CountryDetector; import android.net.Uri; -import android.os.Build; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; @@ -187,7 +186,7 @@ public class CallerInfo { private boolean mIsVoiceMail; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CallerInfo() { // TODO: Move all the basic initialization here? mIsEmergency = false; @@ -348,7 +347,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, Uri contactRef) { CallerInfo info = null; ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context); @@ -375,7 +374,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, String number) { if (VDBG) Log.v(TAG, "getCallerInfo() based on number..."); @@ -396,7 +395,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, String number, int subId) { if (TextUtils.isEmpty(number)) { diff --git a/telecomm/java/android/telecom/Log.java b/telecomm/java/android/telecom/Log.java index 2a4fdcb1475d..a90d0532b721 100644 --- a/telecomm/java/android/telecom/Log.java +++ b/telecomm/java/android/telecom/Log.java @@ -102,7 +102,7 @@ public class Log { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void i(String prefix, String format, Object... args) { if (INFO) { android.util.Slog.i(TAG, buildMessage(prefix, format, args)); @@ -133,7 +133,7 @@ public class Log { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void w(String prefix, String format, Object... args) { if (WARN) { android.util.Slog.w(TAG, buildMessage(prefix, format, args)); diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index a28a999e8d19..7c6f1df972f3 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -191,7 +191,7 @@ interface ITelecomService { /** * @see TelecomServiceImpl#getCallState */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int getCallState(); /** diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index 96996a1ae8ac..c3cd01738b96 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -35,7 +35,6 @@ import android.content.pm.ServiceInfo; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; -import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.provider.Telephony; @@ -90,7 +89,7 @@ public final class SmsApplication { /** * Name of this SMS app for display. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mApplicationName; /** @@ -581,7 +580,7 @@ public final class SmsApplication { * Sets the specified package as the default SMS/MMS application. The caller of this method * needs to have permission to set AppOps and write to secure settings. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void setDefaultApplication(String packageName, Context context) { setDefaultApplicationAsUser(packageName, context, getIncomingUserId(context)); } @@ -850,7 +849,7 @@ public final class SmsApplication { sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static void configurePreferredActivity(PackageManager packageManager, ComponentName componentName) { // Add the four activity preferences we want to direct to this app. @@ -888,7 +887,7 @@ public final class SmsApplication { * Returns SmsApplicationData for this package if this package is capable of being set as the * default SMS application. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SmsApplicationData getSmsApplicationData(String packageName, Context context) { Collection applications = getApplicationCollection(context); return getApplicationForPackage(applications, packageName); @@ -960,7 +959,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to direct Respond Via Message intent to */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ComponentName getDefaultRespondViaMessageApplication(Context context, boolean updateIfNeeded) { int userId = getIncomingUserId(context); @@ -1061,7 +1060,7 @@ public final class SmsApplication { *

* Caller must pass in the correct user context if calling from a singleton service. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean shouldWriteMessageForPackage(String packageName, Context context) { return !isDefaultSmsApplication(context, packageName); } diff --git a/telephony/common/com/google/android/mms/ContentType.java b/telephony/common/com/google/android/mms/ContentType.java index 2aec86fe67e4..4a971dd34c8f 100644 --- a/telephony/common/com/google/android/mms/ContentType.java +++ b/telephony/common/com/google/android/mms/ContentType.java @@ -18,7 +18,6 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.util.ArrayList; @@ -177,17 +176,17 @@ public class ContentType { return (null != contentType) && sSupportedContentTypes.contains(contentType); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isSupportedImageType(String contentType) { return isImageType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isSupportedAudioType(String contentType) { return isAudioType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isSupportedVideoType(String contentType) { return isVideoType(contentType) && isSupportedType(contentType); } diff --git a/telephony/common/com/google/android/mms/MmsException.java b/telephony/common/com/google/android/mms/MmsException.java index db6d1d1e3d8a..24bceb37f590 100644 --- a/telephony/common/com/google/android/mms/MmsException.java +++ b/telephony/common/com/google/android/mms/MmsException.java @@ -18,7 +18,6 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; /** * A generic exception that is thrown by the Mms client. @@ -60,7 +59,7 @@ public class MmsException extends Exception { * @param message the detail message. * @param cause the cause. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MmsException(String message, Throwable cause) { super(message, cause); } diff --git a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java index 3eda60bfbf1f..8693385bb032 100644 --- a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java +++ b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -69,7 +68,7 @@ public class AcknowledgeInd extends GenericPdu { * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java index ca1f2ebeb044..8fb6a7545abf 100644 --- a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java +++ b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -54,7 +53,7 @@ public class DeliveryInd extends GenericPdu { * * @return the value */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public long getDate() { return mPduHeaders.getLongInteger(PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java index 8b01cb3c4405..8c0380f77cdd 100644 --- a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java +++ b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.Log; import java.io.ByteArrayOutputStream; @@ -238,7 +237,7 @@ public class EncodedStringValue implements Cloneable { /** * Extract an EncodedStringValue[] from a given String. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static EncodedStringValue[] extract(String src) { String[] values = src.split(";"); diff --git a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java index 45ba4819aa24..42a89c69e873 100644 --- a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java +++ b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -117,7 +116,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void addTo(EncodedStringValue value) { mPduHeaders.appendEncodedStringValue(value, PduHeaders.TO); } @@ -138,7 +137,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setPriority(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.PRIORITY); } @@ -158,7 +157,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * * @param value the value */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDate(long value) { mPduHeaders.setLongInteger(value, PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java index 16d83953e723..ebd81afc0173 100644 --- a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java +++ b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -73,7 +72,7 @@ public class NotifyRespInd extends GenericPdu { * @throws InvalidHeaderValueException if the value is invalid. * RuntimeException if an undeclared error occurs. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/PduBody.java b/telephony/common/com/google/android/mms/pdu/PduBody.java index e76738b5a42f..f7f285f653b9 100644 --- a/telephony/common/com/google/android/mms/pdu/PduBody.java +++ b/telephony/common/com/google/android/mms/pdu/PduBody.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -114,7 +113,7 @@ public class PduBody { * @param index index of the part to return * @return part at the specified index */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public PduPart removePart(int index) { return mParts.remove(index); } @@ -143,7 +142,7 @@ public class PduBody { * @param part the part object * @return index the index of the first occurrence of the part in this body */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPartIndex(PduPart part) { return mParts.indexOf(part); } diff --git a/telephony/common/com/google/android/mms/pdu/PduPart.java b/telephony/common/com/google/android/mms/pdu/PduPart.java index aead141634e8..8dd976b2569f 100644 --- a/telephony/common/com/google/android/mms/pdu/PduPart.java +++ b/telephony/common/com/google/android/mms/pdu/PduPart.java @@ -19,7 +19,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; -import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -165,7 +164,7 @@ public class PduPart { /** * @return The length of the data, if this object have data, else 0. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDataLength() { if(mPartData != null){ return mPartData.length; diff --git a/telephony/common/com/google/android/mms/pdu/SendReq.java b/telephony/common/com/google/android/mms/pdu/SendReq.java index 8b5a61701377..6e2f2da01791 100644 --- a/telephony/common/com/google/android/mms/pdu/SendReq.java +++ b/telephony/common/com/google/android/mms/pdu/SendReq.java @@ -18,7 +18,6 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.Log; import com.google.android.mms.InvalidHeaderValueException; @@ -151,7 +150,7 @@ public class SendReq extends MultimediaMessagePdu { * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCc(EncodedStringValue[] value) { mPduHeaders.setEncodedStringValues(value, PduHeaders.CC); } diff --git a/telephony/common/com/google/android/mms/util/AbstractCache.java b/telephony/common/com/google/android/mms/util/AbstractCache.java index 8b9ee43b0981..25862e73581e 100644 --- a/telephony/common/com/google/android/mms/util/AbstractCache.java +++ b/telephony/common/com/google/android/mms/util/AbstractCache.java @@ -18,7 +18,6 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.util.Log; import java.util.HashMap; @@ -65,7 +64,7 @@ public abstract class AbstractCache { return false; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public V get(K key) { if (LOCAL_LOGV) { Log.v(TAG, "Trying to get " + key + " from cache."); diff --git a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java index d0e33984e094..0f9390daa725 100644 --- a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java +++ b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java @@ -20,7 +20,6 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.drm.DrmManagerClient; -import android.os.Build; import android.util.Log; public class DownloadDrmHelper { @@ -74,7 +73,7 @@ public class DownloadDrmHelper { * Modifies the file extension for a DRM Forward Lock file NOTE: This * function shouldn't be called if the file shouldn't be DRM converted */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String modifyDrmFwLockFileExtension(String filename) { if (filename != null) { int extensionIndex; diff --git a/telephony/common/com/google/android/mms/util/SqliteWrapper.java b/telephony/common/com/google/android/mms/util/SqliteWrapper.java index e2d62f868d52..31fe4d7683d6 100644 --- a/telephony/common/com/google/android/mms/util/SqliteWrapper.java +++ b/telephony/common/com/google/android/mms/util/SqliteWrapper.java @@ -25,7 +25,6 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; -import android.os.Build; import android.util.Log; import android.widget.Toast; @@ -80,7 +79,7 @@ public final class SqliteWrapper { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean requery(Context context, Cursor cursor) { try { return cursor.requery(); diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 8ec500b4d49d..92e419707970 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.carrier.CarrierIdentifier; @@ -147,7 +146,7 @@ public final class EuiccProfileInfo implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public EuiccProfileInfo(String iccid, @Nullable UiccAccessRule[] accessRules, @Nullable String nickname) { if (!TextUtils.isDigitsOnly(iccid)) { diff --git a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java index 58e1d08a2009..2382f657c9ee 100644 --- a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java +++ b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java @@ -18,7 +18,6 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -51,7 +50,7 @@ public final class GetDefaultDownloadableSubscriptionListResult implements Parce * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java index 6417c0dfcf05..d0fb51180c1d 100644 --- a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java +++ b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java @@ -18,7 +18,6 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -48,7 +47,7 @@ public final class GetDownloadableSubscriptionMetadataResult implements Parcelab * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl index a55f019bec23..aff8f1b7b346 100644 --- a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IDeleteSubscriptionCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl index da26045be3ac..34b53cc71dfb 100644 --- a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl +++ b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IEraseSubscriptionsCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl index db73f8e0f0f4..ad69ef132428 100644 --- a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDefaultDownloadableSubscriptionListResult; /** @hide */ oneway interface IGetDefaultDownloadableSubscriptionListCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(in GetDefaultDownloadableSubscriptionListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl index 102ee3096c34..01f187ed11e2 100644 --- a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDownloadableSubscriptionMetadataResult; /** @hide */ oneway interface IGetDownloadableSubscriptionMetadataCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(in GetDownloadableSubscriptionMetadataResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEidCallback.aidl b/telephony/java/android/service/euicc/IGetEidCallback.aidl index c47cf13f75c6..e405a981c85a 100644 --- a/telephony/java/android/service/euicc/IGetEidCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEidCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IGetEidCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onSuccess(String eid); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl index 291c058dfd2e..c0611825ff0f 100644 --- a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl @@ -20,6 +20,6 @@ import android.telephony.euicc.EuiccInfo; /** @hide */ oneway interface IGetEuiccInfoCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onSuccess(in EuiccInfo euiccInfo); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl index eadddb1193e8..0485f7be29d3 100644 --- a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetEuiccProfileInfoListResult; /** @hide */ oneway interface IGetEuiccProfileInfoListCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(in GetEuiccProfileInfoListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl index ade1ccdb6b06..340401fe89cb 100644 --- a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl +++ b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IRetainSubscriptionsForFactoryResetCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl index 1b4b658f6211..b8f984d1c28b 100644 --- a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface ISwitchToSubscriptionCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl index fda73497674c..0aa66978bb91 100644 --- a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl +++ b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IUpdateSubscriptionNicknameCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b806313e32f8..157609130c1b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -26,7 +26,6 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; -import android.os.Build; import android.os.PersistableBundle; import android.os.RemoteException; import android.service.carrier.CarrierService; @@ -2724,7 +2723,7 @@ public class CarrierConfigManager { * Key identifying if voice call barring notification is required to be shown to the user. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL = "disable_voice_barring_notification_bool"; diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index a3bec339794b..cfb9099a1c42 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -21,7 +21,6 @@ import static android.text.TextUtils.formatSimple; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; @@ -59,7 +58,7 @@ public final class CellIdentityGsm extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellIdentityGsm() { super(TAG, CellInfo.TYPE_GSM, null, null, null, null); mLac = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index bd92d00a0321..bbfab433be39 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -67,7 +67,7 @@ public final class CellIdentityLte extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellIdentityLte() { super(TAG, CellInfo.TYPE_LTE, null, null, null, null); mCi = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 3ce99facfdb1..1bef681619ed 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -36,7 +36,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { private CellSignalStrengthCdma mCellSignalStrengthCdma; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellInfoCdma() { super(); mCellIdentityCdma = new CellIdentityCdma(); diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index e296e613362a..c19521fdfa99 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -18,7 +18,6 @@ package android.telephony; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -36,7 +35,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { private CellSignalStrengthGsm mCellSignalStrengthGsm; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellInfoGsm() { super(); mCellIdentityGsm = new CellIdentityGsm(); diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 6f812341756b..320925ea63ae 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -39,7 +39,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { private CellConfigLte mCellConfig; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellInfoLte() { super(); mCellIdentityLte = new CellIdentityLte(); diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index 3ff859b55bdd..9d55f109f751 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java @@ -53,7 +53,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private int mLevel; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellSignalStrengthGsm() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index 47a8f72a2337..c26936e4bdd0 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/telephony/java/android/telephony/CellSignalStrengthLte.java @@ -18,7 +18,6 @@ package android.telephony; import android.annotation.IntRange; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; @@ -108,7 +107,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P private int mParametersUseForLevel; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public CellSignalStrengthLte() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java index 24dfbd028d03..d4ed860cdafd 100644 --- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java +++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java @@ -17,7 +17,6 @@ package android.telephony; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.text.Editable; import android.text.Selection; import android.text.TextWatcher; @@ -51,7 +50,7 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher { */ private boolean mStopFormatting; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private AsYouTypeFormatter mFormatter; /** diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index ed09d538a3b1..58e368bcc444 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -27,7 +27,6 @@ import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; -import android.os.Build; import android.os.PersistableBundle; import android.provider.Contacts; import android.provider.ContactsContract; @@ -1833,7 +1832,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public static boolean isPotentialEmergencyNumber(int subId, String number) { // Check against the emergency numbers listed by the RIL / SIM, @@ -2109,7 +2108,7 @@ public class PhoneNumberUtils { * @hide */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isPotentialLocalEmergencyNumber(Context context, String number) { return isPotentialLocalEmergencyNumber(context, getDefaultVoiceSubId(), number); } @@ -2139,7 +2138,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Deprecated public static boolean isPotentialLocalEmergencyNumber(Context context, int subId, String number) { diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index 9ea624b60988..fd9f46011c7e 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -73,7 +73,7 @@ public final class PreciseDataConnectionState implements Parcelable { */ @TestApi @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) // (maxTargetSdk = Build.VERSION_CODES.Q) + @UnsupportedAppUsage // (maxTargetSdk = Build.VERSION_CODES.Q) // FIXME: figure out how to remove the UnsupportedAppUsage and delete this constructor public PreciseDataConnectionState(@DataState int state, @NetworkType int networkType, diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index f1e90118a559..90ddf2cd4730 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -92,7 +92,7 @@ public class RadioAccessFamily implements Parcelable { * {@link TelephonyManager.NetworkTypeBitMask}. It's a bit mask value to represent the support * type. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public RadioAccessFamily(int phoneId, int radioAccessFamily) { mPhoneId = phoneId; mRadioAccessFamily = radioAccessFamily; @@ -103,7 +103,7 @@ public class RadioAccessFamily implements Parcelable { * * @return phone ID */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPhoneId() { return mPhoneId; } @@ -113,7 +113,7 @@ public class RadioAccessFamily implements Parcelable { * * @return radio access family */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @TelephonyManager.NetworkTypeBitMask int getRadioAccessFamily() { return mRadioAccessFamily; } @@ -168,7 +168,7 @@ public class RadioAccessFamily implements Parcelable { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @TelephonyManager.NetworkTypeBitMask public static int getRafFromNetworkType(@PrefNetworkMode int type) { switch (type) { diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 41b3ee672f46..3e7464739f9f 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -956,7 +956,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String rilRadioTechnologyToString(int rt) { String rtString; @@ -1167,7 +1167,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVoiceRegState(int state) { mVoiceRegState = state; if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setVoiceRegState=" + mVoiceRegState); @@ -1198,7 +1198,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setVoiceRoaming(boolean roaming) { setVoiceRoamingType(roaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1219,7 +1219,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDataRoaming(boolean dataRoaming) { setDataRoamingType(dataRoaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1291,7 +1291,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setOperatorAlphaLong(@Nullable String longName) { mOperatorAlphaLong = longName; } @@ -1476,7 +1476,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRilVoiceRadioTechnology() { NetworkRegistrationInfo wwanRegInfo = getNetworkRegistrationInfo( NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); @@ -1486,7 +1486,7 @@ public class ServiceState implements Parcelable { return RIL_RADIO_TECHNOLOGY_UNKNOWN; } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getRilDataRadioTechnology() { return networkTypeToRilRadioTechnology(getDataNetworkType()); } @@ -1763,7 +1763,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean bitmaskHasTech(int bearerBitmask, int radioTech) { if (bearerBitmask == 0) { return true; @@ -1849,7 +1849,7 @@ public class ServiceState implements Parcelable { * voice SS. The voice SS is only used if it is IN_SERVICE (otherwise the base SS is returned). * @hide * */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static ServiceState mergeServiceStates(ServiceState baseSs, ServiceState voiceSs) { if (voiceSs.mVoiceRegState != STATE_IN_SERVICE) { return baseSs; diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 964cf76d17f6..2b17de64dae9 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -591,7 +591,7 @@ public final class SmsManager { * @throws IllegalArgumentException if destinationAddress or text are empty * {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void sendTextMessage( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index cfb29f124b43..717a9b155cbf 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -29,7 +29,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Binder; -import android.os.Build; import android.text.TextUtils; import com.android.internal.telephony.GsmAlphabet; @@ -134,7 +133,7 @@ public class SmsMessage { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int mSubId = 0; /** set Subscription information @@ -1055,7 +1054,7 @@ public class SmsMessage { * * @return true if Cdma format should be used for MO SMS, false otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static boolean useCdmaFormatForMoSms(int subId) { SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId); if (!smsManager.isImsSmsSupported()) { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 6441565d731b..2547392d2c1f 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -32,7 +32,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Typeface; -import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -357,7 +356,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the name displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDisplayName(CharSequence name) { this.mDisplayName = name; } @@ -382,7 +381,7 @@ public class SubscriptionInfo implements Parcelable { * NAME_SOURCE_USER_INPUT. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getNameSource() { return this.mNameSource; } @@ -449,7 +448,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the color displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setIconTint(int iconTint) { this.mIconTint = iconTint; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 7f87019dbbe2..2e51ef16baf1 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -127,7 +127,7 @@ public class SubscriptionManager { public static final int MAX_SUBSCRIPTION_ID_VALUE = DEFAULT_SUBSCRIPTION_ID - 1; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Uri CONTENT_URI = SimInfo.CONTENT_URI; /** @hide */ @@ -1826,7 +1826,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int setDisplayNumber(String number, int subId) { if (number == null) { logd("[setDisplayNumber]- fail"); @@ -1844,7 +1844,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int setDataRoaming(int roaming, int subId) { if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId); return setSubscriptionPropertyHelper(subId, "setDataRoaming", @@ -1989,13 +1989,13 @@ public class SubscriptionManager { * @return the SubscriptionInfo for the default voice subscription. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SubscriptionInfo getDefaultVoiceSubscriptionInfo() { return getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId()); } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getDefaultVoicePhoneId() { return getPhoneId(getDefaultVoiceSubscriptionId()); } @@ -2047,7 +2047,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getDefaultSmsPhoneId() { return getPhoneId(getDefaultSmsSubscriptionId()); } @@ -2181,7 +2181,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean isValidPhoneId(int phoneId) { return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount(); } @@ -2200,7 +2200,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(EXTRA_SLOT_INDEX, phoneId); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a27170d476d0..aa68dcf5a88e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2807,7 +2807,7 @@ public class TelephonyManager { /** Current network is IWLAN */ public static final int NETWORK_TYPE_IWLAN = TelephonyProtoEnums.NETWORK_TYPE_IWLAN; // = 18. /** Current network is LTE_CA {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int NETWORK_TYPE_LTE_CA = TelephonyProtoEnums.NETWORK_TYPE_LTE_CA; // = 19. /** * Current network is NR (New Radio) 5G. @@ -6772,7 +6772,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean nvResetConfig(int resetType) { try { ITelephony telephony = getITelephony(); @@ -7041,7 +7041,7 @@ public class TelephonyManager { * @return The value at the given index of settings. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int getIntAtIndex(android.content.ContentResolver cr, String name, int index) throws android.provider.Settings.SettingNotFoundException { @@ -7074,7 +7074,7 @@ public class TelephonyManager { * @return true if the value was set, false on database errors * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static boolean putIntAtIndex(android.content.ContentResolver cr, String name, int index, int value) { String data = ""; @@ -7146,7 +7146,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static String getTelephonyProperty(String property, String defaultVal) { String propVal = SystemProperties.get(property); return TextUtils.isEmpty(propVal) ? defaultVal : propVal; @@ -7445,7 +7445,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable IImsRegistration getImsRegistration(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7465,7 +7465,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @Nullable IImsConfig getImsConfig(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7484,7 +7484,7 @@ public class TelephonyManager { * @param Registration state * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setImsRegistrationState(boolean registered) { try { ITelephony telephony = getITelephony(); @@ -8151,7 +8151,7 @@ public class TelephonyManager { * @deprecated Use {@link #setPreferredNetworkTypeBitmask} instead. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean setPreferredNetworkType(int subId, @PrefNetworkMode int networkType) { try { ITelephony telephony = getITelephony(); @@ -8525,7 +8525,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean setRoamingOverride(List gsmRoamingList, List gsmNonRoamingList, List cdmaRoamingList, List cdmaNonRoamingList) { @@ -9815,7 +9815,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setSimOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10187,7 +10187,7 @@ public class TelephonyManager { * @param name the alphabetic name of current registered operator. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setNetworkOperatorNameForPhone(int phoneId, String name) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10212,7 +10212,7 @@ public class TelephonyManager { * @param operator the numeric name (MCC+MNC) of current registered operator * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setNetworkOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10237,7 +10237,7 @@ public class TelephonyManager { * @param isRoaming is network in romaing state or not * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setNetworkRoamingForPhone(int phoneId, boolean isRoaming) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10266,7 +10266,7 @@ public class TelephonyManager { * @param type the network type currently in use on the device for data transmission * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setDataNetworkTypeForPhone(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( diff --git a/telephony/java/android/telephony/euicc/DownloadableSubscription.java b/telephony/java/android/telephony/euicc/DownloadableSubscription.java index 52b31d7f9611..23d46ba09599 100644 --- a/telephony/java/android/telephony/euicc/DownloadableSubscription.java +++ b/telephony/java/android/telephony/euicc/DownloadableSubscription.java @@ -19,7 +19,6 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.UiccAccessRule; @@ -62,7 +61,7 @@ public final class DownloadableSubscription implements Parcelable { */ @Nullable @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final String encodedActivationCode; @Nullable private String confirmationCode; @@ -192,7 +191,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setCarrierName(String carrierName) { this.carrierName = carrierName; } @@ -239,7 +238,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void setAccessRules(UiccAccessRule[] accessRules) { this.accessRules = Arrays.asList(accessRules); } diff --git a/telephony/java/android/telephony/euicc/EuiccInfo.java b/telephony/java/android/telephony/euicc/EuiccInfo.java index 08de2051975e..467d2689cd3c 100644 --- a/telephony/java/android/telephony/euicc/EuiccInfo.java +++ b/telephony/java/android/telephony/euicc/EuiccInfo.java @@ -17,7 +17,6 @@ package android.telephony.euicc; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -45,7 +44,7 @@ public final class EuiccInfo implements Parcelable { }; @Nullable - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final String osVersion; /** diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index 1c2cac27eb37..3f9c8d26ca91 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -129,26 +128,26 @@ public final class ImsCallForwardInfo implements Parcelable { public @interface TypeOfAddress{} /**@hide*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @CallForwardReasons int mCondition; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @CallForwardStatus int mStatus; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @TypeOfAddress int mToA; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @ImsSsData.ServiceClassFlags int mServiceClass; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String mNumber; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mTimeSeconds; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsCallForwardInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 5b54719afbfb..47a0ab61f970 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -357,10 +356,10 @@ public final class ImsCallProfile implements Parcelable { /** @hide */ public int mServiceType; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mCallType; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public @CallRestrictCause int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; /** @@ -468,10 +467,10 @@ public final class ImsCallProfile implements Parcelable { * a {@link android.os.Binder}. */ /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public Bundle mCallExtras; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsStreamMediaProfile mMediaProfile; /** @hide */ @@ -824,7 +823,7 @@ public final class ImsCallProfile implements Parcelable { * See {@link #presentationToOir(int)}. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int presentationToOIR(int presentation) { switch (presentation) { case PhoneConstants.PRESENTATION_RESTRICTED: diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index 184477af0b46..30389a290368 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -1353,7 +1353,7 @@ public final class ImsReasonInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsReasonInfo(int code, int extraCode) { mCode = code; mExtraCode = extraCode; diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index bc53b628131e..27b56b8c5b47 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -156,10 +155,10 @@ public final class ImsSsInfo implements Parcelable { // 0: disabled, 1: enabled /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mStatus; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String mIcbNum; /** @hide */ public int mProvisionStatus = SERVICE_PROVISIONING_UNKNOWN; @@ -167,7 +166,7 @@ public final class ImsSsInfo implements Parcelable { private int mClirOutgoingState = CLIR_OUTGOING_DEFAULT; /**@hide*/ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsSsInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index 2792f790e13b..131cb1a505fb 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -85,16 +84,16 @@ public final class ImsStreamMediaProfile implements Parcelable { // Audio related information /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mAudioQuality; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mAudioDirection; // Video related information /** @hide */ public int mVideoQuality; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mVideoDirection; // Rtt related information /** @hide */ @@ -165,7 +164,7 @@ public final class ImsStreamMediaProfile implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsStreamMediaProfile() { mAudioQuality = AUDIO_QUALITY_NONE; mAudioDirection = DIRECTION_SEND_RECEIVE; diff --git a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java index 64bdcbba265a..2fca4096f447 100644 --- a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java +++ b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java @@ -19,7 +19,6 @@ package android.telephony.ims; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -180,7 +179,7 @@ public abstract class ImsVideoCallProvider { * Returns binder object which can be used across IPC methods. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public final IImsVideoCallProvider getInterface() { return mBinder; } diff --git a/telephony/java/android/telephony/ims/compat/ImsService.java b/telephony/java/android/telephony/ims/compat/ImsService.java index 303ba183c12e..41d1d726b3f4 100644 --- a/telephony/java/android/telephony/ims/compat/ImsService.java +++ b/telephony/java/android/telephony/ims/compat/ImsService.java @@ -20,7 +20,6 @@ import android.annotation.Nullable; import android.app.Service; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; -import android.os.Build; import android.os.IBinder; import android.telephony.CarrierConfigManager; import android.telephony.ims.compat.feature.ImsFeature; @@ -87,7 +86,7 @@ public class ImsService extends Service { /** * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected final IBinder mImsServiceController = new IImsServiceController.Stub() { @Override @@ -123,7 +122,7 @@ public class ImsService extends Service { } }; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsService() { } diff --git a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java index 6038a18a28b1..5a9e8e2dafc4 100644 --- a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java @@ -19,7 +19,6 @@ package android.telephony.ims.compat.feature; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; -import android.os.Build; import android.os.IInterface; import android.os.RemoteException; import android.telephony.SubscriptionManager; @@ -79,12 +78,12 @@ public abstract class ImsFeature { mSlotId = slotId; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getFeatureState() { return mState; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected final void setFeatureState(@ImsState int state) { if (mState != state) { mState = state; diff --git a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java index d32e9b7f5122..b52c37106049 100644 --- a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java @@ -18,7 +18,6 @@ package android.telephony.ims.compat.feature; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.ims.ImsCallProfile; @@ -49,7 +48,7 @@ public class MMTelFeature extends ImsFeature { // Lock for feature synchronization private final Object mLock = new Object(); - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public MMTelFeature() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java index 4b8f39817f88..06aa6428b1b2 100755 --- a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java @@ -19,7 +19,6 @@ package android.telephony.ims.compat.stub; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.CallQuality; @@ -46,7 +45,7 @@ import com.android.ims.internal.IImsVideoCallProvider; public class ImsCallSessionImplBase extends IImsCallSession.Stub { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsCallSessionImplBase() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java index a8278ae0d734..0c7264697cd3 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java @@ -19,7 +19,6 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.RemoteException; import android.util.Log; @@ -60,7 +59,7 @@ public class ImsConfigImplBase { ImsConfigStub mImsConfigStub; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsConfigImplBase(Context context) { mImsConfigStub = new ImsConfigStub(this, context); } @@ -165,7 +164,7 @@ public class ImsConfigImplBase { public void setVideoQuality(int quality, ImsConfigListener listener) throws RemoteException { } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public IImsConfig getIImsConfig() { return mImsConfigStub; } /** diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java index c689460a5cec..ce291d4d14c6 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java @@ -17,7 +17,6 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.ImsCallForwardInfo; @@ -41,7 +40,7 @@ import com.android.ims.internal.IImsUtListener; public class ImsUtListenerImplBase extends IImsUtListener.Stub { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public ImsUtListenerImplBase() { } diff --git a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl index a4abfac74177..c140127237d4 100755 --- a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl +++ b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl @@ -26,17 +26,17 @@ import android.telephony.mbms.StreamingServiceInfo; */ interface IMbmsStreamingService { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int initialize(IMbmsStreamingSessionCallback callback, int subId); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int requestUpdateStreamingServices(int subId, in List serviceClasses); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage int startStreaming(int subId, String serviceId, IStreamingServiceCallback callback); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Uri getPlaybackUri(int subId, String serviceId); void stopStreaming(int subId, String serviceId); diff --git a/telephony/java/com/android/ims/ImsConfigListener.aidl b/telephony/java/com/android/ims/ImsConfigListener.aidl index df8144c15d77..4f229df252a6 100644 --- a/telephony/java/com/android/ims/ImsConfigListener.aidl +++ b/telephony/java/com/android/ims/ImsConfigListener.aidl @@ -47,7 +47,7 @@ oneway interface ImsConfigListener { * * @return void. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void onSetFeatureResponse(int feature, int network, int value, int status); /** diff --git a/telephony/java/com/android/ims/ImsUtInterface.java b/telephony/java/com/android/ims/ImsUtInterface.java index 5dfbce3dd65f..4a5380e4551b 100644 --- a/telephony/java/com/android/ims/ImsUtInterface.java +++ b/telephony/java/com/android/ims/ImsUtInterface.java @@ -17,7 +17,6 @@ package com.android.ims; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Handler; import android.os.Message; import android.telephony.ims.ImsCallForwardInfo; @@ -125,7 +124,7 @@ public interface ImsUtInterface { * Retrieves the configuration of the call forward. * The return value of ((AsyncResult)result.obj) is an array of {@link ImsCallForwardInfo}. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void queryCallForward(int condition, String number, Message result); /** diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 8afd85633322..1c62cc48093c 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -34,47 +34,47 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the basic session operation (setup / terminate). */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionProgressing(in IImsCallSession session, in ImsStreamMediaProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionStarted(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionStartFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionTerminated(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of the call hold/resume operation. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionHeld(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionHoldFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionHoldReceived(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionResumed(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionResumeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile); /** * Notifies the result of call merge operation. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionMergeStarted(in IImsCallSession session, in IImsCallSession newSession, in ImsCallProfile profile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionMergeComplete(in IImsCallSession session); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionMergeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of call upgrade / downgrade or any other call updates. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionUpdated(in IImsCallSession session, in ImsCallProfile profile); void callSessionUpdateFailed(in IImsCallSession session, @@ -95,9 +95,9 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the participant invitation / removal to/from the conference session. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionInviteParticipantsRequestDelivered(in IImsCallSession session); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionInviteParticipantsRequestFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); void callSessionRemoveParticipantsRequestDelivered(in IImsCallSession session); @@ -107,7 +107,7 @@ oneway interface IImsCallSessionListener { /** * Notifies the changes of the conference info. in the conference session. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionConferenceStateUpdated(in IImsCallSession session, in ImsConferenceState state); @@ -120,10 +120,10 @@ oneway interface IImsCallSessionListener { /** * Notifies of handover information for this call */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionHandover(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionHandoverFailed(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); void callSessionMayHandover(in IImsCallSession session, @@ -137,7 +137,7 @@ oneway interface IImsCallSessionListener { * - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO} * - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO} */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionTtyModeReceived(in IImsCallSession session, in int mode); /** @@ -146,13 +146,13 @@ oneway interface IImsCallSessionListener { * @param session The call session. * @param isMultiParty {@code true} if the session became multiparty, {@code false} otherwise. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionMultipartyStateChanged(in IImsCallSession session, in boolean isMultiParty); /** * Notifies the supplementary service information for the current session. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void callSessionSuppServiceReceived(in IImsCallSession session, in ImsSuppServiceNotification suppSrvNotification); diff --git a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl index 216b45c37458..a7a62a625478 100644 --- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl @@ -32,7 +32,7 @@ oneway interface IImsRegistrationListener { * * @deprecated see {@link registrationConnectedWithRadioTech} */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationConnected(); /** @@ -48,7 +48,7 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationConnectedWithRadioTech(int imsRadioTech); /** @@ -57,14 +57,14 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationProgressingWithRadioTech(int imsRadioTech); /** * Notifies the application when the device is disconnected from the IMS network. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationDisconnected(in ImsReasonInfo imsReasonInfo); /** @@ -98,7 +98,7 @@ oneway interface IImsRegistrationListener { * @param enabledFeatures features enabled as defined in com.android.ims.ImsConfig#FeatureConstants. * @param disabledFeatures features disabled as defined in com.android.ims.ImsConfig#FeatureConstants. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationFeatureCapabilityChanged(int serviceClass, in int[] enabledFeatures, in int[] disabledFeatures); @@ -106,13 +106,13 @@ oneway interface IImsRegistrationListener { * Updates the application with the waiting voice message count. * @param count The number of waiting voice messages. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void voiceMessageCountUpdate(int count); /** * Notifies the application when the list of URIs associated with IMS client is updated. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationAssociatedUriChanged(in Uri[] uris); /** @@ -123,6 +123,6 @@ oneway interface IImsRegistrationListener { * attempted. * @param imsReasonInfo Reason for the failure. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void registrationChangeFailed(in int targetAccessTech, in ImsReasonInfo imsReasonInfo); } diff --git a/telephony/java/com/android/ims/internal/IImsUtListener.aidl b/telephony/java/com/android/ims/internal/IImsUtListener.aidl index 604adf84817b..9a12ceee5212 100644 --- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl @@ -31,38 +31,38 @@ oneway interface IImsUtListener { /** * Notifies the result of the supplementary service configuration udpate. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationUpdated(in IImsUt ut, int id); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationUpdateFailed(in IImsUt ut, int id, in ImsReasonInfo error); /** * Notifies the result of the supplementary service configuration query. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationQueried(in IImsUt ut, int id, in Bundle ssInfo); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationQueryFailed(in IImsUt ut, int id, in ImsReasonInfo error); void lineIdentificationSupplementaryServiceResponse(int id, in ImsSsInfo config); /** * Notifies the status of the call barring supplementary service. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationCallBarringQueried(in IImsUt ut, int id, in ImsSsInfo[] cbInfo); /** * Notifies the status of the call forwarding supplementary service. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationCallForwardQueried(in IImsUt ut, int id, in ImsCallForwardInfo[] cfInfo); /** * Notifies the status of the call waiting supplementary service. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void utConfigurationCallWaitingQueried(in IImsUt ut, int id, in ImsSsInfo[] cwInfo); diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl index 5d575abda979..cf8d63794546 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl @@ -31,25 +31,25 @@ import android.telecom.VideoProfile; * {@hide} */ oneway interface IImsVideoCallCallback { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void receiveSessionModifyRequest(in VideoProfile videoProfile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void receiveSessionModifyResponse(int status, in VideoProfile requestedProfile, in VideoProfile responseProfile); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void handleCallSessionEvent(int event); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void changePeerDimensions(int width, int height); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void changeCallDataUsage(long dataUsage); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void changeCameraCapabilities(in VideoProfile.CameraCapabilities cameraCapabilities); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void changeVideoQuality(int videoQuality); } diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl index 44d83897390a..4d20bd675628 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl @@ -41,7 +41,7 @@ import com.android.ims.internal.IImsVideoCallCallback; * @hide */ oneway interface IImsVideoCallProvider { - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage void setCallback(IImsVideoCallCallback callback); void setCamera(String cameraId, int uid); diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl index 89620eaaf609..76ebc0f3ac2f 100644 --- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl @@ -24,7 +24,7 @@ import android.os.PersistableBundle; interface ICarrierConfigLoader { /** @deprecated Use {@link #getConfigForSubIdWithFeature(int, String, String) instead */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage PersistableBundle getConfigForSubId(int subId, String callingPackage); PersistableBundle getConfigForSubIdWithFeature(int subId, String callingPackage, diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index 09f9b4212c03..28ef235bf398 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -25,7 +25,7 @@ import android.telephony.ImsiEncryptionInfo; interface IPhoneSubInfo { /** @deprecated Use {@link #getDeviceIdWithFeature(String, String) instead */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String getDeviceId(String callingPackage); /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index a38d5b6f2141..d33835f27053 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -96,7 +96,7 @@ interface ITelephony { void call(String callingPackage, String number); /** @deprecated Use {@link #isRadioOnWithFeature(String, String) instead */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isRadioOn(String callingPackage); /** @@ -110,7 +110,7 @@ interface ITelephony { /** * @deprecated Use {@link #isRadioOnForSubscriberWithFeature(int, String, String) instead */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean isRadioOnForSubscriber(int subId, String callingPackage); /** @@ -190,7 +190,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if MMI command is executed. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean handlePinMmiForSubscriber(int subId, String dialString); /** @@ -614,7 +614,7 @@ interface ITelephony { * successful iccOpenLogicalChannel. * @return true if the channel was closed successfully. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage boolean iccCloseLogicalChannel(int subId, int channel); /** @@ -656,7 +656,7 @@ interface ITelephony { * @return The APDU response from the ICC card with the status appended at * the end. */ - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage String iccTransmitApduLogicalChannel(int subId, int channel, int cla, int instruction, int p1, int p2, int p3, String data); diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index a6f0f667d0cd..2ca459811e04 100644 --- a/telephony/java/com/android/internal/telephony/OperatorInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -35,37 +35,37 @@ public class OperatorInfo implements Parcelable { FORBIDDEN; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mOperatorAlphaLong; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mOperatorAlphaShort; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private String mOperatorNumeric; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private State mState = State.UNKNOWN; private int mRan = AccessNetworkType.UNKNOWN; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getOperatorAlphaLong() { return mOperatorAlphaLong; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getOperatorAlphaShort() { return mOperatorAlphaShort; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public String getOperatorNumeric() { return mOperatorNumeric; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public State getState() { return mState; @@ -75,7 +75,7 @@ public class OperatorInfo implements Parcelable { return mRan; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -97,7 +97,7 @@ public class OperatorInfo implements Parcelable { mRan = ran; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -124,7 +124,7 @@ public class OperatorInfo implements Parcelable { /** * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static State rilStateToState(String s) { if (s.equals("unknown")) { return State.UNKNOWN; @@ -180,7 +180,7 @@ public class OperatorInfo implements Parcelable { * Implement the Parcelable interface * Method to deserialize a OperatorInfo object, or an array thereof. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final Creator CREATOR = new Creator() { @Override diff --git a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java index 2109c6a4739c..f8ab87d042eb 100644 --- a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java +++ b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java @@ -19,7 +19,6 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.XmlResourceParser; -import android.os.Build; import android.util.SparseIntArray; import com.android.internal.telephony.cdma.sms.UserData; @@ -29,15 +28,15 @@ import com.android.telephony.Rlog; public class Sms7BitEncodingTranslator { private static final String TAG = "Sms7BitEncodingTranslator"; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE; private static boolean mIs7BitTranslationTableLoaded = false; private static SparseIntArray mTranslationTable = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static SparseIntArray mTranslationTableCommon = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static SparseIntArray mTranslationTableGSM = null; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static SparseIntArray mTranslationTableCDMA = null; // Parser variables diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index 6d46ed3b8416..084882b10c9b 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -39,18 +39,18 @@ public abstract class SmsMessageBase { Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*"); /** {@hide} The address of the SMSC. May be null */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected String mScAddress; /** {@hide} The address of the sender */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected SmsAddress mOriginatingAddress; /** {@hide} The address of the receiver */ protected SmsAddress mRecipientAddress; /** {@hide} The message body as a string. May be null if the message isn't text */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected String mMessageBody; /** {@hide} */ @@ -76,21 +76,21 @@ public abstract class SmsMessageBase { protected byte[] mUserData; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected SmsHeader mUserDataHeader; // "Message Waiting Indication Group" // 23.038 Section 4 /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean mIsMwi; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean mMwiSense; /** {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean mMwiDontStore; /** @@ -104,7 +104,7 @@ public abstract class SmsMessageBase { protected int mIndexOnIcc = -1; /** TP-Message-Reference - Message Reference of sent message. @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int mMessageRef; @UnsupportedAppUsage diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index f636276f11b8..a34e474e666e 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -233,7 +233,7 @@ public class SmsMessage extends SmsMessageBase { * null on encode error. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, String message, boolean statusReportRequested, SmsHeader smsHeader, int priority) { @@ -316,7 +316,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing null SC address and the encoded message. Returns * null on encode error. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String destAddr, UserData userData, boolean statusReportRequested, int priority) { return privateGetSubmitPdu(destAddr, statusReportRequested, userData, priority); diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index 851bc020a1da..d186fcf63cfe 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -18,7 +18,6 @@ package com.android.internal.telephony.cdma.sms; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; -import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; @@ -1920,7 +1919,7 @@ public final class BearerData { * @return the number of bits to read from the stream * @throws CodingException if the specified encoding is not supported */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private static int getBitsForNumFields(int msgEncoding, int numFields) throws CodingException { switch (msgEncoding) { diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java index 7e2cc6af4182..d1903450261b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java @@ -17,7 +17,6 @@ package com.android.internal.telephony.gsm; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbEtwsInfo; @@ -112,7 +111,7 @@ public class SmsCbHeader { private final int mSerialNumber; /** The Message Identifier in 3GPP is the same as the Service Category in CDMA. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private final int mMessageIdentifier; private final int mDataCodingScheme; @@ -131,7 +130,7 @@ public class SmsCbHeader { /** CMAS warning notification info. */ private final SmsCbCmasInfo mCmasInfo; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public SmsCbHeader(byte[] pdu) throws IllegalArgumentException { if (pdu == null || pdu.length < PDU_HEADER_LENGTH) { throw new IllegalArgumentException("Illegal PDU"); @@ -229,17 +228,17 @@ public class SmsCbHeader { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getGeographicalScope() { return mGeographicalScope; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getSerialNumber() { return mSerialNumber; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getServiceCategory() { return mMessageIdentifier; } @@ -252,12 +251,12 @@ public class SmsCbHeader { return mDataCodingSchemeStructedData; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getPageIndex() { return mPageIndex; } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int getNumberOfPages() { return mNrOfPages; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index b51e8d3d3c5d..e3df903b7f4f 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -266,7 +266,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -292,7 +292,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -491,7 +491,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing the encoded SC address if applicable and the * encoded message. Returns null on encode error. */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, int validityPeriod) { @@ -774,9 +774,9 @@ public class SmsMessage extends SmsMessageBase { } private static class PduParser { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage byte mPdu[]; - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage int mCur; SmsHeader mUserDataHeader; byte[] mUserData; @@ -1168,14 +1168,14 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Override public int getStatus() { return mStatus; } /** {@inheritDoc} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @Override public boolean isStatusReportMessage() { return mIsStatusReportMessage; diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java index d79225fe5369..1d136924aa2c 100644 --- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java @@ -21,7 +21,6 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.graphics.Bitmap; import android.graphics.Color; -import android.os.Build; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet; @@ -386,7 +385,7 @@ public class IccUtils { return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim()); } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static int hexCharToInt(char c) { if (c >= '0' && c <= '9') return (c - '0'); diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 7329c16d68d0..b3ed8ac09034 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -187,7 +187,7 @@ interface IWifiManager void factoryReset(String packageName); - @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) + @UnsupportedAppUsage Network getCurrentNetwork(); byte[] retrieveBackupData(); diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index 4c23286258d8..329ca37407de 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -22,7 +22,6 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.wifi.WifiAnnotations.ChannelWidth; import android.net.wifi.WifiAnnotations.WifiStandard; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -382,7 +381,7 @@ public final class ScanResult implements Parcelable { * @deprecated use is80211mcResponder() instead * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean is80211McRTTResponder; /** @@ -773,47 +772,47 @@ public final class ScanResult implements Parcelable { */ public static class InformationElement { /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_SSID = 0; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_SUPPORTED_RATES = 1; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_TIM = 5; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_BSS_LOAD = 11; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_ERP = 42; /** @hide */ public static final int EID_HT_CAPABILITIES = 45; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_RSN = 48; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_EXTENDED_SUPPORTED_RATES = 50; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_HT_OPERATION = 61; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_INTERWORKING = 107; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_ROAMING_CONSORTIUM = 111; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_EXTENDED_CAPS = 127; /** @hide */ public static final int EID_VHT_CAPABILITIES = 191; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_VHT_OPERATION = 192; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int EID_VSA = 221; /** @hide */ public static final int EID_EXTENSION_PRESENT = 255; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 9a8a5ad4b41f..fd4e1ddac3a2 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -906,7 +906,7 @@ public class WifiConfiguration implements Parcelable { * @hide * Number of reports indicating no Internet Access */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int numNoInternetAccessReports; /** @@ -926,7 +926,7 @@ public class WifiConfiguration implements Parcelable { * this configuration and selects "don't ask again". * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean noInternetAccessExpected; /** @@ -966,7 +966,7 @@ public class WifiConfiguration implements Parcelable { * @deprecated only kept for @UnsupportedAppUsage * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean selfAdded; /** diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 78bf88b7ca78..2ca2d1e39049 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1055,7 +1055,7 @@ public class WifiManager { * @see #ACTION_LINK_CONFIGURATION_CHANGED * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final String LINK_CONFIGURATION_CHANGED_ACTION = "android.net.wifi.LINK_CONFIGURATION_CHANGED"; @@ -1265,7 +1265,7 @@ public class WifiManager { * change is significant enough to change the RSSI signal level. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int RSSI_LEVELS = 5; //TODO (b/146346676): This needs to be removed, not used in the code. diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java index d3a6bac2513f..d47989235f0b 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java @@ -23,7 +23,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.MacAddress; import android.net.wifi.WpsInfo; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -139,7 +138,7 @@ public class WifiP2pConfig implements Parcelable { public int groupOwnerIntent = GROUP_OWNER_INTENT_AUTO; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int netId = WifiP2pGroup.NETWORK_ID_PERSISTENT; /** diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java index 567637af02c7..710175fee747 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java @@ -19,7 +19,6 @@ package android.net.wifi.p2p; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -186,7 +185,7 @@ public class WifiP2pDevice implements Parcelable { * Note: The events formats can be looked up in the wpa_supplicant code * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public WifiP2pDevice(String string) throws IllegalArgumentException { String[] tokens = string.split("[ \n]"); Matcher match; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java index e7866e618089..ededf67fec7f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java @@ -17,7 +17,6 @@ package android.net.wifi.p2p; import android.compat.annotation.UnsupportedAppUsage; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -84,7 +83,7 @@ public class WifiP2pDeviceList implements Parcelable { * @param device to be updated * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void update(WifiP2pDevice device) { updateSupplicantDetails(device); mDevices.get(device.deviceAddress).status = device.status; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index 13ac7a0bf966..ad38c5af07fc 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -399,7 +399,7 @@ public class WifiP2pManager { public static final int CANCEL_CONNECT_SUCCEEDED = BASE + 12; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final int CREATE_GROUP = BASE + 13; /** @hide */ public static final int CREATE_GROUP_FAILED = BASE + 14; @@ -1105,7 +1105,7 @@ public class WifiP2pManager { } } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage private int putListener(Object listener) { if (listener == null) return INVALID_LISTENER_KEY; int key; @@ -1417,7 +1417,7 @@ public class WifiP2pManager { * {@link ActionListener#onSuccess} or {@link ActionListener#onFailure}. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public void startWps(Channel c, WpsInfo wps, ActionListener listener) { checkChannel(c); c.mAsyncChannel.sendMessage(START_WPS, 0, c.putListener(listener), wps); @@ -1698,7 +1698,7 @@ public class WifiP2pManager { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWFDInfo(@NonNull Channel c, @NonNull WifiP2pWfdInfo wfdInfo, @Nullable ActionListener listener) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java index 5d018e75488e..37b442baeb3f 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java @@ -170,7 +170,7 @@ public class WifiP2pServiceInfo implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceInfo createFromParcel(Parcel in) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java index dea0477cf09b..68cbb88037b0 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java @@ -265,7 +265,7 @@ public class WifiP2pServiceRequest implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceRequest createFromParcel(Parcel in) { -- cgit v1.2.3-59-g8ed1b From 8e742f928e0b3d242a290fb46d80a2c892dd18a3 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 27 Oct 2020 11:47:29 +0000 Subject: Add maxTargetSdk restriction to unused APIs. These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. This is a resubmit of ag/12929664 with some APIs excluded that caused test failures; see bugs 171886397, 171888296, 171864568. APIs excluded: Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord; Landroid/os/Process;->myPpid()I Landroid/os/SharedMemory;->getFd()I Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I Bug: 170729553 Test: Treehugger Change-Id: I8285daa8530260251ecad6f3f38f98e263629ca7 --- .../framework/java/android/app/IAlarmManager.aidl | 6 +- .../framework/java/android/app/job/JobInfo.java | 10 +- .../java/android/os/IDeviceIdleController.aidl | 4 +- .../AccessibilityServiceInfo.java | 2 +- core/java/android/accounts/Account.java | 5 +- core/java/android/accounts/AccountManager.java | 6 +- core/java/android/animation/Animator.java | 3 +- core/java/android/app/Activity.java | 16 +-- core/java/android/app/ActivityManager.java | 32 +++--- core/java/android/app/ActivityThread.java | 10 +- core/java/android/app/AppOpsManager.java | 10 +- core/java/android/app/Application.java | 29 ++--- .../android/app/ApplicationPackageManager.java | 4 +- core/java/android/app/ContextImpl.java | 2 +- core/java/android/app/DialogFragment.java | 5 +- core/java/android/app/DownloadManager.java | 6 +- core/java/android/app/Fragment.java | 2 +- core/java/android/app/FragmentController.java | 3 +- core/java/android/app/FragmentManager.java | 2 +- core/java/android/app/IActivityManager.aidl | 48 ++++---- core/java/android/app/IAppTask.aidl | 2 +- core/java/android/app/IAssistDataReceiver.aidl | 4 +- core/java/android/app/INotificationManager.aidl | 2 +- core/java/android/app/IStopUserCallback.aidl | 2 +- core/java/android/app/ITransientNotification.aidl | 2 +- core/java/android/app/IWallpaperManager.aidl | 2 +- core/java/android/app/Instrumentation.java | 8 +- core/java/android/app/KeyguardManager.java | 2 +- core/java/android/app/LoadedApk.java | 14 +-- core/java/android/app/NativeActivity.java | 12 +- core/java/android/app/Notification.java | 2 +- core/java/android/app/NotificationManager.java | 2 +- core/java/android/app/PackageDeleteObserver.java | 3 +- core/java/android/app/PendingIntent.java | 2 +- core/java/android/app/QueuedWork.java | 3 +- core/java/android/app/SearchManager.java | 3 +- core/java/android/app/SharedPreferencesImpl.java | 2 +- core/java/android/app/StatusBarManager.java | 11 +- core/java/android/app/TaskInfo.java | 3 +- core/java/android/app/TaskStackListener.java | 29 ++--- core/java/android/app/UiAutomationConnection.java | 3 +- core/java/android/app/VrManager.java | 3 +- core/java/android/app/WallpaperManager.java | 2 +- core/java/android/app/admin/DeviceAdminInfo.java | 2 +- .../android/app/admin/DevicePolicyManager.java | 16 +-- core/java/android/app/admin/SecurityLog.java | 3 +- core/java/android/app/backup/BackupDataOutput.java | 3 +- core/java/android/app/backup/FullBackup.java | 3 +- .../android/app/backup/FullBackupDataOutput.java | 3 +- core/java/android/app/backup/IBackupManager.aidl | 16 +-- .../app/servertransaction/ActivityResultItem.java | 3 +- .../app/servertransaction/NewIntentItem.java | 3 +- .../java/android/app/usage/IUsageStatsManager.aidl | 8 +- .../android/app/usage/NetworkStatsManager.java | 5 +- core/java/android/appwidget/AppWidgetHost.java | 5 +- core/java/android/appwidget/AppWidgetHostView.java | 3 +- core/java/android/appwidget/AppWidgetManager.java | 5 +- core/java/android/bluetooth/BluetoothA2dp.java | 22 ++-- core/java/android/bluetooth/BluetoothA2dpSink.java | 3 +- core/java/android/bluetooth/BluetoothAdapter.java | 7 +- .../android/bluetooth/BluetoothCodecStatus.java | 9 +- core/java/android/bluetooth/BluetoothDevice.java | 25 +++-- core/java/android/bluetooth/BluetoothGatt.java | 6 +- .../android/bluetooth/BluetoothGattService.java | 3 +- core/java/android/bluetooth/BluetoothHeadset.java | 13 ++- .../android/bluetooth/BluetoothHeadsetClient.java | 11 +- .../bluetooth/BluetoothHeadsetClientCall.java | 11 +- .../android/bluetooth/BluetoothHearingAid.java | 7 +- core/java/android/bluetooth/BluetoothMap.java | 3 +- .../java/android/bluetooth/BluetoothMapClient.java | 3 +- core/java/android/bluetooth/BluetoothPan.java | 3 +- core/java/android/bluetooth/BluetoothPbap.java | 3 +- core/java/android/bluetooth/BluetoothProfile.java | 3 +- core/java/android/bluetooth/BluetoothSap.java | 3 +- core/java/android/bluetooth/BluetoothSocket.java | 3 +- .../java/android/companion/AssociationRequest.java | 5 +- .../android/companion/BluetoothDeviceFilter.java | 3 +- .../companion/BluetoothDeviceFilterUtils.java | 7 +- .../android/companion/BluetoothLeDeviceFilter.java | 3 +- core/java/android/companion/DeviceFilter.java | 5 +- .../android/companion/IFindDeviceCallback.aidl | 2 +- core/java/android/content/ComponentName.java | 5 +- core/java/android/content/ContentProvider.java | 4 +- core/java/android/content/ContentResolver.java | 7 +- core/java/android/content/Context.java | 8 +- core/java/android/content/ContextWrapper.java | 5 +- core/java/android/content/CursorLoader.java | 5 +- core/java/android/content/IContentProvider.java | 2 +- core/java/android/content/IContentService.aidl | 4 +- core/java/android/content/ISyncAdapter.aidl | 2 +- core/java/android/content/Intent.java | 14 +-- core/java/android/content/IntentFilter.java | 10 +- core/java/android/content/SyncAdapterType.java | 6 +- core/java/android/content/UndoManager.java | 35 +++--- core/java/android/content/UndoOperation.java | 5 +- core/java/android/content/om/IOverlayManager.aidl | 4 +- core/java/android/content/om/OverlayInfo.java | 3 +- core/java/android/content/pm/ActivityInfo.java | 7 +- core/java/android/content/pm/ApplicationInfo.java | 4 +- .../android/content/pm/BaseParceledListSlice.java | 5 +- core/java/android/content/pm/ComponentInfo.java | 3 +- .../java/android/content/pm/IPackageInstaller.aidl | 2 +- core/java/android/content/pm/IPackageManager.aidl | 24 ++-- core/java/android/content/pm/PackageInstaller.java | 12 +- core/java/android/content/pm/PackageManager.java | 16 +-- core/java/android/content/pm/PackageParser.java | 10 +- .../java/android/content/pm/ParceledListSlice.java | 2 +- core/java/android/content/pm/PermissionInfo.java | 3 +- core/java/android/content/pm/ResolveInfo.java | 3 +- core/java/android/content/pm/VerifierInfo.java | 3 +- core/java/android/content/res/AssetManager.java | 13 ++- core/java/android/content/res/ColorStateList.java | 5 +- .../android/content/res/CompatibilityInfo.java | 2 +- core/java/android/content/res/Configuration.java | 4 +- core/java/android/content/res/DrawableCache.java | 3 +- core/java/android/content/res/ObbInfo.java | 3 +- core/java/android/content/res/Resources.java | 8 +- core/java/android/content/res/ResourcesImpl.java | 14 +-- core/java/android/content/res/TypedArray.java | 9 +- core/java/android/content/res/XmlBlock.java | 3 +- .../android/database/AbstractWindowedCursor.java | 3 +- core/java/android/database/CursorWindow.java | 3 +- .../database/sqlite/SQLiteCustomFunction.java | 4 +- .../android/database/sqlite/SQLiteDatabase.java | 3 +- core/java/android/database/sqlite/SQLiteDebug.java | 2 +- .../android/database/sqlite/SQLiteProgram.java | 3 +- .../android/database/sqlite/SQLiteStatement.java | 3 +- core/java/android/ddm/DdmHandleAppName.java | 5 +- core/java/android/hardware/Camera.java | 6 +- core/java/android/hardware/HardwareBuffer.java | 2 +- core/java/android/hardware/Sensor.java | 4 +- core/java/android/hardware/SerialManager.java | 5 +- core/java/android/hardware/SerialPort.java | 7 +- .../java/android/hardware/SystemSensorManager.java | 7 +- .../hardware/biometrics/BiometricConstants.java | 3 +- .../biometrics/BiometricFingerprintConstants.java | 3 +- .../hardware/camera2/CameraCharacteristics.java | 5 +- .../android/hardware/camera2/CaptureRequest.java | 5 +- .../android/hardware/camera2/CaptureResult.java | 3 +- .../camera2/impl/CameraMetadataNative.java | 13 ++- .../hardware/camera2/utils/HashCodeHelpers.java | 3 +- .../android/hardware/display/DisplayManager.java | 5 +- .../hardware/display/WifiDisplayStatus.java | 15 +-- .../hardware/fingerprint/FingerprintManager.java | 3 +- .../hardware/location/GeofenceHardware.java | 2 +- .../IActivityRecognitionHardwareClient.aidl | 2 +- .../hardware/soundtrigger/SoundTrigger.java | 17 +-- .../hardware/soundtrigger/SoundTriggerModule.java | 3 +- .../android/hardware/usb/UsbDeviceConnection.java | 2 +- core/java/android/hardware/usb/UsbManager.java | 4 +- core/java/android/hardware/usb/UsbRequest.java | 2 +- .../inputmethodservice/InputMethodService.java | 4 +- core/java/android/net/ConnectivityManager.java | 40 +++---- core/java/android/net/DhcpResults.java | 17 +-- core/java/android/net/EthernetManager.java | 17 +-- core/java/android/net/IConnectivityManager.aidl | 4 +- core/java/android/net/INetworkPolicyManager.aidl | 2 +- core/java/android/net/INetworkStatsService.aidl | 2 +- core/java/android/net/IpConfiguration.java | 3 +- core/java/android/net/LinkProperties.java | 6 +- core/java/android/net/LinkQualityInfo.java | 9 +- core/java/android/net/LocalSocketImpl.java | 3 +- core/java/android/net/MacAddress.java | 3 +- core/java/android/net/MobileLinkQualityInfo.java | 31 +++--- core/java/android/net/Network.java | 3 +- core/java/android/net/NetworkCapabilities.java | 6 +- core/java/android/net/NetworkPolicyManager.java | 6 +- core/java/android/net/NetworkQuotaInfo.java | 7 +- core/java/android/net/NetworkRequest.java | 4 +- core/java/android/net/NetworkStats.java | 33 +++--- core/java/android/net/NetworkStatsHistory.java | 17 +-- core/java/android/net/NetworkTemplate.java | 3 +- core/java/android/net/NetworkUtils.java | 6 +- core/java/android/net/Proxy.java | 3 +- core/java/android/net/RouteInfo.java | 4 +- .../android/net/SSLCertificateSocketFactory.java | 20 ++-- core/java/android/net/StaticIpConfiguration.java | 9 +- core/java/android/net/TrafficStats.java | 4 +- core/java/android/net/WebAddress.java | 4 +- core/java/android/net/metrics/ApfProgramEvent.java | 15 +-- core/java/android/net/metrics/ApfStats.java | 21 ++-- core/java/android/net/metrics/DhcpClientEvent.java | 3 +- core/java/android/net/nsd/INsdManager.aidl | 2 +- core/java/android/nfc/INfcAdapterExtras.aidl | 14 +-- core/java/android/nfc/NdefRecord.java | 3 +- core/java/android/nfc/NfcAdapter.java | 3 +- core/java/android/nfc/Tag.java | 3 +- core/java/android/os/BaseBundle.java | 2 +- core/java/android/os/BatteryManager.java | 6 +- core/java/android/os/BatteryStats.java | 4 +- core/java/android/os/Broadcaster.java | 8 +- core/java/android/os/Bundle.java | 6 +- core/java/android/os/Debug.java | 18 +-- core/java/android/os/Environment.java | 4 +- core/java/android/os/FileObserver.java | 2 +- core/java/android/os/FileUtils.java | 10 +- core/java/android/os/Handler.java | 4 +- core/java/android/os/HwBinder.java | 2 +- core/java/android/os/IBinder.java | 2 +- .../java/android/os/INetworkManagementService.aidl | 12 +- core/java/android/os/IPowerManager.aidl | 2 +- core/java/android/os/LocaleList.java | 2 +- core/java/android/os/MemoryFile.java | 2 +- core/java/android/os/MessageQueue.java | 4 +- core/java/android/os/Parcel.java | 14 +-- core/java/android/os/ParcelableParcel.java | 8 +- core/java/android/os/PerformanceCollector.java | 4 +- core/java/android/os/PowerManager.java | 4 +- core/java/android/os/Process.java | 34 +++--- core/java/android/os/ServiceManager.java | 2 +- core/java/android/os/ShellCommand.java | 2 +- core/java/android/os/StatFs.java | 2 +- core/java/android/os/StrictMode.java | 4 +- core/java/android/os/SystemClock.java | 2 +- core/java/android/os/SystemProperties.java | 4 +- core/java/android/os/SystemService.java | 2 +- core/java/android/os/Trace.java | 2 +- core/java/android/os/UpdateLock.java | 12 +- core/java/android/os/UserHandle.java | 14 +-- core/java/android/os/UserManager.java | 12 +- core/java/android/os/VibrationEffect.java | 8 +- .../android/os/health/HealthStatsParceler.java | 3 +- .../android/os/health/SystemHealthManager.java | 2 +- .../android/os/storage/StorageEventListener.java | 11 +- core/java/android/os/storage/StorageManager.java | 25 +++-- core/java/android/os/storage/StorageVolume.java | 2 +- core/java/android/os/storage/VolumeInfo.java | 11 +- core/java/android/os/storage/VolumeRecord.java | 5 +- .../android/preference/PreferenceActivity.java | 3 +- .../android/preference/PreferenceFragment.java | 3 +- core/java/android/preference/PreferenceScreen.java | 3 +- .../java/android/preference/SeekBarPreference.java | 3 +- core/java/android/preference/SwitchPreference.java | 3 +- core/java/android/provider/BrowserContract.java | 15 +-- core/java/android/provider/CalendarContract.java | 11 +- core/java/android/provider/ContactsContract.java | 5 +- core/java/android/provider/DocumentsContract.java | 6 +- core/java/android/provider/Downloads.java | 45 ++++---- core/java/android/provider/Settings.java | 121 +++++++++++---------- core/java/android/provider/Telephony.java | 8 +- core/java/android/security/KeystoreArguments.java | 5 +- .../android/security/keymaster/ExportResult.java | 3 +- .../security/keymaster/KeyCharacteristics.java | 5 +- .../security/keymaster/KeymasterArguments.java | 13 ++- .../android/security/keymaster/KeymasterBlob.java | 3 +- .../security/keymaster/KeymasterBlobArgument.java | 7 +- .../keymaster/KeymasterBooleanArgument.java | 3 +- .../security/keymaster/KeymasterDateArgument.java | 3 +- .../security/keymaster/KeymasterIntArgument.java | 7 +- .../security/keymaster/KeymasterLongArgument.java | 7 +- .../security/keymaster/OperationResult.java | 3 +- core/java/android/service/dreams/DreamService.java | 2 +- .../java/android/service/dreams/IDreamManager.aidl | 4 +- .../notification/NotificationListenerService.java | 2 +- .../notification/StatusBarNotification.java | 2 +- .../service/notification/ZenModeConfig.java | 7 +- core/java/android/service/vr/IVrManager.aidl | 2 +- .../java/android/service/vr/VrListenerService.java | 3 +- .../service/wallpaper/WallpaperService.java | 2 +- core/java/android/speech/IRecognitionListener.aidl | 2 +- .../java/android/telephony/PhoneStateListener.java | 4 +- core/java/android/telephony/Rlog.java | 2 +- core/java/android/text/AndroidBidi.java | 3 +- core/java/android/text/DynamicLayout.java | 4 +- core/java/android/text/FontConfig.java | 17 +-- core/java/android/text/Html.java | 3 +- core/java/android/text/Layout.java | 13 ++- core/java/android/text/SpanSet.java | 3 +- core/java/android/text/SpannableStringBuilder.java | 3 +- .../java/android/text/SpannableStringInternal.java | 21 ++-- core/java/android/text/StaticLayout.java | 10 +- core/java/android/text/TextLine.java | 8 +- core/java/android/text/format/DateFormat.java | 2 +- core/java/android/text/format/DateUtils.java | 3 +- core/java/android/text/method/WordIterator.java | 23 ++-- core/java/android/text/style/EasyEditSpan.java | 7 +- core/java/android/text/style/SuggestionSpan.java | 7 +- core/java/android/text/util/Linkify.java | 3 +- core/java/android/transition/Transition.java | 7 +- .../java/android/transition/TransitionManager.java | 3 +- core/java/android/util/EventLog.java | 3 +- core/java/android/util/IconDrawableFactory.java | 3 +- core/java/android/util/LocalLog.java | 5 +- core/java/android/util/LogWriter.java | 3 +- core/java/android/util/LongArray.java | 7 +- core/java/android/util/NtpTrustedTime.java | 11 +- core/java/android/util/PathParser.java | 3 +- core/java/android/util/Rational.java | 5 +- core/java/android/util/RecurrenceRule.java | 5 +- core/java/android/util/Slog.java | 4 +- core/java/android/util/TimeUtils.java | 2 +- core/java/android/util/TrustedTime.java | 3 +- core/java/android/view/AccessibilityIterators.java | 5 +- core/java/android/view/Choreographer.java | 4 +- core/java/android/view/Display.java | 6 +- core/java/android/view/DisplayEventReceiver.java | 3 +- core/java/android/view/DragEvent.java | 7 +- core/java/android/view/FrameMetrics.java | 3 +- .../java/android/view/IRecentsAnimationRunner.aidl | 4 +- core/java/android/view/IRemoteAnimationRunner.aidl | 4 +- core/java/android/view/IWindowManager.aidl | 12 +- core/java/android/view/IWindowSession.aidl | 2 +- core/java/android/view/InputChannel.java | 3 +- core/java/android/view/InputDevice.java | 4 +- core/java/android/view/InputEventReceiver.java | 5 +- core/java/android/view/InputEventSender.java | 3 +- core/java/android/view/InputFilter.java | 5 +- core/java/android/view/InputQueue.java | 3 +- core/java/android/view/KeyCharacterMap.java | 7 +- core/java/android/view/KeyEvent.java | 40 +++---- core/java/android/view/LayoutInflater.java | 4 +- core/java/android/view/MotionEvent.java | 2 +- core/java/android/view/NotificationHeaderView.java | 3 +- core/java/android/view/PointerIcon.java | 10 +- core/java/android/view/RemoteAnimationAdapter.java | 3 +- core/java/android/view/RemoteAnimationTarget.java | 5 +- core/java/android/view/Surface.java | 7 +- core/java/android/view/SurfaceControl.java | 4 +- core/java/android/view/SurfaceSession.java | 3 +- core/java/android/view/TextureView.java | 15 +-- core/java/android/view/VelocityTracker.java | 9 +- core/java/android/view/View.java | 78 ++++++------- core/java/android/view/ViewConfiguration.java | 2 +- core/java/android/view/ViewDebug.java | 5 +- core/java/android/view/ViewGroup.java | 12 +- core/java/android/view/ViewOverlay.java | 5 +- core/java/android/view/ViewRootImpl.java | 28 ++--- core/java/android/view/ViewTreeObserver.java | 6 +- core/java/android/view/Window.java | 6 +- .../android/view/WindowAnimationFrameStats.java | 3 +- .../java/android/view/WindowContentFrameStats.java | 3 +- core/java/android/view/WindowManager.java | 9 +- core/java/android/view/WindowManagerGlobal.java | 4 +- .../AccessibilityInteractionClient.java | 6 +- .../view/accessibility/AccessibilityManager.java | 2 +- .../view/accessibility/AccessibilityNodeInfo.java | 8 +- ...AccessibilityInteractionConnectionCallback.aidl | 6 +- .../view/accessibility/IAccessibilityManager.aidl | 2 +- .../view/inputmethod/InputMethodManager.java | 4 +- .../textclassifier/TextClassificationManager.java | 3 +- .../view/textservice/SpellCheckerSession.java | 3 +- .../view/textservice/TextServicesManager.java | 3 +- .../java/android/webkit/IWebViewUpdateService.aidl | 4 +- core/java/android/webkit/PluginData.java | 9 +- core/java/android/webkit/UrlInterceptRegistry.java | 3 +- core/java/android/webkit/WebResourceResponse.java | 3 +- core/java/android/webkit/WebView.java | 6 +- core/java/android/webkit/WebViewFactory.java | 3 +- core/java/android/widget/AbsListView.java | 16 +-- core/java/android/widget/AbsSeekBar.java | 3 +- core/java/android/widget/ActionMenuPresenter.java | 9 +- core/java/android/widget/ActionMenuView.java | 17 +-- core/java/android/widget/ActivityChooserModel.java | 5 +- core/java/android/widget/AutoCompleteTextView.java | 6 +- .../android/widget/DatePickerSpinnerDelegate.java | 11 +- core/java/android/widget/DateTimeView.java | 3 +- core/java/android/widget/EdgeEffect.java | 2 +- core/java/android/widget/Editor.java | 4 +- core/java/android/widget/FastScroller.java | 2 +- core/java/android/widget/GridLayout.java | 3 +- core/java/android/widget/GridView.java | 2 +- core/java/android/widget/HorizontalScrollView.java | 4 +- core/java/android/widget/ImageView.java | 2 +- core/java/android/widget/LinearLayout.java | 4 +- core/java/android/widget/ListPopupWindow.java | 8 +- core/java/android/widget/ListView.java | 4 +- core/java/android/widget/NumberPicker.java | 14 +-- core/java/android/widget/OverScroller.java | 3 +- core/java/android/widget/PopupMenu.java | 3 +- core/java/android/widget/PopupWindow.java | 2 +- core/java/android/widget/ProgressBar.java | 4 +- core/java/android/widget/RemoteViews.java | 16 +-- core/java/android/widget/RemoteViewsAdapter.java | 15 +-- core/java/android/widget/ScrollView.java | 2 +- core/java/android/widget/SearchView.java | 2 +- core/java/android/widget/SeekBar.java | 3 +- core/java/android/widget/Spinner.java | 4 +- core/java/android/widget/Switch.java | 3 +- core/java/android/widget/TextClock.java | 3 +- core/java/android/widget/TextView.java | 14 +-- core/java/android/widget/ViewAnimator.java | 3 +- core/java/android/widget/ViewFlipper.java | 3 +- .../android/ims/internal/uce/common/CapInfo.java | 89 +++++++-------- .../ims/internal/uce/common/StatusCode.java | 7 +- .../android/ims/internal/uce/common/UceLong.java | 11 +- .../ims/internal/uce/options/IOptionsListener.aidl | 12 +- .../ims/internal/uce/options/IOptionsService.aidl | 16 +-- .../ims/internal/uce/options/OptionsCapInfo.java | 11 +- .../ims/internal/uce/options/OptionsCmdId.java | 5 +- .../ims/internal/uce/options/OptionsCmdStatus.java | 11 +- .../internal/uce/options/OptionsSipResponse.java | 13 ++- .../internal/uce/presence/IPresenceListener.aidl | 18 +-- .../internal/uce/presence/IPresenceService.aidl | 16 +-- .../ims/internal/uce/presence/PresCapInfo.java | 7 +- .../ims/internal/uce/presence/PresCmdId.java | 5 +- .../ims/internal/uce/presence/PresCmdStatus.java | 11 +- .../uce/presence/PresPublishTriggerType.java | 5 +- .../ims/internal/uce/presence/PresResInfo.java | 9 +- .../internal/uce/presence/PresResInstanceInfo.java | 13 ++- .../ims/internal/uce/presence/PresRlmiInfo.java | 19 ++-- .../ims/internal/uce/presence/PresServiceInfo.java | 9 +- .../ims/internal/uce/presence/PresSipResponse.java | 23 ++-- .../uce/presence/PresSubscriptionState.java | 5 +- .../ims/internal/uce/presence/PresTupleInfo.java | 9 +- .../ims/internal/uce/uceservice/IUceListener.aidl | 2 +- .../ims/internal/uce/uceservice/IUceService.aidl | 20 ++-- .../com/android/internal/app/AlertController.java | 3 +- .../com/android/internal/app/IAppOpsService.aidl | 2 +- .../com/android/internal/app/IBatteryStats.aidl | 6 +- .../app/IVoiceInteractionManagerService.aidl | 2 +- .../internal/app/IntentForwarderActivity.java | 3 +- .../com/android/internal/app/LocalePicker.java | 3 +- .../android/internal/app/WindowDecorActionBar.java | 7 +- .../internal/appwidget/IAppWidgetService.aidl | 6 +- .../android/internal/logging/MetricsLogger.java | 2 +- core/java/com/android/internal/net/VpnProfile.java | 2 +- core/java/com/android/internal/os/BaseCommand.java | 5 +- .../com/android/internal/os/BatterySipper.java | 3 +- .../android/internal/os/BatteryStatsHelper.java | 5 +- .../com/android/internal/os/BatteryStatsImpl.java | 4 +- .../android/internal/os/ClassLoaderFactory.java | 3 +- core/java/com/android/internal/os/FuseAppLoop.java | 5 +- .../com/android/internal/os/ProcessCpuTracker.java | 13 ++- core/java/com/android/internal/os/SomeArgs.java | 15 +-- .../internal/telephony/ITelephonyRegistry.aidl | 2 +- .../java/com/android/internal/util/ArrayUtils.java | 9 +- .../com/android/internal/util/AsyncChannel.java | 14 +-- .../android/internal/util/GrowingArrayUtils.java | 5 +- core/java/com/android/internal/util/HexDump.java | 2 +- .../internal/util/IndentingPrintWriter.java | 7 +- .../com/android/internal/util/MemInfoReader.java | 5 +- .../com/android/internal/util/Preconditions.java | 7 +- core/java/com/android/internal/util/State.java | 3 +- .../com/android/internal/util/StateMachine.java | 19 ++-- .../internal/view/IInputConnectionWrapper.java | 2 +- .../com/android/internal/view/menu/ActionMenu.java | 3 +- .../android/internal/view/menu/ActionMenuItem.java | 3 +- .../internal/view/menu/ActionMenuItemView.java | 3 +- .../android/internal/view/menu/MenuBuilder.java | 13 ++- .../android/internal/view/menu/MenuItemImpl.java | 7 +- .../internal/view/menu/MenuPopupHelper.java | 13 ++- .../android/internal/view/menu/MenuPresenter.java | 3 +- .../android/internal/widget/AbsActionBarView.java | 3 +- .../internal/widget/ActionBarContextView.java | 3 +- .../internal/widget/ActionBarOverlayLayout.java | 2 +- .../android/internal/widget/CachingIconView.java | 3 +- .../internal/widget/IRemoteViewsFactory.aidl | 16 +-- .../LinearLayoutWithDefaultTouchRecepient.java | 3 +- .../android/internal/widget/LockPatternUtils.java | 7 +- .../android/internal/widget/NumericTextView.java | 3 +- .../internal/widget/PreferenceImageView.java | 3 +- .../com/android/internal/widget/RecyclerView.java | 2 +- .../android/internal/widget/ScrollBarUtils.java | 3 +- .../internal/widget/ScrollingTabContainerView.java | 7 +- .../com/android/server/net/NetlinkTracker.java | 7 +- core/java/com/google/android/collect/Sets.java | 3 +- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 6 +- graphics/java/android/graphics/Bitmap.java | 4 +- graphics/java/android/graphics/BitmapFactory.java | 3 +- graphics/java/android/graphics/Canvas.java | 4 +- graphics/java/android/graphics/CanvasProperty.java | 5 +- .../android/graphics/ColorMatrixColorFilter.java | 3 +- graphics/java/android/graphics/FontListParser.java | 3 +- graphics/java/android/graphics/GraphicBuffer.java | 5 +- .../java/android/graphics/LightingColorFilter.java | 5 +- graphics/java/android/graphics/LinearGradient.java | 15 +-- graphics/java/android/graphics/Movie.java | 2 +- graphics/java/android/graphics/Paint.java | 2 +- graphics/java/android/graphics/Path.java | 5 +- .../android/graphics/PorterDuffColorFilter.java | 3 +- graphics/java/android/graphics/RadialGradient.java | 17 +-- graphics/java/android/graphics/Region.java | 7 +- graphics/java/android/graphics/SurfaceTexture.java | 11 +- graphics/java/android/graphics/SweepGradient.java | 13 ++- graphics/java/android/graphics/Typeface.java | 2 +- graphics/java/android/graphics/Xfermode.java | 3 +- .../drawable/AnimatedStateListDrawable.java | 4 +- .../graphics/drawable/AnimatedVectorDrawable.java | 4 +- .../android/graphics/drawable/ColorDrawable.java | 3 +- .../java/android/graphics/drawable/Drawable.java | 3 +- .../graphics/drawable/DrawableInflater.java | 3 +- .../android/graphics/drawable/DrawableWrapper.java | 3 +- graphics/java/android/graphics/drawable/Icon.java | 6 +- .../android/graphics/drawable/InsetDrawable.java | 3 +- .../android/graphics/drawable/LayerDrawable.java | 3 +- .../android/graphics/drawable/RippleDrawable.java | 7 +- .../android/graphics/drawable/ScaleDrawable.java | 3 +- .../graphics/drawable/StateListDrawable.java | 5 +- .../android/graphics/drawable/VectorDrawable.java | 3 +- .../android/graphics/fonts/FontVariationAxis.java | 2 +- .../java/android/graphics/pdf/PdfRenderer.java | 5 +- keystore/java/android/security/Credentials.java | 3 +- keystore/java/android/security/KeyStore.java | 14 +-- .../java/android/location/IGeofenceProvider.aidl | 2 +- location/java/android/location/Location.java | 2 +- media/java/android/media/AudioAttributes.java | 4 +- media/java/android/media/AudioDevicePort.java | 3 +- .../java/android/media/AudioDevicePortConfig.java | 3 +- media/java/android/media/AudioFormat.java | 9 +- media/java/android/media/AudioGain.java | 3 +- media/java/android/media/AudioHandle.java | 3 +- media/java/android/media/AudioManager.java | 18 +-- media/java/android/media/AudioMixPort.java | 5 +- media/java/android/media/AudioMixPortConfig.java | 3 +- media/java/android/media/AudioPatch.java | 3 +- media/java/android/media/AudioPort.java | 5 +- media/java/android/media/AudioPortConfig.java | 3 +- .../java/android/media/AudioPortEventHandler.java | 5 +- media/java/android/media/AudioRecord.java | 9 +- .../android/media/AudioRecordingConfiguration.java | 3 +- media/java/android/media/AudioSystem.java | 9 +- media/java/android/media/AudioTrack.java | 7 +- media/java/android/media/CamcorderProfile.java | 2 +- media/java/android/media/EncoderCapabilities.java | 13 ++- media/java/android/media/IAudioService.aidl | 2 +- .../java/android/media/IRemoteDisplayCallback.aidl | 2 +- media/java/android/media/JetPlayer.java | 5 +- media/java/android/media/MediaMetadata.java | 3 +- media/java/android/media/MediaMuxer.java | 17 +-- media/java/android/media/MediaPlayer.java | 9 +- media/java/android/media/MediaRecorder.java | 2 +- media/java/android/media/MediaRouter.java | 4 +- media/java/android/media/MicrophoneInfo.java | 3 +- media/java/android/media/PlaybackParams.java | 14 +-- media/java/android/media/RemoteControlClient.java | 5 +- media/java/android/media/RemoteController.java | 3 +- media/java/android/media/RemoteDisplay.java | 7 +- media/java/android/media/RemoteDisplayState.java | 5 +- media/java/android/media/Ringtone.java | 3 +- media/java/android/media/RingtoneManager.java | 5 +- media/java/android/media/TimedText.java | 3 +- media/java/android/media/ToneGenerator.java | 3 +- media/java/android/media/TtmlRenderer.java | 3 +- media/java/android/media/VolumeShaper.java | 31 +++--- media/java/android/media/audiofx/AudioEffect.java | 4 +- media/java/android/media/audiopolicy/AudioMix.java | 15 +-- .../android/media/audiopolicy/AudioMixingRule.java | 13 ++- media/java/android/media/session/MediaSession.java | 3 +- .../media/soundtrigger/SoundTriggerDetector.java | 5 +- .../media/soundtrigger/SoundTriggerManager.java | 5 +- media/java/android/media/tv/TvInputInfo.java | 3 +- media/java/android/media/tv/TvInputService.java | 3 +- .../android/service/media/MediaBrowserService.java | 3 +- opengl/java/android/opengl/EGL14.java | 3 +- .../java/javax/microedition/khronos/egl/EGL10.java | 3 +- rs/java/android/renderscript/Font.java | 3 +- rs/java/android/renderscript/Mesh.java | 9 +- rs/java/android/renderscript/ProgramStore.java | 3 +- telecomm/java/android/telecom/CallerInfo.java | 9 +- telecomm/java/android/telecom/Log.java | 4 +- .../android/internal/telecom/ITelecomService.aidl | 2 +- .../android/internal/telephony/SmsApplication.java | 13 ++- .../common/com/google/android/mms/ContentType.java | 7 +- .../com/google/android/mms/MmsException.java | 3 +- .../com/google/android/mms/pdu/AcknowledgeInd.java | 3 +- .../com/google/android/mms/pdu/DeliveryInd.java | 3 +- .../google/android/mms/pdu/EncodedStringValue.java | 3 +- .../android/mms/pdu/MultimediaMessagePdu.java | 7 +- .../com/google/android/mms/pdu/NotifyRespInd.java | 3 +- .../common/com/google/android/mms/pdu/PduBody.java | 5 +- .../common/com/google/android/mms/pdu/PduPart.java | 3 +- .../common/com/google/android/mms/pdu/SendReq.java | 3 +- .../com/google/android/mms/util/AbstractCache.java | 3 +- .../google/android/mms/util/DownloadDrmHelper.java | 3 +- .../com/google/android/mms/util/SqliteWrapper.java | 3 +- .../android/service/euicc/EuiccProfileInfo.java | 3 +- ...tDefaultDownloadableSubscriptionListResult.java | 3 +- .../GetDownloadableSubscriptionMetadataResult.java | 3 +- .../service/euicc/IDeleteSubscriptionCallback.aidl | 2 +- .../service/euicc/IEraseSubscriptionsCallback.aidl | 2 +- ...efaultDownloadableSubscriptionListCallback.aidl | 2 +- ...etDownloadableSubscriptionMetadataCallback.aidl | 2 +- .../android/service/euicc/IGetEidCallback.aidl | 2 +- .../service/euicc/IGetEuiccInfoCallback.aidl | 2 +- .../euicc/IGetEuiccProfileInfoListCallback.aidl | 2 +- ...RetainSubscriptionsForFactoryResetCallback.aidl | 2 +- .../euicc/ISwitchToSubscriptionCallback.aidl | 2 +- .../euicc/IUpdateSubscriptionNicknameCallback.aidl | 2 +- .../android/telephony/CarrierConfigManager.java | 3 +- .../java/android/telephony/CellIdentityGsm.java | 3 +- .../java/android/telephony/CellIdentityLte.java | 2 +- telephony/java/android/telephony/CellInfoCdma.java | 2 +- telephony/java/android/telephony/CellInfoGsm.java | 3 +- telephony/java/android/telephony/CellInfoLte.java | 2 +- .../android/telephony/CellSignalStrengthGsm.java | 2 +- .../android/telephony/CellSignalStrengthLte.java | 3 +- .../PhoneNumberFormattingTextWatcher.java | 3 +- .../java/android/telephony/PhoneNumberUtils.java | 7 +- .../telephony/PreciseDataConnectionState.java | 2 +- .../java/android/telephony/RadioAccessFamily.java | 8 +- telephony/java/android/telephony/ServiceState.java | 18 +-- telephony/java/android/telephony/SmsManager.java | 2 +- telephony/java/android/telephony/SmsMessage.java | 5 +- .../java/android/telephony/SubscriptionInfo.java | 7 +- .../android/telephony/SubscriptionManager.java | 16 +-- .../java/android/telephony/TelephonyManager.java | 30 ++--- .../telephony/euicc/DownloadableSubscription.java | 7 +- .../java/android/telephony/euicc/EuiccInfo.java | 3 +- .../android/telephony/ims/ImsCallForwardInfo.java | 15 +-- .../java/android/telephony/ims/ImsCallProfile.java | 11 +- .../java/android/telephony/ims/ImsReasonInfo.java | 2 +- .../java/android/telephony/ims/ImsSsInfo.java | 7 +- .../telephony/ims/ImsStreamMediaProfile.java | 9 +- .../telephony/ims/ImsVideoCallProvider.java | 3 +- .../android/telephony/ims/compat/ImsService.java | 5 +- .../telephony/ims/compat/feature/ImsFeature.java | 5 +- .../telephony/ims/compat/feature/MMTelFeature.java | 3 +- .../ims/compat/stub/ImsCallSessionImplBase.java | 3 +- .../ims/compat/stub/ImsConfigImplBase.java | 5 +- .../ims/compat/stub/ImsUtListenerImplBase.java | 3 +- .../mbms/vendor/IMbmsStreamingService.aidl | 8 +- .../java/com/android/ims/ImsConfigListener.aidl | 2 +- telephony/java/com/android/ims/ImsUtInterface.java | 3 +- .../ims/internal/IImsCallSessionListener.aidl | 44 ++++---- .../ims/internal/IImsRegistrationListener.aidl | 16 +-- .../com/android/ims/internal/IImsUtListener.aidl | 14 +-- .../ims/internal/IImsVideoCallCallback.aidl | 14 +-- .../ims/internal/IImsVideoCallProvider.aidl | 2 +- .../internal/telephony/ICarrierConfigLoader.aidl | 2 +- .../android/internal/telephony/IPhoneSubInfo.aidl | 2 +- .../com/android/internal/telephony/ITelephony.aidl | 10 +- .../android/internal/telephony/OperatorInfo.java | 24 ++-- .../telephony/Sms7BitEncodingTranslator.java | 9 +- .../android/internal/telephony/SmsMessageBase.java | 16 +-- .../internal/telephony/cdma/SmsMessage.java | 4 +- .../internal/telephony/cdma/sms/BearerData.java | 3 +- .../internal/telephony/gsm/SmsCbHeader.java | 15 +-- .../android/internal/telephony/gsm/SmsMessage.java | 14 +-- .../android/internal/telephony/uicc/IccUtils.java | 3 +- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/ScanResult.java | 29 ++--- wifi/java/android/net/wifi/WifiConfiguration.java | 6 +- wifi/java/android/net/wifi/WifiManager.java | 4 +- wifi/java/android/net/wifi/p2p/WifiP2pConfig.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pDevice.java | 3 +- .../android/net/wifi/p2p/WifiP2pDeviceList.java | 3 +- wifi/java/android/net/wifi/p2p/WifiP2pManager.java | 8 +- .../net/wifi/p2p/nsd/WifiP2pServiceInfo.java | 2 +- .../net/wifi/p2p/nsd/WifiP2pServiceRequest.java | 2 +- 639 files changed, 2398 insertions(+), 2026 deletions(-) (limited to 'telecomm/java') diff --git a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl index 6f624ee672e6..2c51935dc446 100644 --- a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl +++ b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl @@ -29,16 +29,16 @@ import android.os.WorkSource; */ interface IAlarmManager { /** windowLength == 0 means exact; windowLength < 0 means the let the OS decide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) 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 + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean setTime(long millis); void setTimeZone(String zone); void remove(in PendingIntent operation, in IAlarmListener listener); long getNextWakeFromIdleTime(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) AlarmManager.AlarmClockInfo getNextAlarmClock(int userId); long currentNetworkTimeMillis(); } diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index 9f98f8efc774..c2d530d00058 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -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; diff --git a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl index 643d47ca5c6a..7d02d2d6cd29 100644 --- a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl +++ b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl @@ -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); diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index f953da48c217..b1b9f4161ee5 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -888,7 +888,7 @@ public class AccessibilityServiceInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapabilities(int capabilities) { mCapabilities = capabilities; } diff --git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index b960a7f835d8..0d6a07938e95 100644 --- a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java @@ -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(@Nullable Object o) { diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 9bb02cdcce73..007b0a8ab960 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -546,7 +546,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; @@ -831,7 +831,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(), @@ -2122,7 +2122,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 confirmCredentialsAsUser(final Account account, final Bundle options, final Activity activity, diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index 3cdd691fd5dd..eb525d301986 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ConstantState; +import android.os.Build; import java.util.ArrayList; @@ -461,7 +462,7 @@ public abstract class Animator implements Cloneable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void reverse() { throw new IllegalStateException("Reverse is not supported"); } diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8c0b4387c27f..3c55bce4fc06 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -757,7 +757,7 @@ public class Activity extends ContextThemeWrapper */ public static final int FINISH_TASK_WITH_ACTIVITY = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final String FRAGMENTS_TAG = "android:fragments"; private static final String LAST_AUTOFILL_ID = "android:lastAutofillId"; @@ -2941,7 +2941,7 @@ public class Activity extends ContextThemeWrapper * @see View#onMovedToDisplay(int, Configuration) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public void onMovedToDisplay(int displayId, Configuration config) { } @@ -3211,7 +3211,7 @@ public class Activity extends ContextThemeWrapper * @deprecated Use {@link CursorLoader} instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Cursor managedQuery(Uri uri, String[] projection, String selection, String sortOrder) { Cursor c = getContentResolver().query(uri, projection, selection, null, sortOrder); @@ -6019,7 +6019,7 @@ public class Activity extends ContextThemeWrapper * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startActivityForResult( String who, Intent intent, int requestCode, @Nullable Bundle options) { Uri referrer = onProvideReferrer(); @@ -6351,7 +6351,7 @@ public class Activity extends ContextThemeWrapper * Finishes the current activity and specifies whether to remove the task associated with this * activity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void finish(int finishTask) { if (mParent == null) { int resultCode; @@ -7881,7 +7881,7 @@ public class Activity extends ContextThemeWrapper mParent = parent; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final void attach(Context context, ActivityThread aThread, Instrumentation instr, IBinder token, int ident, Application application, Intent intent, ActivityInfo info, @@ -7977,7 +7977,7 @@ public class Activity extends ContextThemeWrapper performCreate(icicle, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final void performCreate(Bundle icicle, PersistableBundle persistentState) { dispatchActivityPreCreated(icicle); mCanEnterPictureInPicture = true; @@ -8292,7 +8292,7 @@ public class Activity extends ContextThemeWrapper } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void dispatchActivityResult(String who, int requestCode, int resultCode, Intent data, String reason) { if (false) Log.v( diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index a0ec3f1b076f..ec287fe10634 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -507,18 +507,18 @@ public class ActivityManager { public static final int PROCESS_STATE_BOUND_TOP = 3; /** @hide Process is hosting a foreground service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; /** @hide Process is hosting a foreground service due to a system binding. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 5; /** @hide Process is important to the user, and something they are aware of. */ public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 6; /** @hide Process is important to the user, but not something they are aware of. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_IMPORTANT_BACKGROUND = 7; /** @hide Process is in the background transient so we will try to keep running. */ @@ -530,14 +530,14 @@ public class ActivityManager { /** @hide Process is in the background running a service. Unlike oom_adj, this level * is used for both the normal running in background state and the executing * operations state. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_SERVICE = 10; /** @hide Process is in the background running a receiver. Note that from the * perspective of oom_adj, receivers run at a higher foreground level, but for our * prioritization here that is not necessary and putting them below services means * many fewer changes in some process states as they receive broadcasts. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_RECEIVER = 11; /** @hide Same as {@link #PROCESS_STATE_TOP} but while device is sleeping. */ @@ -548,14 +548,14 @@ public class ActivityManager { public static final int PROCESS_STATE_HEAVY_WEIGHT = 13; /** @hide Process is in the background but hosts the home activity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_HOME = 14; /** @hide Process is in the background but hosts the last shown activity. */ public static final int PROCESS_STATE_LAST_ACTIVITY = 15; /** @hide Process is being cached for later use and contains activities. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROCESS_STATE_CACHED_ACTIVITY = 16; /** @hide Process is being cached for later use and is a client of another cached @@ -2197,7 +2197,7 @@ public class ActivityManager { /** * @return The size of the task at the point this snapshot was taken. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Point getTaskSize() { return mTaskSize; } @@ -2739,13 +2739,13 @@ public class ActivityManager { public boolean lowMemory; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long hiddenAppThreshold; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long secondaryServerThreshold; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long visibleAppThreshold; /** @hide */ @UnsupportedAppUsage @@ -3036,7 +3036,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_PERSISTENT = 1<<1; /** @@ -3044,7 +3044,7 @@ public class ActivityManager { * persistent system app. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_HAS_ACTIVITIES = 1<<2; /** @@ -3148,7 +3148,7 @@ public class ActivityManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170; @@ -3208,7 +3208,7 @@ public class ActivityManager { * will be passed to a client, use {@link #procStateToImportanceForClient}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @Importance int procStateToImportance(int procState) { if (procState == PROCESS_STATE_NONEXISTENT) { return IMPORTANCE_GONE; @@ -4167,7 +4167,7 @@ public class ActivityManager { * @param userid the user's id. Zero indicates the default user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean switchUser(int userid) { try { return getService().switchUser(userid); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 87c729b20c71..b68194792db1 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -346,7 +346,7 @@ public final class ActivityThread extends ClientTransactionHandler { @UnsupportedAppUsage AppBindData mBoundApplication; Profiler mProfiler; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCurDefaultDisplayDpi; @UnsupportedAppUsage boolean mDensityCompatMode; @@ -821,7 +821,7 @@ public final class ActivityThread extends ClientTransactionHandler { boolean trackAllocation; @UnsupportedAppUsage boolean restrictedBackupMode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean persistent; Configuration config; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2288,7 +2288,7 @@ public final class ActivityThread extends ClientTransactionHandler { return null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo, int flags) { boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0; @@ -3036,7 +3036,7 @@ public final class ActivityThread extends ClientTransactionHandler { proto.end(asToken); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void registerOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { @@ -3049,7 +3049,7 @@ public final class ActivityThread extends ClientTransactionHandler { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void unregisterOnActivityPausedListener(Activity activity, OnActivityPausedListener listener) { synchronized (mOnPauseListeners) { diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 3bcb87aa73f2..e20ef7f70954 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -797,7 +797,7 @@ public class AppOpsManager { // - add the op to the appropriate template in AppOpsState.OpsTemplate (settings app) /** @hide No operation specified. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int OP_NONE = AppProtoEnums.APP_OP_NONE; /** @hide Access to coarse location information. */ @UnsupportedAppUsage @@ -1156,7 +1156,7 @@ public class AppOpsManager { public static final int OP_RECORD_AUDIO_HOTWORD = 102; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int _NUM_OP = 104; /** Access to coarse location information. */ @@ -2592,7 +2592,7 @@ public class AppOpsManager { * Retrieve a non-localized name for the operation, for debugging output. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String opToName(int op) { if (op == OP_NONE) return "NONE"; return op < sOpNames.length ? sOpNames[op] : ("Unknown(" + op + ")"); @@ -2623,7 +2623,7 @@ public class AppOpsManager { * Retrieve the permission associated with an operation, or null if there is not one. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static String opToPermission(int op) { return sOpPerms[op]; @@ -6837,7 +6837,7 @@ public class AppOpsManager { /** @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resetAllModes() { try { mService.resetAllModes(mContext.getUserId(), null); diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 941467fad736..146d648fe65a 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.autofill.AutofillManager; @@ -352,7 +353,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { mLoadedApk = ContextImpl.getImpl(context).mPackageInfo; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -376,7 +377,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -388,7 +389,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -408,7 +409,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostStarted(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -418,7 +419,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -438,7 +439,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostResumed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -448,7 +449,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPrePaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -468,7 +469,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostPaused(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -478,7 +479,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -498,7 +499,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostStopped(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -508,7 +509,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -532,7 +533,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostSaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { Object[] callbacks = collectActivityLifecycleCallbacks(); @@ -544,7 +545,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPreDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { @@ -564,7 +565,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void dispatchActivityPostDestroyed(@NonNull Activity activity) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index c6b52c1ea705..7cef93fe7547 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1309,7 +1309,7 @@ public class ApplicationPackageManager extends PackageManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public boolean setInstantAppCookie(@NonNull byte[] cookie) { try { @@ -2422,7 +2422,7 @@ public class ApplicationPackageManager extends PackageManager { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable VolumeInfo getPackageCurrentVolume(ApplicationInfo app) { final StorageManager storage = mContext.getSystemService(StorageManager.class); return getPackageCurrentVolume(app, storage); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index e94fd452b7f8..5c3be316f924 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2700,7 +2700,7 @@ class ContextImpl extends Context { return context; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static ContextImpl createActivityContext(ActivityThread mainThread, LoadedApk packageInfo, ActivityInfo activityInfo, IBinder activityToken, int displayId, Configuration overrideConfiguration) { diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java index e4c84d7e7997..9fea3f75c2c2 100644 --- a/core/java/android/app/DialogFragment.java +++ b/core/java/android/app/DialogFragment.java @@ -19,6 +19,7 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.DialogInterface; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -183,11 +184,11 @@ public class DialogFragment extends Fragment int mTheme = 0; boolean mCancelable = true; boolean mShowsDialog = true; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mBackStackId = -1; Dialog mDialog; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mViewDestroyed; @UnsupportedAppUsage boolean mDismissed; diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 0719422632d1..355092378279 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -351,7 +351,7 @@ public class DownloadManager { * columns to request from DownloadProvider. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String[] UNDERLYING_COLUMNS = new String[] { DownloadManager.COLUMN_ID, DownloadManager.COLUMN_LOCAL_FILENAME, @@ -1646,7 +1646,7 @@ public class DownloadManager { /** * Get a parameterized SQL WHERE clause to select a bunch of IDs. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static String getWhereClauseForIds(long[] ids) { StringBuilder whereClause = new StringBuilder(); whereClause.append("("); @@ -1664,7 +1664,7 @@ public class DownloadManager { /** * Get the selection args for a clause returned by {@link #getWhereClauseForIds(long[])}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static String[] getWhereArgsForIds(long[] ids) { String[] whereArgs = new String[ids.length]; return getWhereArgsForIds(ids, whereArgs); diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index ce4109cd44a3..93381cf82764 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -306,7 +306,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene int mTargetRequestCode; // True if the fragment is in the list of added fragments. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mAdded; // If set this fragment is being removed from its activity. diff --git a/core/java/android/app/FragmentController.java b/core/java/android/app/FragmentController.java index f021f7690283..150b7a56a36d 100644 --- a/core/java/android/app/FragmentController.java +++ b/core/java/android/app/FragmentController.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.ArrayMap; @@ -44,7 +45,7 @@ import java.util.List; */ @Deprecated public class FragmentController { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final FragmentHostCallback mHost; /** diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 904c4735e0ff..5435558b3be5 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1101,7 +1101,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Animator loadAnimator(Fragment fragment, int transit, boolean enter, int transitionStyle) { Animator animObj = fragment.onCreateAnimator(transit, enter, fragment.getNextAnim()); diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index c0e3019f4619..879d4373f964 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -112,7 +112,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void unhandledBack(); @UnsupportedAppUsage boolean finishActivity(in IBinder token, int code, in Intent data, int finishTask); @@ -171,12 +171,12 @@ interface IActivityManager { @UnsupportedAppUsage boolean unbindService(in IServiceConnection connection); void publishService(in IBinder token, in Intent intent, in IBinder service); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDebugApp(in String packageName, boolean waitForDebugger, boolean persistent); void setAgentApp(in String packageName, @nullable String agent); @UnsupportedAppUsage void setAlwaysFinish(boolean enabled); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startInstrumentation(in ComponentName className, in String profileFile, int flags, in Bundle arguments, in IInstrumentationWatcher watcher, in IUiAutomationConnection connection, int userId, @@ -198,7 +198,7 @@ interface IActivityManager { * @throws RemoteException * @return Returns true if the configuration was updated. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean updateConfiguration(in Configuration values); /** * Updates mcc mnc configuration and applies changes to the entire system. @@ -223,7 +223,7 @@ interface IActivityManager { int mode, int userId); void revokeUriPermission(in IApplicationThread caller, in String targetPkg, in Uri uri, int mode, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setActivityController(in IActivityController watcher, boolean imAMonkey); void showWaitingForDebugger(in IApplicationThread who, boolean waiting); /* @@ -277,7 +277,7 @@ interface IActivityManager { List getRunningAppProcesses(); IBinder peekService(in Intent service, in String resolvedType, in String callingPackage); // Turn on/off profiling in a particular process. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean profileControl(in String process, int userId, boolean start, in ProfilerInfo profilerInfo, int profileType); @UnsupportedAppUsage @@ -309,7 +309,7 @@ interface IActivityManager { // Retrieve info of applications installed on external media that are currently // running. List getRunningExternalApplications(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void finishHeavyWeightApp(); // A StrictMode violation to be handled. @UnsupportedAppUsage @@ -331,7 +331,7 @@ interface IActivityManager { in RemoteCallback finishCallback); @UnsupportedAppUsage boolean isUserRunning(int userid, int flags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setPackageScreenCompatMode(in String packageName, int mode); @UnsupportedAppUsage boolean switchUser(int userid); @@ -349,12 +349,12 @@ interface IActivityManager { @UnsupportedAppUsage long[] getProcessPss(in int[] pids); void showBootMessage(in CharSequence msg, boolean always); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void killAllBackgroundProcesses(); ContentProviderHolder getContentProviderExternal(in String name, int userId, in IBinder token, String tag); /** @deprecated - Use {@link #removeContentProviderExternalAsUser} which takes a user ID. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void removeContentProviderExternal(in String name, in IBinder token); void removeContentProviderExternalAsUser(in String name, in IBinder token, int userId); // Get memory information about the calling process. @@ -382,7 +382,7 @@ interface IActivityManager { in String callingFeatureId, in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho, int requestCode, int flags, in ProfilerInfo profilerInfo, in Bundle options, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int stopUser(int userid, boolean force, in IStopUserCallback callback); /** * Check {@link com.android.server.am.ActivityManagerService#stopUserWithDelayedLocking(int, boolean, IStopUserCallback)} @@ -443,20 +443,20 @@ interface IActivityManager { String getLaunchedFromPackage(in IBinder activityToken); void killUid(int appId, int userId, in String reason); void setUserIsMonkey(boolean monkey); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void hang(in IBinder who, boolean allowRestart); List getAllRootTaskInfos(); void moveTaskToRootTask(int taskId, int rootTaskId, boolean toTop); void setFocusedRootTask(int taskId); ActivityTaskManager.RootTaskInfo getFocusedRootTaskInfo(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void restart(); void performIdleMaintenance(); void appNotRespondingViaProvider(in IBinder connection); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Rect getTaskBounds(int taskId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean setProcessMemoryTrimLevel(in String process, int userId, int level); @@ -464,13 +464,13 @@ interface IActivityManager { String getTagForIntentSender(in IIntentSender sender, in String prefix); @UnsupportedAppUsage boolean startUserInBackground(int userid); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isInLockTaskMode(); @UnsupportedAppUsage int startActivityFromRecents(int taskId, in Bundle options); @UnsupportedAppUsage void startSystemLockTaskMode(int taskId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isTopOfTask(in IBinder token); void bootAnimationComplete(); int checkPermissionWithToken(in String permission, int pid, int uid, @@ -481,11 +481,11 @@ interface IActivityManager { void notifyCleartextNetwork(int uid, in byte[] firstPacket); @UnsupportedAppUsage void setTaskResizeable(int taskId, int resizeableMode); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void resizeTask(int taskId, in Rect bounds, int resizeMode); @UnsupportedAppUsage int getLockTaskModeState(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDumpHeapDebugLimit(in String processName, int uid, long maxMemSize, in String reportPackage); void dumpHeapFinished(in String path); @@ -498,17 +498,17 @@ interface IActivityManager { // Start of N transactions // Start Binder transaction tracking for all applications. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startBinderTracking(); // Stop Binder transaction tracking for all applications and dump trace data to the given file // descriptor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void suppressResizeConfigChanges(boolean suppress); boolean moveTopActivityToPinnedRootTask(int rootTaskId, in Rect bounds); boolean isAppStartModeDisabled(int uid, in String packageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean unlockUser(int userid, in byte[] token, in byte[] secret, in IProgressListener listener); void killPackageDependents(in String packageName, int userId); @@ -517,7 +517,7 @@ interface IActivityManager { boolean isVrModePackageEnabled(in ComponentName packageName); void notifyLockedProfile(int userId); void startConfirmDeviceCredentialIntent(in Intent intent, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sendIdleJobTrigger(); int sendIntentSender(in IIntentSender target, in IBinder whitelistToken, int code, in Intent intent, in String resolvedType, in IIntentReceiver finishedReceiver, diff --git a/core/java/android/app/IAppTask.aidl b/core/java/android/app/IAppTask.aidl index f41d705e2ba7..d3046c590c4f 100644 --- a/core/java/android/app/IAppTask.aidl +++ b/core/java/android/app/IAppTask.aidl @@ -24,7 +24,7 @@ import android.os.Bundle; /** @hide */ interface IAppTask { void finishAndRemoveTask(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ActivityManager.RecentTaskInfo getTaskInfo(); void moveToFront(in IApplicationThread appThread, in String callingPackage); int startActivity(IBinder whoThread, String callingPackage, String callingFeatureId, diff --git a/core/java/android/app/IAssistDataReceiver.aidl b/core/java/android/app/IAssistDataReceiver.aidl index 0d69838e4329..d67fbff4548b 100644 --- a/core/java/android/app/IAssistDataReceiver.aidl +++ b/core/java/android/app/IAssistDataReceiver.aidl @@ -21,8 +21,8 @@ import android.os.Bundle; /** @hide */ oneway interface IAssistDataReceiver { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onHandleAssistData(in Bundle resultData); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onHandleAssistScreenshot(in Bitmap screenshot); } diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 66a7f4df03bb..c052186bb974 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -126,7 +126,7 @@ interface INotificationManager StatusBarNotification[] getActiveNotifications(String callingPkg); StatusBarNotification[] getActiveNotificationsWithAttribution(String callingPkg, String callingAttributionTag); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count, boolean includeSnoozed); StatusBarNotification[] getHistoricalNotificationsWithAttribution(String callingPkg, String callingAttributionTag, int count, boolean includeSnoozed); diff --git a/core/java/android/app/IStopUserCallback.aidl b/core/java/android/app/IStopUserCallback.aidl index d3c2ff776128..c99734259f57 100644 --- a/core/java/android/app/IStopUserCallback.aidl +++ b/core/java/android/app/IStopUserCallback.aidl @@ -22,7 +22,7 @@ package android.app; */ interface IStopUserCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void userStopped(int userId); void userStopAborted(int userId); } diff --git a/core/java/android/app/ITransientNotification.aidl b/core/java/android/app/ITransientNotification.aidl index 09a3ba045fc2..537a8f2acdc5 100644 --- a/core/java/android/app/ITransientNotification.aidl +++ b/core/java/android/app/ITransientNotification.aidl @@ -19,7 +19,7 @@ package android.app; /** @hide */ oneway interface ITransientNotification { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void show(IBinder windowToken); void hide(); } diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index 4cb8d936aa9c..101917bc2e07 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -83,7 +83,7 @@ interface IWallpaperManager { * information about that wallpaper. Otherwise, if it is a static image, * simply return null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) WallpaperInfo getWallpaperInfo(int userId); /** diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index f2a9daafb4ce..9e967958c9cb 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1416,7 +1416,7 @@ public class Instrumentation { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void callActivityOnNewIntent(Activity activity, ReferrerIntent intent) { final String oldReferrer = activity.mReferrer; try { @@ -1762,7 +1762,7 @@ public class Instrumentation { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int execStartActivitiesAsUser(Context who, IBinder contextThread, IBinder token, Activity target, Intent[] intents, Bundle options, int userId) { @@ -1945,7 +1945,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActivityResult execStartActivityAsCaller( Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options, IBinder permissionToken, @@ -1993,7 +1993,7 @@ public class Instrumentation { * Special version! * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void execStartActivityFromAppTask( Context who, IBinder contextThread, IAppTask appTask, Intent intent, Bundle options) { diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 2122e92ba5b5..545c3f70d466 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -531,7 +531,7 @@ public class KeyguardManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDeviceSecure(int userId) { try { return mTrustManager.isDeviceSecure(userId); diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 202b6152d2ea..b6094627d1f6 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -117,7 +117,7 @@ public final class LoadedApk { private String[] mOverlayDirs; @UnsupportedAppUsage private String mDataDir; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mLibDir; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private File mDataDirFile; @@ -286,7 +286,7 @@ public final class LoadedApk { return mSecurityViolation; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CompatibilityInfo getCompatibilityInfo() { return mDisplayAdjustments.getCompatibilityInfo(); } @@ -1739,7 +1739,7 @@ public final class LoadedApk { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IServiceConnection lookupServiceDispatcher(ServiceConnection c, Context context) { synchronized (mServices) { @@ -1805,7 +1805,7 @@ public final class LoadedApk { static final class ServiceDispatcher { private final ServiceDispatcher.InnerConnection mIServiceConnection; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ServiceConnection mConnection; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Context mContext; @@ -1824,7 +1824,7 @@ public final class LoadedApk { } private static class InnerConnection extends IServiceConnection.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final WeakReference mDispatcher; InnerConnection(LoadedApk.ServiceDispatcher sd) { @@ -1843,7 +1843,7 @@ public final class LoadedApk { private final ArrayMap mActiveConnections = new ArrayMap(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ServiceDispatcher(ServiceConnection conn, Context context, Handler activityThread, int flags) { mIServiceConnection = new InnerConnection(this); @@ -1908,7 +1908,7 @@ public final class LoadedApk { return mConnection; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) IServiceConnection getIServiceConnection() { return mIServiceConnection; } diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index 74bc9e215106..12d16049d1c3 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -71,7 +71,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private NativeContentView mNativeContentView; private InputMethodManager mIMM; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeHandle; private InputQueue mCurInputQueue; @@ -87,7 +87,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private boolean mDestroyed; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native long loadNativeCode(String path, String funcname, MessageQueue queue, String internalDataPath, String obbPath, String externalDataPath, int sdkVersion, AssetManager assetMgr, byte[] savedState, ClassLoader classLoader, String libraryPath); @@ -315,22 +315,22 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setWindowFlags(int flags, int mask) { getWindow().setFlags(flags, mask); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setWindowFormat(int format) { getWindow().setFormat(format); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void showIme(int mode) { mIMM.showSoftInput(mNativeContentView, mode); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void hideIme(int mode) { mIMM.hideSoftInputFromWindow(mNativeContentView.getWindowToken(), mode); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 5e50b96a23d5..a1abe3d8190b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5266,7 +5266,7 @@ public class Notification implements Parcelable /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String loadHeaderAppName() { CharSequence name = null; final PackageManager pm = mContext.getPackageManager(); diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index f3bd04cd132e..27cd78acb35f 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -1112,7 +1112,7 @@ public class NotificationManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ZenModeConfig getZenModeConfig() { INotificationManager service = getService(); try { diff --git a/core/java/android/app/PackageDeleteObserver.java b/core/java/android/app/PackageDeleteObserver.java index d8803aa13e42..4ff6f2a5133b 100644 --- a/core/java/android/app/PackageDeleteObserver.java +++ b/core/java/android/app/PackageDeleteObserver.java @@ -19,11 +19,12 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.pm.IPackageDeleteObserver2; +import android.os.Build; /** {@hide} */ public class PackageDeleteObserver { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PackageDeleteObserver() { } diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 37c4c92d0635..21dfbbd6f15d 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -319,7 +319,7 @@ public final class PendingIntent implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setOnMarshaledListener(OnMarshaledListener listener) { sOnMarshaledListener.set(listener); } diff --git a/core/java/android/app/QueuedWork.java b/core/java/android/app/QueuedWork.java index a1fcf53a2c37..edf0a46b1433 100644 --- a/core/java/android/app/QueuedWork.java +++ b/core/java/android/app/QueuedWork.java @@ -17,6 +17,7 @@ package android.app; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -217,7 +218,7 @@ public class QueuedWork { * @param work The new runnable to process * @param shouldDelay If the message should be delayed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void queue(Runnable work, boolean shouldDelay) { Handler handler = getHandler(); diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index dcb53505227a..7dd7c901ff84 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -31,6 +31,7 @@ import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Rect; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -778,7 +779,7 @@ public class SearchManager * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVisible() { return mSearchDialog == null? false : mSearchDialog.isShowing(); } diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java index 3df164822f32..bc1bcbc4f80e 100644 --- a/core/java/android/app/SharedPreferencesImpl.java +++ b/core/java/android/app/SharedPreferencesImpl.java @@ -130,7 +130,7 @@ final class SharedPreferencesImpl implements SharedPreferences { startLoadFromDisk(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void startLoadFromDisk() { synchronized (mLock) { mLoaded = false; diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 864db2722d53..b8fae6755bfd 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -26,6 +26,7 @@ import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -54,7 +55,7 @@ public class StatusBarManager { /** @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISABLE_NOTIFICATION_TICKER = View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER; /** @hide */ @@ -313,7 +314,7 @@ public class StatusBarManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void expandSettingsPanel(@Nullable String subPanel) { try { final IStatusBarService svc = getService(); @@ -326,7 +327,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIcon(String slot, int iconId, int iconLevel, String contentDescription) { try { final IStatusBarService svc = getService(); @@ -340,7 +341,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeIcon(String slot) { try { final IStatusBarService svc = getService(); @@ -353,7 +354,7 @@ public class StatusBarManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIconVisibility(String slot, boolean visible) { try { final IStatusBarService svc = getService(); diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index 5caf3057c840..8a3ae04a3589 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -26,6 +26,7 @@ import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; @@ -45,7 +46,7 @@ public class TaskInfo { * running user of the system otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int userId; /** diff --git a/core/java/android/app/TaskStackListener.java b/core/java/android/app/TaskStackListener.java index e77d7ac6a4ad..70ad9af8a037 100644 --- a/core/java/android/app/TaskStackListener.java +++ b/core/java/android/app/TaskStackListener.java @@ -21,6 +21,7 @@ import android.app.ActivityManager.TaskSnapshot; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -37,35 +38,35 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskStackChanged() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityPinned(String packageName, int userId, int taskId, int stackId) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityUnpinned() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityRestartAttempt(RunningTaskInfo task, boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityForcedResizable(String packageName, int taskId, int reason) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityDismissingDockedStack() throws RemoteException { } @@ -80,12 +81,12 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * #onActivityLaunchOnSecondaryDisplayFailed(RunningTaskInfo, int)} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityLaunchOnSecondaryDisplayFailed() throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityLaunchOnSecondaryDisplayRerouted(RunningTaskInfo taskInfo, int requestedDisplayId) throws RemoteException { } @@ -95,7 +96,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskRemoved(int taskId) throws RemoteException { } @@ -109,7 +110,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { * @deprecated see {@link #onTaskMovedToFront(RunningTaskInfo)} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskMovedToFront(int taskId) throws RemoteException { } @@ -141,18 +142,18 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskProfileLocked(int taskId, int userId) throws RemoteException { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) throws RemoteException { if (Binder.getCallingPid() != android.os.Process.myPid() && snapshot != null && snapshot.getHardwareBuffer() != null) { @@ -162,7 +163,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken) throws RemoteException { } diff --git a/core/java/android/app/UiAutomationConnection.java b/core/java/android/app/UiAutomationConnection.java index 255b93f79811..290e12191de8 100644 --- a/core/java/android/app/UiAutomationConnection.java +++ b/core/java/android/app/UiAutomationConnection.java @@ -25,6 +25,7 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.hardware.input.InputManager; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.Process; @@ -88,7 +89,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { private int mOwningUid; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UiAutomationConnection() { } diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 08a210b069b9..42b4c5c389bb 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -9,6 +9,7 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; +import android.os.Build; import android.os.RemoteException; import android.service.vr.IPersistentVrStateCallbacks; import android.service.vr.IVrManager; @@ -51,7 +52,7 @@ public class VrManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final IVrManager mService; private Map mCallbackMap = new ArrayMap<>(); diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 54f3209e17be..ab0901da632f 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1977,7 +1977,7 @@ public class WallpaperManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static InputStream openDefaultWallpaper(Context context, @SetWallpaperFlags int which) { final String whichProp; final int defaultResId; diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 4c541b3f6b76..1ee8e4fce58b 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -459,7 +459,7 @@ public final class DeviceAdminInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getUsedPolicies() { ArrayList res = new ArrayList(); for (int i=0; i exclusionList ) { throwIfParentInstance("setGlobalProxy"); @@ -6318,7 +6318,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setActiveAdmin(@NonNull ComponentName policyReceiver, boolean refreshing, int userHandle) { if (mService != null) { @@ -7032,7 +7032,7 @@ public class DevicePolicyManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable ComponentName getProfileOwnerAsUser(final int userId) { if (mService != null) { try { @@ -7447,7 +7447,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN) public @Nullable List getTrustAgentConfiguration( @Nullable ComponentName admin, @NonNull ComponentName agent, int userHandle) { @@ -10633,7 +10633,7 @@ public class DevicePolicyManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void throwIfParentInstance(String functionName) { if (mParentInstance) { throw new SecurityException(functionName + " cannot be called on the parent instance"); diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 5a4ab48f3823..86f91d79ad2b 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemProperties; @@ -524,7 +525,7 @@ public class SecurityLog { * Constructor used by native classes to generate SecurityEvent instances. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ SecurityEvent(byte[] data) { this(0, data); } diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index fb161d41acd2..50d7cec0bc71 100644 --- a/core/java/android/app/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -18,6 +18,7 @@ package android.app.backup; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -68,7 +69,7 @@ public class BackupDataOutput { private final long mQuota; private final int mTransportFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) long mBackupWriter; /** diff --git a/core/java/android/app/backup/FullBackup.java b/core/java/android/app/backup/FullBackup.java index 587e883edaf2..c854abac291e 100644 --- a/core/java/android/app/backup/FullBackup.java +++ b/core/java/android/app/backup/FullBackup.java @@ -20,6 +20,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.XmlResourceParser; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.Process; import android.os.storage.StorageManager; @@ -91,7 +92,7 @@ public class FullBackup { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static public native int backupToTar(String packageName, String domain, String linkdomain, String rootpath, String path, FullBackupDataOutput output); diff --git a/core/java/android/app/backup/FullBackupDataOutput.java b/core/java/android/app/backup/FullBackupDataOutput.java index d8fa0f586b7a..a47478cc66a7 100644 --- a/core/java/android/app/backup/FullBackupDataOutput.java +++ b/core/java/android/app/backup/FullBackupDataOutput.java @@ -1,6 +1,7 @@ package android.app.backup; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -77,7 +78,7 @@ public class FullBackupDataOutput { public BackupDataOutput getData() { return mData; } /** @hide - used for measurement pass */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addSize(long size) { if (size > 0) { mSize += size; diff --git a/core/java/android/app/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl index e177a74915ee..e1bbc08e72f3 100644 --- a/core/java/android/app/backup/IBackupManager.aidl +++ b/core/java/android/app/backup/IBackupManager.aidl @@ -74,7 +74,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.clearBackupDataForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void clearBackupData(String transportName, String packageName); /** @@ -157,7 +157,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setBackupEnabled(boolean isEnabled); /** @@ -181,7 +181,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.setAutoRestoreForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAutoRestore(boolean doAutoRestore); /** @@ -198,7 +198,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.isBackupEnabledForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBackupEnabled(); /** @@ -327,7 +327,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.acknowledgeFullBackupOrRestoreForUser} for the * calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void acknowledgeFullBackupOrRestore(int token, boolean allow, in String curPassword, in String encryptionPassword, IFullBackupRestoreObserver observer); @@ -404,7 +404,7 @@ interface IBackupManager { /** * {@link android.app.backup.IBackupManager.listAllTransportsForUser} for the calling user id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String[] listAllTransports(); /** @@ -442,7 +442,7 @@ interface IBackupManager { * {@link android.app.backup.IBackupManager.selectBackupTransportForUser} for the calling user * id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String selectBackupTransport(String transport); /** @@ -595,7 +595,7 @@ interface IBackupManager { * @param whichUser User handle of the defined user whose backup active state * is being queried. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBackupServiceActive(int whichUser); /** diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index 8320f49f132f..e059f177e344 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -24,6 +24,7 @@ import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.app.ResultInfo; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -37,7 +38,7 @@ import java.util.Objects; */ public class ActivityResultItem extends ActivityTransactionItem { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private List mResultInfoList; /* TODO(b/78294732) diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index ac57f2bf80e0..723fa012c902 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Trace; @@ -39,7 +40,7 @@ import java.util.Objects; */ public class NewIntentItem extends ActivityTransactionItem { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private List mIntents; private boolean mResume; diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl index ed6ba0c5efa4..2c1e951b6128 100644 --- a/core/java/android/app/usage/IUsageStatsManager.aidl +++ b/core/java/android/app/usage/IUsageStatsManager.aidl @@ -28,10 +28,10 @@ import java.util.Map; * {@hide} */ interface IUsageStatsManager { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryUsageStats(int bucketType, long beginTime, long endTime, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryConfigurationStats(int bucketType, long beginTime, long endTime, String callingPackage); ParceledListSlice queryEventStats(int bucketType, long beginTime, long endTime, @@ -40,9 +40,9 @@ interface IUsageStatsManager { UsageEvents queryEventsForPackage(long beginTime, long endTime, String callingPackage); UsageEvents queryEventsForUser(long beginTime, long endTime, int userId, String callingPackage); UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAppInactive(String packageName, boolean inactive, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isAppInactive(String packageName, int userId, String callingPackage); void onCarrierPrivilegedAppsChanged(); void reportChooserSelection(String packageName, int userId, String contentType, diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java index fc8248e1012a..1ddfe0d2479a 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/core/java/android/app/usage/NetworkStatsManager.java @@ -34,6 +34,7 @@ import android.net.NetworkTemplate; import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.NetworkStatsProvider; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -129,7 +130,7 @@ public class NetworkStatsManager { /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStatsManager(Context context) throws ServiceNotFoundException { this(context, INetworkStatsService.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE))); @@ -153,7 +154,7 @@ public class NetworkStatsManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public void setPollForce(boolean pollForce) { if (pollForce) { diff --git a/core/java/android/appwidget/AppWidgetHost.java b/core/java/android/appwidget/AppWidgetHost.java index 467b2fba1102..565e4cd7fea0 100644 --- a/core/java/android/appwidget/AppWidgetHost.java +++ b/core/java/android/appwidget/AppWidgetHost.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.IntentSender; import android.content.pm.PackageManager; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -54,7 +55,7 @@ public class AppWidgetHost { static final int HANDLE_UPDATE = 1; static final int HANDLE_PROVIDER_CHANGED = 2; static final int HANDLE_PROVIDERS_CHANGED = 3; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final int HANDLE_VIEW_DATA_CHANGED = 4; static final int HANDLE_APP_WIDGET_REMOVED = 5; @@ -173,7 +174,7 @@ public class AppWidgetHost { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AppWidgetHost(Context context, int hostId, OnClickHandler handler, Looper looper) { mContextOpPackageName = context.getOpPackageName(); mHostId = hostId; diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index 3fef92b203b6..a3c3a0e106a3 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -30,6 +30,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; +import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; import android.os.Parcelable; @@ -286,7 +287,7 @@ public class AppWidgetHostView extends FrameLayout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth, int maxHeight, boolean ignorePadding) { if (newOptions == null) { diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 009ec522e436..37093a10b2f0 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -34,6 +34,7 @@ import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.pm.ShortcutInfo; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -943,7 +944,7 @@ public class AppWidgetManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void bindAppWidgetId(int appWidgetId, ComponentName provider, Bundle options) { if (mService == null) { return; @@ -1114,7 +1115,7 @@ public class AppWidgetManager { * @see Context#getServiceDispatcher(ServiceConnection, Handler, int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean bindRemoteViewsService(Context context, int appWidgetId, Intent intent, IServiceConnection connection, @Context.BindServiceFlags int flags) { if (mService == null) { diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index 5374d6d55ee3..c0cb32346821 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -118,7 +118,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -139,7 +139,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_CODEC_CONFIG_CHANGED = "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED"; @@ -409,7 +409,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @hide */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); try { @@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * is active * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { @@ -651,7 +651,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @return the current codec status * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) { @@ -680,7 +680,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * @param codecConfig the codec configuration preference * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void setCodecConfigPreference(@NonNull BluetoothDevice device, @NonNull BluetoothCodecConfig codecConfig) { @@ -710,7 +710,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void enableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")"); @@ -725,7 +725,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * active A2DP Bluetooth device. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public void disableOptionalCodecs(@NonNull BluetoothDevice device) { if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")"); @@ -766,7 +766,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_SUPPORTED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsSupportStatus public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) { @@ -792,7 +792,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @OptionalCodecsPreferenceStatus public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) { @@ -819,7 +819,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * OPTIONAL_CODECS_PREF_DISABLED. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device, @OptionalCodecsPreferenceStatus int value) { diff --git a/core/java/android/bluetooth/BluetoothA2dpSink.java b/core/java/android/bluetooth/BluetoothA2dpSink.java index 53f87e6bc05b..67f3d7b5d717 100755 --- a/core/java/android/bluetooth/BluetoothA2dpSink.java +++ b/core/java/android/bluetooth/BluetoothA2dpSink.java @@ -24,6 +24,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -158,7 +159,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 573892bcf014..475be121b735 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -40,6 +40,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.BatteryStats; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.ParcelUuid; import android.os.RemoteException; @@ -1170,7 +1171,7 @@ public final class BluetoothAdapter { * @return true to indicate adapter shutdown has begun, or false on immediate error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disable(boolean persist) { try { @@ -1219,7 +1220,7 @@ public final class BluetoothAdapter { * @return true to indicate that the config file was successfully cleared * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean factoryReset() { try { @@ -2625,7 +2626,7 @@ public final class BluetoothAdapter { * permissions, or channel in use. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BluetoothServerSocket listenUsingEncryptedRfcommWithServiceRecord(String name, UUID uuid) throws IOException { return createNewRfcommSocketAndRecord(name, uuid, false, true); diff --git a/core/java/android/bluetooth/BluetoothCodecStatus.java b/core/java/android/bluetooth/BluetoothCodecStatus.java index 7764ebeb2e33..3a65aaa0d16c 100644 --- a/core/java/android/bluetooth/BluetoothCodecStatus.java +++ b/core/java/android/bluetooth/BluetoothCodecStatus.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +40,7 @@ public final class BluetoothCodecStatus implements Parcelable { * This extra represents the current codec status of the A2DP * profile. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_CODEC_STATUS = "android.bluetooth.extra.CODEC_STATUS"; @@ -198,7 +199,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return the current codec configuration */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig getCodecConfig() { return mCodecConfig; } @@ -208,7 +209,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs local capabilities */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() { return mCodecsLocalCapabilities; } @@ -218,7 +219,7 @@ public final class BluetoothCodecStatus implements Parcelable { * * @return an array with the codecs selectable capabilities */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() { return mCodecsSelectableCapabilities; } diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 1b0fe9dc2d78..3b8dec7bf955 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -28,6 +28,7 @@ import android.annotation.SystemApi; import android.app.PropertyInvalidatedCache; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Parcel; import android.os.ParcelUuid; @@ -369,7 +370,7 @@ public final class BluetoothDevice implements Parcelable { /** @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_SDP_RECORD = "android.bluetooth.device.action.SDP_RECORD"; @@ -665,7 +666,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_FAILED = 1; /** @@ -674,7 +675,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_REJECTED = 2; /** @@ -689,7 +690,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REMOTE_DEVICE_DOWN = 4; /** @@ -697,7 +698,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5; /** @@ -705,7 +706,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_AUTH_TIMEOUT = 6; /** @@ -713,7 +714,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7; /** @@ -722,7 +723,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8; /** @@ -801,7 +802,7 @@ public final class BluetoothDevice implements Parcelable { "android.bluetooth.device.extra.SDP_RECORD"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_SDP_SEARCH_STATUS = "android.bluetooth.device.extra.SDP_SEARCH_STATUS"; @@ -1134,7 +1135,7 @@ public final class BluetoothDevice implements Parcelable { * @return true on success, false on error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public boolean setAlias(@NonNull String alias) { final IBluetooth service = sService; @@ -1573,7 +1574,7 @@ public final class BluetoothDevice implements Parcelable { * @return true pin has been set false for error * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean setPin(@NonNull String pin) { byte[] pinBytes = convertPinToBytes(pin); @@ -2187,7 +2188,7 @@ public final class BluetoothDevice implements Parcelable { * operations. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BluetoothGatt connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport, boolean opportunistic, int phy, Handler handler) { diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index 6d22eb93fd02..7a6ff79623af 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -58,9 +58,9 @@ public final class BluetoothGatt implements BluetoothProfile { private int mConnState; private final Object mStateLock = new Object(); private final Object mDeviceBusyLock = new Object(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Boolean mDeviceBusy = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mTransport; private int mPhy; private boolean mOpportunistic; @@ -881,7 +881,7 @@ public final class BluetoothGatt implements BluetoothProfile { * automatically connect as soon as the remote device becomes available (true). * @return true, if the connection attempt was initiated successfully */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ boolean connect(Boolean autoConnect, BluetoothGattCallback callback, Handler handler) { if (DBG) { diff --git a/core/java/android/bluetooth/BluetoothGattService.java b/core/java/android/bluetooth/BluetoothGattService.java index e7809aeb1bb5..23dc7c830855 100644 --- a/core/java/android/bluetooth/BluetoothGattService.java +++ b/core/java/android/bluetooth/BluetoothGattService.java @@ -16,6 +16,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -385,7 +386,7 @@ public class BluetoothGattService implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAdvertisePreferred(boolean advertisePreferred) { mAdvertisePreferred = advertisePreferred; } diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index e6d6e7ac5dda..57d1411aa68a 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -27,6 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -112,7 +113,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -635,7 +636,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @return priority of the device * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public int getPriority(BluetoothDevice device) { if (VDBG) log("getPriority(" + device + ")"); @@ -782,7 +783,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadset service = mService; @@ -1030,7 +1031,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type, String name) { final IBluetoothHeadset service = mService; @@ -1129,7 +1130,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * @hide */ @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) { Log.d(TAG, "setActiveDevice: " + device); @@ -1155,7 +1156,7 @@ public final class BluetoothHeadset implements BluetoothProfile { * is active. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothDevice getActiveDevice() { diff --git a/core/java/android/bluetooth/BluetoothHeadsetClient.java b/core/java/android/bluetooth/BluetoothHeadsetClient.java index 28363250ebda..e5b2a1e23cc1 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClient.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClient.java @@ -22,6 +22,7 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; @@ -445,7 +446,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -471,7 +472,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothHeadsetClient service = @@ -780,7 +781,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * @return true if command has been issued successfully; false * otherwise; upon completion HFP sends {@link #ACTION_CALL_CHANGED} intent. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean acceptCall(BluetoothDevice device, int flag) { if (DBG) log("acceptCall()"); final IBluetoothHeadsetClient service = @@ -829,7 +830,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * #EXTRA_AG_FEATURE_REJECT_CALL}. This method invocation will fail silently when feature is not * supported.

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean rejectCall(BluetoothDevice device) { if (DBG) log("rejectCall()"); final IBluetoothHeadsetClient service = @@ -1014,7 +1015,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { * * Note: This is an internal function and shouldn't be exposed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getAudioState(BluetoothDevice device) { if (VDBG) log("getAudioState"); final IBluetoothHeadsetClient service = diff --git a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java index d1a096e605dd..219d1596fbf3 100644 --- a/core/java/android/bluetooth/BluetoothHeadsetClientCall.java +++ b/core/java/android/bluetooth/BluetoothHeadsetClientCall.java @@ -17,6 +17,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -144,7 +145,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return call id. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getId() { return mId; } @@ -164,7 +165,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return state of this particular phone call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getState() { return mState; } @@ -174,7 +175,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return string representing phone number. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getNumber() { return mNumber; } @@ -193,7 +194,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if call is a multi party call, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isMultiParty() { return mMultiParty; } @@ -203,7 +204,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable { * * @return true if its outgoing call, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOutgoing() { return mOutgoing; } diff --git a/core/java/android/bluetooth/BluetoothHearingAid.java b/core/java/android/bluetooth/BluetoothHearingAid.java index fa62a02499e0..ff78825e0f96 100644 --- a/core/java/android/bluetooth/BluetoothHearingAid.java +++ b/core/java/android/bluetooth/BluetoothHearingAid.java @@ -26,6 +26,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -85,7 +86,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED"; @@ -302,7 +303,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setActiveDevice(@Nullable BluetoothDevice device) { if (DBG) log("setActiveDevice(" + device + ")"); final IBluetoothHearingAid service = getService(); @@ -328,7 +329,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { * is not active, it will be null on that position. Returns empty list on error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(Manifest.permission.BLUETOOTH) public @NonNull List getActiveDevices() { if (VDBG) log("getActiveDevices()"); diff --git a/core/java/android/bluetooth/BluetoothMap.java b/core/java/android/bluetooth/BluetoothMap.java index 14a71c44673b..35549954007e 100644 --- a/core/java/android/bluetooth/BluetoothMap.java +++ b/core/java/android/bluetooth/BluetoothMap.java @@ -24,6 +24,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.CloseGuard; @@ -209,7 +210,7 @@ public final class BluetoothMap implements BluetoothProfile, AutoCloseable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothMap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothMapClient.java b/core/java/android/bluetooth/BluetoothMapClient.java index df11d3adac01..ff6cffb272a5 100644 --- a/core/java/android/bluetooth/BluetoothMapClient.java +++ b/core/java/android/bluetooth/BluetoothMapClient.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -388,7 +389,7 @@ public final class BluetoothMapClient implements BluetoothProfile { * @param deliveredIntent intent issued when message is delivered * @return true if the message is enqueued, false on error */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean sendMessage(BluetoothDevice device, Uri[] contacts, String message, PendingIntent sentIntent, PendingIntent deliveredIntent) { if (DBG) Log.d(TAG, "sendMessage(" + device + ", " + contacts + ", " + message); diff --git a/core/java/android/bluetooth/BluetoothPan.java b/core/java/android/bluetooth/BluetoothPan.java index ce3c7d25a108..ecd718cec32b 100644 --- a/core/java/android/bluetooth/BluetoothPan.java +++ b/core/java/android/bluetooth/BluetoothPan.java @@ -27,6 +27,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -234,7 +235,7 @@ public final class BluetoothPan implements BluetoothProfile { * @return false on immediate error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean connect(BluetoothDevice device) { if (DBG) log("connect(" + device + ")"); final IBluetoothPan service = getService(); diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java index d58a89350195..6e5c45f3d129 100644 --- a/core/java/android/bluetooth/BluetoothPbap.java +++ b/core/java/android/bluetooth/BluetoothPbap.java @@ -27,6 +27,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; @@ -322,7 +323,7 @@ public class BluetoothPbap implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { log("disconnect()"); final IBluetoothPbap service = mService; diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index 7538df8bbe5f..db851c4f33b9 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -23,6 +23,7 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -219,7 +220,7 @@ public interface BluetoothProfile { * * @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int PRIORITY_AUTO_CONNECT = 1000; /** diff --git a/core/java/android/bluetooth/BluetoothSap.java b/core/java/android/bluetooth/BluetoothSap.java index 48e8c1ada255..0d70dbdd8427 100644 --- a/core/java/android/bluetooth/BluetoothSap.java +++ b/core/java/android/bluetooth/BluetoothSap.java @@ -21,6 +21,7 @@ import android.annotation.RequiresPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -219,7 +220,7 @@ public final class BluetoothSap implements BluetoothProfile { * @return false on error, true otherwise * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean disconnect(BluetoothDevice device) { if (DBG) log("disconnect(" + device + ")"); final IBluetoothSap service = getService(); diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index d41a6d064d1f..65381dbb2372 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.compat.annotation.UnsupportedAppUsage; import android.net.LocalSocket; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.ParcelUuid; import android.os.RemoteException; @@ -111,7 +112,7 @@ public final class BluetoothSocket implements Closeable { public static final int TYPE_L2CAP_LE = 4; /*package*/ static final int EBADFD = 77; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ static final int EADDRINUSE = 98; /*package*/ static final int SEC_FLAG_ENCRYPT = 1; diff --git a/core/java/android/companion/AssociationRequest.java b/core/java/android/companion/AssociationRequest.java index 01643bb4d2d6..8170bf92ae1e 100644 --- a/core/java/android/companion/AssociationRequest.java +++ b/core/java/android/companion/AssociationRequest.java @@ -19,6 +19,7 @@ package android.companion; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.provider.OneTimeUseBuilder; @@ -62,14 +63,14 @@ public final class AssociationRequest implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSingleDevice() { return mSingleDevice; } /** @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List> getDeviceFilters() { return mDeviceFilters; } diff --git a/core/java/android/companion/BluetoothDeviceFilter.java b/core/java/android/companion/BluetoothDeviceFilter.java index 48dab3b264fd..be663f7bdc1d 100644 --- a/core/java/android/companion/BluetoothDeviceFilter.java +++ b/core/java/android/companion/BluetoothDeviceFilter.java @@ -27,6 +27,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.bluetooth.BluetoothDevice; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.provider.OneTimeUseBuilder; @@ -100,7 +101,7 @@ public final class BluetoothDeviceFilter implements DeviceFilter { /** @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ScanFilter getScanFilter() { return mScanFilter; } diff --git a/core/java/android/companion/DeviceFilter.java b/core/java/android/companion/DeviceFilter.java index c9cb072904b4..37191a246f00 100644 --- a/core/java/android/companion/DeviceFilter.java +++ b/core/java/android/companion/DeviceFilter.java @@ -20,6 +20,7 @@ package android.companion; import android.annotation.IntDef; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcelable; import java.lang.annotation.Retention; @@ -45,11 +46,11 @@ public interface DeviceFilter extends Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean matches(D device); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) String getDeviceDisplayName(D device); /** @hide */ diff --git a/core/java/android/companion/IFindDeviceCallback.aidl b/core/java/android/companion/IFindDeviceCallback.aidl index 405277b50f5b..a3a47a9fc857 100644 --- a/core/java/android/companion/IFindDeviceCallback.aidl +++ b/core/java/android/companion/IFindDeviceCallback.aidl @@ -20,7 +20,7 @@ import android.app.PendingIntent; /** @hide */ interface IFindDeviceCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) oneway void onSuccess(in PendingIntent launcher); oneway void onFailure(in CharSequence reason); } diff --git a/core/java/android/content/ComponentName.java b/core/java/android/content/ComponentName.java index b1cee0cb00e0..5f859846a5c1 100644 --- a/core/java/android/content/ComponentName.java +++ b/core/java/android/content/ComponentName.java @@ -19,6 +19,7 @@ package android.content; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -241,14 +242,14 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final ForceLoadContentObserver mObserver; Uri mUri; @@ -55,7 +56,7 @@ public class CursorLoader extends AsyncTaskLoader { String mSortOrder; Cursor mCursor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CancellationSignal mCancellationSignal; /* Runs on a worker thread */ diff --git a/core/java/android/content/IContentProvider.java b/core/java/android/content/IContentProvider.java index 84b0f0e80bab..becba67a0198 100644 --- a/core/java/android/content/IContentProvider.java +++ b/core/java/android/content/IContentProvider.java @@ -152,7 +152,7 @@ public interface IContentProvider extends IInterface { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) static final String descriptor = "android.content.IContentProvider"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final int QUERY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION; static final int GET_TYPE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 1; static final int INSERT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 2; diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl index 03c99e1a2344..2044fc02a7e5 100644 --- a/core/java/android/content/IContentService.aidl +++ b/core/java/android/content/IContentService.aidl @@ -61,7 +61,7 @@ interface IContentService { */ void sync(in SyncRequest request, String callingPackage); void syncAsUser(in SyncRequest request, int userId, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cancelSync(in Account account, String authority, in ComponentName cname); void cancelSyncAsUser(in Account account, String authority, in ComponentName cname, int userId); @@ -159,7 +159,7 @@ interface IContentService { * @param cname component to identify sync service, must be null if account/providerName are * non-null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isSyncActive(in Account account, String authority, in ComponentName cname); /** diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl index 9242d0289cfa..55210d4aa119 100644 --- a/core/java/android/content/ISyncAdapter.aidl +++ b/core/java/android/content/ISyncAdapter.aidl @@ -32,7 +32,7 @@ oneway interface ISyncAdapter { * * @param cb If called back with {@code false} accounts are not synced. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb); /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ef92dd182554..782f0cd04dfc 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2338,7 +2338,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_ALARM_CHANGED = "android.intent.action.ALARM_CHANGED"; /** @@ -3724,7 +3724,7 @@ public class Intent implements Parcelable, Cloneable { * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED"; @@ -7444,7 +7444,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("AndroidFrameworkEfficientCollections") public static Intent parseCommandArgs(ShellCommand cmd, CommandOptionHandler optionHandler) throws URISyntaxException { @@ -7836,7 +7836,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void printIntentArgsHelp(PrintWriter pw, String prefix) { final String[] lines = new String[] { " specifications include these flags and arguments:", @@ -8126,7 +8126,7 @@ public class Intent implements Parcelable, Cloneable { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAllowFds(boolean allowFds) { if (mExtras != null) { mExtras.setAllowFds(allowFds); @@ -10473,7 +10473,7 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String toInsecureString() { StringBuilder b = new StringBuilder(128); @@ -11132,7 +11132,7 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void prepareToLeaveProcess(Context context) { final boolean leavingPackage = (mComponent == null) || !Objects.equals(mComponent.getPackageName(), context.getPackageName()); diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 5240ab4e476f..f0633591f16c 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -570,7 +570,7 @@ public class IntentFilter implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void setAutoVerify(boolean autoVerify) { mVerifyState &= ~STATE_VERIFY_AUTO; if (autoVerify) mVerifyState |= STATE_VERIFY_AUTO; @@ -950,7 +950,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasExactDataType(String type) { return mDataTypes != null && mDataTypes.contains(type); } @@ -1295,7 +1295,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataSchemeSpecificPart(PatternMatcher ssp) { if (mDataSchemeSpecificParts == null) { return false; @@ -1379,7 +1379,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataAuthority(AuthorityEntry auth) { if (mDataAuthorities == null) { return false; @@ -1488,7 +1488,7 @@ public class IntentFilter implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasDataPath(PatternMatcher path) { if (mDataPaths == null) { return false; diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java index ffcdf53ca84d..1c21b2aa73a5 100644 --- a/core/java/android/content/SyncAdapterType.java +++ b/core/java/android/content/SyncAdapterType.java @@ -35,11 +35,11 @@ public class SyncAdapterType implements Parcelable { private final boolean userVisible; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean supportsUploading; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean isAlwaysSyncable; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean allowParallelSyncs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final String settingsActivity; private final String packageName; diff --git a/core/java/android/content/UndoManager.java b/core/java/android/content/UndoManager.java index ed9cd86927ae..87afbf874b37 100644 --- a/core/java/android/content/UndoManager.java +++ b/core/java/android/content/UndoManager.java @@ -17,6 +17,7 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.text.TextUtils; import android.util.ArrayMap; @@ -85,11 +86,11 @@ public class UndoManager { */ public static final int MERGE_MODE_ANY = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoManager() { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoOwner getOwner(String tag, Object data) { if (tag == null) { throw new NullPointerException("tag can't be null"); @@ -126,7 +127,7 @@ public class UndoManager { * Flatten the current undo state into a Parcel object, which can later be restored * with {@link #restoreInstanceState(android.os.Parcel, java.lang.ClassLoader)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void saveInstanceState(Parcel p) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -175,7 +176,7 @@ public class UndoManager { * associated with each {@link UndoOwner}, which requires separate calls to * {@link #getOwner(String, Object)} to re-associate the owner with its data. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void restoreInstanceState(Parcel p, ClassLoader loader) { if (mUpdateCount > 0) { throw new IllegalStateException("Can't save state while updating"); @@ -236,7 +237,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually popped. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int undo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -274,7 +275,7 @@ public class UndoManager { * @param count Number of undo states to pop. * @return Returns the number of undo states that were actually redone. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int redo(UndoOwner[] owners, int count) { if (mWorking != null) { throw new IllegalStateException("Can't be called during an update"); @@ -303,12 +304,12 @@ public class UndoManager { * useful for editors to know whether they should be generating new undo state * when they see edit operations happening. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isInUndo() { return mInUndo; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int forgetUndos(UndoOwner[] owners, int count) { if (count < 0) { count = mUndos.size(); @@ -330,7 +331,7 @@ public class UndoManager { return removed; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int forgetRedos(UndoOwner[] owners, int count) { if (count < 0) { count = mRedos.size(); @@ -357,7 +358,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int countUndos(UndoOwner[] owners) { if (owners == null) { return mUndos.size(); @@ -377,7 +378,7 @@ public class UndoManager { * @param owners If non-null, only those states containing an operation with one of * the owners supplied here will be counted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int countRedos(UndoOwner[] owners) { if (owners == null) { return mRedos.size(); @@ -417,7 +418,7 @@ public class UndoManager { * they are all matched by a later call to {@link #endUpdate}. * @param label Optional user-visible label for this new undo state. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void beginUpdate(CharSequence label) { if (mInUndo) { throw new IllegalStateException("Can't being update while performing undo/redo"); @@ -450,7 +451,7 @@ public class UndoManager { * Forcibly set a new for the new undo state being built within a {@link #beginUpdate}. * Any existing label will be replaced with this one. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUndoLabel(CharSequence label) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -525,7 +526,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public T getLastOperation(Class clazz, UndoOwner owner, int mergeMode) { if (mWorking == null) { @@ -555,7 +556,7 @@ public class UndoManager { * @param mergeMode May be either {@link #MERGE_MODE_NONE}, {@link #MERGE_MODE_UNIQUE}, * or {@link #MERGE_MODE_ANY}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addOperation(UndoOperation op, int mergeMode) { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -582,7 +583,7 @@ public class UndoManager { * Finish the creation of an undo state, matching a previous call to * {@link #beginUpdate}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void endUpdate() { if (mWorking == null) { throw new IllegalStateException("Must be called during an update"); @@ -631,7 +632,7 @@ public class UndoManager { * @return Returns an integer identifier for the committed undo state, which * can later be used to try to uncommit the state to perform further edits on it. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int commitState(UndoOwner owner) { if (mWorking != null && mWorking.hasData()) { if (owner == null || mWorking.hasOperation(owner)) { diff --git a/core/java/android/content/UndoOperation.java b/core/java/android/content/UndoOperation.java index 235d72123ff6..25aeca3290f3 100644 --- a/core/java/android/content/UndoOperation.java +++ b/core/java/android/content/UndoOperation.java @@ -17,6 +17,7 @@ package android.content; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +36,7 @@ public abstract class UndoOperation implements Parcelable { * @param owner Who owns the data being modified by this undo state; must be * returned by {@link UndoManager#getOwner(String, Object) UndoManager.getOwner}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UndoOperation(UndoOwner owner) { mOwner = owner; } @@ -43,7 +44,7 @@ public abstract class UndoOperation implements Parcelable { /** * Construct from a Parcel. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected UndoOperation(Parcel src, ClassLoader loader) { } diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl index 3d7e3befd9f1..44b5c4482599 100644 --- a/core/java/android/content/om/IOverlayManager.aidl +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -37,7 +37,7 @@ interface IOverlayManager { * mapped to lists of overlays; if no overlays exist for the * requested user, an empty map is returned. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Map getAllOverlays(in int userId); /** @@ -61,7 +61,7 @@ interface IOverlayManager { * @return The OverlayInfo for the overlay package; or null if no such * overlay package exists. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) OverlayInfo getOverlayInfo(in String packageName, in int userId); /** diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index 62815ddcfc19..517e4bda68d7 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -174,7 +175,7 @@ public final class OverlayInfo implements Parcelable { * The state of this OverlayInfo as defined by the STATE_* constants in this class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final @State int state; /** diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index b371141ca9c1..9c4e6aa3e17f 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.res.Configuration; import android.content.res.Configuration.NativeConfig; import android.content.res.TypedArray; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Printer; @@ -373,7 +374,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * {@link android.R.attr#showForAllUsers} attribute. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_SHOW_FOR_ALL_USERS = 0x0400; /** * Bit in {@link #flags} corresponding to an immersive activity @@ -502,7 +503,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * this activity is launched into such a container a SecurityException will be * thrown. Set from the {@link android.R.attr#allowEmbedded} attribute. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FLAG_ALLOW_EMBEDDED = 0x80000000; /** @@ -869,7 +870,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NativeConfig int activityInfoConfigJavaToNative(@Config int input) { int output = 0; for (int i = 0; i < CONFIG_NATIVE_BITS.length; i++) { diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 8f4fc261df37..1cca53f369fa 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -128,7 +128,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int fullBackupContent = 0; /** @@ -2236,7 +2236,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** {@hide} */ public void setGwpAsanMode(@GwpAsanMode int value) { gwpAsanMode = value; } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getCodePath() { return scanSourceDir; } /** {@hide} */ public String getBaseCodePath() { return sourceDir; } /** {@hide} */ public String[] getSplitCodePaths() { return splitSourceDirs; } diff --git a/core/java/android/content/pm/BaseParceledListSlice.java b/core/java/android/content/pm/BaseParceledListSlice.java index bd847bfdb719..5c7a5488076b 100644 --- a/core/java/android/content/pm/BaseParceledListSlice.java +++ b/core/java/android/content/pm/BaseParceledListSlice.java @@ -18,6 +18,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -133,7 +134,7 @@ abstract class BaseParceledListSlice implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List getList() { return mList; } @@ -207,7 +208,7 @@ abstract class BaseParceledListSlice implements Parcelable { protected abstract void writeElement(T parcelable, Parcel reply, int callFlags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void writeParcelableCreator(T parcelable, Parcel dest); protected abstract Parcelable.Creator readParcelableCreator(Parcel from, ClassLoader loader); diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java index 628bcd70cdf6..c67d00e88707 100644 --- a/core/java/android/content/pm/ComponentInfo.java +++ b/core/java/android/content/pm/ComponentInfo.java @@ -19,6 +19,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.util.Printer; @@ -158,7 +159,7 @@ public class ComponentInfo extends PackageItemInfo { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentName getComponentName() { return new ComponentName(packageName, name); } diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl index 2147c397725b..d7c257affd43 100644 --- a/core/java/android/content/pm/IPackageInstaller.aidl +++ b/core/java/android/content/pm/IPackageInstaller.aidl @@ -48,7 +48,7 @@ interface IPackageInstaller { void registerCallback(IPackageInstallerCallback callback, int userId); void unregisterCallback(IPackageInstallerCallback callback); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void uninstall(in VersionedPackage versionedPackage, String callerPackageName, int flags, in IntentSender statusReceiver, int userId); diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 106021e81ddc..d66a42a6232a 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -64,7 +64,7 @@ import android.content.IntentSender; */ interface IPackageManager { void checkPackageStartable(String packageName, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isPackageAvailable(String packageName, int userId); @UnsupportedAppUsage PackageInfo getPackageInfo(String packageName, int flags, int userId); @@ -137,7 +137,7 @@ interface IPackageManager { boolean canForwardTo(in Intent intent, String resolvedType, int sourceUserId, int targetUserId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryIntentActivities(in Intent intent, String resolvedType, int flags, int userId); @@ -182,7 +182,7 @@ interface IPackageManager { * limit that kicks in when flags are included that bloat up the data * returned. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice getInstalledApplications(int flags, int userId); /** @@ -203,7 +203,7 @@ interface IPackageManager { * @param outInfo Filled in with a list of the ProviderInfo for each * name in 'outNames'. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void querySyncProviders(inout List outNames, inout List outInfo); @@ -214,7 +214,7 @@ interface IPackageManager { InstrumentationInfo getInstrumentationInfo( in ComponentName className, int flags); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ParceledListSlice queryInstrumentation( String targetPackage, int flags); @@ -649,7 +649,7 @@ interface IPackageManager { void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden); boolean setSystemAppInstallState(String packageName, boolean installed, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IPackageInstaller getPackageInstaller(); boolean setBlockUninstallForUser(String packageName, boolean blockUninstall, int userId); @@ -661,7 +661,7 @@ interface IPackageManager { boolean isPackageSignedByKeySet(String packageName, in KeySet ks); boolean isPackageSignedByKeySetExactly(String packageName, in KeySet ks); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getPermissionControllerPackageName(); ParceledListSlice getInstantApps(int userId); @@ -678,9 +678,9 @@ interface IPackageManager { */ void setUpdateAvailable(String packageName, boolean updateAvaialble); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getServicesSystemSharedLibraryPackageName(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getSharedSystemSharedLibraryPackageName(); ChangedPackages getChangedPackages(int sequenceNumber, int userId); @@ -758,7 +758,7 @@ interface IPackageManager { //------------------------------------------------------------------------ // We need to keep these in IPackageManager for app compatibility //------------------------------------------------------------------------ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String[] getAppOpPermissionPackages(String permissionName); @UnsupportedAppUsage @@ -773,10 +773,10 @@ interface IPackageManager { @UnsupportedAppUsage void removePermission(String name); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int checkPermission(String permName, String pkgName, int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void grantRuntimePermission(String packageName, String permissionName, int userId); //------------------------------------------------------------------------ diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index e2f85282948a..596d39b50848 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1497,13 +1497,13 @@ public class PackageInstaller { /** {@hide} */ public @InstallReason int installReason = PackageManager.INSTALL_REASON_UNKNOWN; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long sizeBytes = -1; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String appPackageName; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bitmap appIcon; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -1513,7 +1513,7 @@ public class PackageInstaller { /** {@hide} */ public Uri originatingUri; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int originatingUid = UID_UNKNOWN; /** {@hide} */ public Uri referrerUri; @@ -2148,13 +2148,13 @@ public class PackageInstaller { /** {@hide} */ public String installerAttributionTag; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String resolvedBaseCodePath; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public float progress; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean sealed; /** {@hide} */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -2227,7 +2227,7 @@ public class PackageInstaller { public int rollbackDataPolicy; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SessionInfo() { } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a1ac87c78aa2..c0f581717641 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1794,7 +1794,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MOVE_INTERNAL = 0x00000001; /** @@ -1803,7 +1803,7 @@ public abstract class PackageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MOVE_EXTERNAL_MEDIA = 0x00000002; /** {@hide} */ @@ -3663,7 +3663,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services"; @@ -3676,7 +3676,7 @@ public abstract class PackageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared"; @@ -7500,14 +7500,14 @@ public abstract class PackageManager { public abstract void unregisterMoveCallback(@NonNull MoveCallback callback); /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract int movePackage(@NonNull String packageName, @NonNull VolumeInfo vol); /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract @Nullable VolumeInfo getPackageCurrentVolume(@NonNull ApplicationInfo app); /** {@hide} */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract List getPackageCandidateVolumes( @NonNull ApplicationInfo app); @@ -7598,7 +7598,7 @@ public abstract class PackageManager { /** {@hide} */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String installStatusToString(int status, @Nullable String msg) { final String str = installStatusToString(status); if (msg != null) { diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 177f691a97c1..118524d494de 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -288,7 +288,7 @@ public class PackageParser { public String[] mSeparateProcesses; private boolean mOnlyCoreApps; private DisplayMetrics mMetrics; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Callback mCallback; private File mCacheDir; @@ -1364,7 +1364,7 @@ public class PackageParser { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void collectCertificates(Package pkg, File apkFile, boolean skipVerify) throws PackageParserException { final String apkPath = apkFile.getAbsolutePath(); @@ -6539,7 +6539,7 @@ public class PackageParser { } /** set the signing certificates by which the APK proved it can be authenticated */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Builder setPastSigningCertificates(Signature[] pastSigningCertificates) { mPastSigningCertificates = pastSigningCertificates; return this; @@ -6753,9 +6753,9 @@ public class PackageParser { /** * Data used to feed the KeySetManagerService */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArraySet mUpgradeKeySets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayMap> mKeySetMapping; /** diff --git a/core/java/android/content/pm/ParceledListSlice.java b/core/java/android/content/pm/ParceledListSlice.java index 73119e05095b..b54bc5daf31f 100644 --- a/core/java/android/content/pm/ParceledListSlice.java +++ b/core/java/android/content/pm/ParceledListSlice.java @@ -62,7 +62,7 @@ public class ParceledListSlice extends BaseParceledListSli } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void writeParcelableCreator(T parcelable, Parcel dest) { dest.writeParcelableCreator((Parcelable) parcelable); } diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 0f9e8e59ec94..c6450ffdf91c 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -23,6 +23,7 @@ import android.annotation.StringRes; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -451,7 +452,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NonNull String protectionToString(int level) { final StringBuilder protLevel = new StringBuilder(); switch (level & PROTECTION_MASK_BASE) { diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java index 4f2bf65adfca..fe8e4d7b1bb2 100644 --- a/core/java/android/content/pm/ResolveInfo.java +++ b/core/java/android/content/pm/ResolveInfo.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.IntentFilter; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -183,7 +184,7 @@ public class ResolveInfo implements Parcelable { public boolean handleAllWebDataURI; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentInfo getComponentInfo() { if (activityInfo != null) return activityInfo; if (serviceInfo != null) return serviceInfo; diff --git a/core/java/android/content/pm/VerifierInfo.java b/core/java/android/content/pm/VerifierInfo.java index 5f8855572ef0..3e69ff555946 100644 --- a/core/java/android/content/pm/VerifierInfo.java +++ b/core/java/android/content/pm/VerifierInfo.java @@ -17,6 +17,7 @@ package android.content.pm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +45,7 @@ public class VerifierInfo implements Parcelable { * not be {@code null} or empty. * @throws IllegalArgumentException if either argument is null or empty. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VerifierInfo(String packageName, PublicKey publicKey) { if (packageName == null || packageName.length() == 0) { throw new IllegalArgumentException("packageName must not be null or empty"); diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 69dd25fa41d7..13433dc7979f 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -28,6 +28,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo; import android.content.res.Configuration.NativeConfig; import android.content.res.loader.ResourcesLoader; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.util.ArraySet; import android.util.Log; @@ -955,7 +956,7 @@ public final class AssetManager implements AutoCloseable { * @see #open(String, int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull InputStream openNonAsset(@NonNull String fileName, int accessMode) throws IOException { return openNonAsset(0, fileName, accessMode); @@ -968,7 +969,7 @@ public final class AssetManager implements AutoCloseable { * @param fileName Name of the asset to retrieve. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull InputStream openNonAsset(int cookie, @NonNull String fileName) throws IOException { return openNonAsset(cookie, fileName, ACCESS_STREAMING); @@ -1105,7 +1106,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void applyStyle(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable XmlBlock.Parser parser, @NonNull int[] inAttrs, long outValuesAddress, long outIndicesAddress) { @@ -1128,7 +1129,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean resolveAttrs(long themePtr, @AttrRes int defStyleAttr, @StyleRes int defStyleRes, @Nullable int[] inValues, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { @@ -1144,7 +1145,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean retrieveAttributes(@NonNull XmlBlock.Parser parser, @NonNull int[] inAttrs, @NonNull int[] outValues, @NonNull int[] outIndices) { Objects.requireNonNull(parser, "parser"); @@ -1186,7 +1187,7 @@ public final class AssetManager implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setThemeTo(long dstThemePtr, @NonNull AssetManager srcAssetManager, long srcThemePtr) { synchronized (this) { ensureValidLocked(); diff --git a/core/java/android/content/res/ColorStateList.java b/core/java/android/content/res/ColorStateList.java index f23c802d98e2..921c63025a57 100644 --- a/core/java/android/content/res/ColorStateList.java +++ b/core/java/android/content/res/ColorStateList.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.Resources.Theme; import android.graphics.Color; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -480,7 +481,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { * @hide only for resource preloading */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ColorStateList obtainForTheme(Theme t) { if (t == null || !canApplyTheme()) { return this; @@ -643,7 +644,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { /** * Updates the default color and opacity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void onColorsChanged() { int defaultColor = DEFAULT_COLOR; boolean isOpaque = true; diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index f8ed27a6646b..f6edb2edc5ff 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -514,7 +514,7 @@ public class CompatibilityInfo implements Parcelable { * @param outDm If non-null the width and height will be set to their scaled values. * @return Returns the scaling factor for the window. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static float computeCompatibleScaling(DisplayMetrics dm, DisplayMetrics outDm) { final int width = dm.noncompatWidthPixels; final int height = dm.noncompatHeightPixels; diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 9f3634443d62..ce4ed8edec11 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -839,7 +839,7 @@ public final class Configuration implements Parcelable, Comparable { * @return a new instance of the resource, or {@code null} if not in * the cache */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Drawable getInstance(long key, Resources resources, Resources.Theme theme) { final Drawable.ConstantState entry = get(key, theme); if (entry != null) { diff --git a/core/java/android/content/res/ObbInfo.java b/core/java/android/content/res/ObbInfo.java index c477abcea8ba..6cafb3196735 100644 --- a/core/java/android/content/res/ObbInfo.java +++ b/core/java/android/content/res/ObbInfo.java @@ -17,6 +17,7 @@ package android.content.res; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -54,7 +55,7 @@ public class ObbInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] salt; // Only allow things in this package to instantiate. diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index c1f0a5f778b9..260f03bab7e4 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -317,7 +317,7 @@ public class Resources { * class loader * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Resources(@Nullable ClassLoader classLoader) { mClassLoader = classLoader == null ? ClassLoader.getSystemClassLoader() : classLoader; } @@ -394,7 +394,7 @@ public class Resources { * @return the inflater used to create drawable objects * @hide Pending API finalization. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final DrawableInflater getDrawableInflater() { if (mDrawableInflater == null) { mDrawableInflater = new DrawableInflater(this, mClassLoader); @@ -987,7 +987,7 @@ public class Resources { } @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Drawable loadDrawable(@NonNull TypedValue value, int id, int density, @Nullable Theme theme) throws NotFoundException { return mResourcesImpl.loadDrawable(this, value, id, density, theme); @@ -2057,7 +2057,7 @@ public class Resources { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public DisplayAdjustments getDisplayAdjustments() { final DisplayAdjustments overrideDisplayAdjustments = mOverrideDisplayAdjustments; if (overrideDisplayAdjustments != null) { diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index bbcacefb02c9..78cea15ea33e 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -78,9 +78,9 @@ public class ResourcesImpl { private static final boolean DEBUG_LOAD = false; private static final boolean DEBUG_CONFIG = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean TRACE_FOR_PRELOAD = false; // Do we still need it? - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean TRACE_FOR_MISS_PRELOAD = false; // Do we still need it? private static final int ID_OTHER = 0x01000004; @@ -88,7 +88,7 @@ public class ResourcesImpl { private static final Object sSync = new Object(); private static boolean sPreloaded; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mPreloading; // Information about preloaded resources. Note that they are not @@ -146,7 +146,7 @@ public class ResourcesImpl { private PluralRules mPluralRule; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Configuration mConfiguration = new Configuration(); static { @@ -166,7 +166,7 @@ public class ResourcesImpl { * @param displayAdjustments this resource's Display override and compatibility info. * Must not be null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ResourcesImpl(@NonNull AssetManager assets, @Nullable DisplayMetrics metrics, @Nullable Configuration config, @NonNull DisplayAdjustments displayAdjustments) { mAssets = assets; @@ -185,7 +185,7 @@ public class ResourcesImpl { return mAssets; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) DisplayMetrics getDisplayMetrics() { if (DEBUG_CONFIG) Slog.v(TAG, "Returning DisplayMetrics: " + mMetrics.widthPixels + "x" + mMetrics.heightPixels + " " + mMetrics.density); @@ -213,7 +213,7 @@ public class ResourcesImpl { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void getValue(@AnyRes int id, TypedValue outValue, boolean resolveRefs) throws NotFoundException { boolean found = mAssets.getResourceValue(id, 0, outValue, resolveRefs); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 29c5c935c1bf..5eaa7662b250 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -25,6 +25,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo.Config; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.StrictMode; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -75,17 +76,17 @@ public class TypedArray { @UnsupportedAppUsage private final Resources mResources; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DisplayMetrics mMetrics; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AssetManager mAssets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mRecycled; @UnsupportedAppUsage /*package*/ XmlBlock.Parser mXml; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ Resources.Theme mTheme; /** * mData is used to hold the value/id and other metadata about each attribute. diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java index fcbe36246273..b0291ce6d842 100644 --- a/core/java/android/content/res/XmlBlock.java +++ b/core/java/android/content/res/XmlBlock.java @@ -21,6 +21,7 @@ import static android.content.res.Resources.ID_NULL; import android.annotation.AnyRes; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.TypedValue; import com.android.internal.annotations.VisibleForTesting; @@ -480,7 +481,7 @@ public final class XmlBlock implements AutoCloseable { return mStrings.get(id); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ long mParseState; @UnsupportedAppUsage private final XmlBlock mBlock; diff --git a/core/java/android/database/AbstractWindowedCursor.java b/core/java/android/database/AbstractWindowedCursor.java index daf7d2b1e908..18562034e38c 100644 --- a/core/java/android/database/AbstractWindowedCursor.java +++ b/core/java/android/database/AbstractWindowedCursor.java @@ -17,6 +17,7 @@ package android.database; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A base class for Cursors that store their data in {@link CursorWindow}s. @@ -181,7 +182,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor { * Closes the cursor window and sets {@link #mWindow} to null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void closeWindow() { if (mWindow != null) { mWindow.close(); diff --git a/core/java/android/database/CursorWindow.java b/core/java/android/database/CursorWindow.java index edb7b715e944..1db948aba7c6 100644 --- a/core/java/android/database/CursorWindow.java +++ b/core/java/android/database/CursorWindow.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.database.sqlite.SQLiteClosable; import android.database.sqlite.SQLiteException; import android.os.Binder; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Process; @@ -767,7 +768,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String printStats() { StringBuilder buff = new StringBuilder(); int myPid = Process.myPid(); diff --git a/core/java/android/database/sqlite/SQLiteCustomFunction.java b/core/java/android/database/sqlite/SQLiteCustomFunction.java index 1ace40d7e913..4a15f7010d54 100644 --- a/core/java/android/database/sqlite/SQLiteCustomFunction.java +++ b/core/java/android/database/sqlite/SQLiteCustomFunction.java @@ -27,7 +27,7 @@ import android.os.Build; public final class SQLiteCustomFunction { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final String name; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int numArgs; public final SQLiteDatabase.CustomFunction callback; @@ -52,7 +52,7 @@ public final class SQLiteCustomFunction { // Called from native. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchCallback(String[] args) { callback.callback(args); } diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index a2cbdd3829ff..9684ece5d9c1 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -31,6 +31,7 @@ import android.database.DatabaseUtils; import android.database.DefaultDatabaseErrorHandler; import android.database.SQLException; import android.database.sqlite.SQLiteDebug.DbStats; +import android.os.Build; import android.os.CancellationSignal; import android.os.Looper; import android.os.OperationCanceledException; @@ -103,7 +104,7 @@ public final class SQLiteDatabase extends SQLiteClosable { // Thread-local for database sessions that belong to this database. // Each thread has its own database session. // INVARIANT: Immutable. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ThreadLocal mThreadSession = ThreadLocal .withInitial(this::createSession); diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 165f863ccde7..1afa0f8d7090 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -135,7 +135,7 @@ public final class SQLiteDebug { * that overflowed because no space was left in the page cache. * documented at http://www.sqlite.org/c3ref/c_status_malloc_size.html */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int pageCacheOverflow; /** records the largest memory allocation request handed to sqlite3. diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java index de1c54321985..cd4131ce2abb 100644 --- a/core/java/android/database/sqlite/SQLiteProgram.java +++ b/core/java/android/database/sqlite/SQLiteProgram.java @@ -18,6 +18,7 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; import android.database.DatabaseUtils; +import android.os.Build; import android.os.CancellationSignal; import java.util.Arrays; @@ -37,7 +38,7 @@ public abstract class SQLiteProgram extends SQLiteClosable { private final boolean mReadOnly; private final String[] mColumnNames; private final int mNumParameters; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Object[] mBindArgs; SQLiteProgram(SQLiteDatabase db, String sql, Object[] bindArgs, diff --git a/core/java/android/database/sqlite/SQLiteStatement.java b/core/java/android/database/sqlite/SQLiteStatement.java index 9fda8b011e52..d33eadcfd11b 100644 --- a/core/java/android/database/sqlite/SQLiteStatement.java +++ b/core/java/android/database/sqlite/SQLiteStatement.java @@ -17,6 +17,7 @@ package android.database.sqlite; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; /** @@ -28,7 +29,7 @@ import android.os.ParcelFileDescriptor; *

*/ public final class SQLiteStatement extends SQLiteProgram { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SQLiteStatement(SQLiteDatabase db, String sql, Object[] bindArgs) { super(db, sql, bindArgs, null); } diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java index 4f55921b0488..35da062329b3 100644 --- a/core/java/android/ddm/DdmHandleAppName.java +++ b/core/java/android/ddm/DdmHandleAppName.java @@ -17,6 +17,7 @@ package android.ddm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import org.apache.harmony.dalvik.ddmc.Chunk; @@ -80,7 +81,7 @@ public class DdmHandleAppName extends ChunkHandler { * before or after DDMS connects. For the latter we need to send up * an APNM message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setAppName(String appName, String pkgName, int userId) { if (appName == null || appName.isEmpty() || pkgName == null || pkgName.isEmpty()) return; @@ -90,7 +91,7 @@ public class DdmHandleAppName extends ChunkHandler { sendAPNM(appName, pkgName, userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Names getNames() { return sNames; } diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 86031dd918f5..3bdd39f5d7d7 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -245,7 +245,7 @@ public class Camera { * Camera HAL device API version 1.0 * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CAMERA_HAL_API_VERSION_1_0 = 0x100; /** @@ -1221,7 +1221,7 @@ public class Camera { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object camera_ref, int what, int arg1, int arg2, Object obj) { @@ -4415,7 +4415,7 @@ public class Camera { // Splits a comma delimited string to an ArrayList of Area objects. // Example string: "(-10,-10,0,0,300),(0,0,10,10,700)". Return null if // the passing string is null or the size is 0 or (0,0,0,0,0). - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ArrayList splitArea(String str) { if (str == null || str.charAt(0) != '(' || str.charAt(str.length() - 1) != ')') { diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index a9b613228070..cad30dda9034 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -97,7 +97,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { public static final int S_UI8 = 0x35; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeObject; // Invoked on destruction diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 0f3cdfca70f5..e913986ae792 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -509,7 +509,7 @@ public final class Sensor { * * @hide Expected to be used internally for always on display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_PICK_UP_GESTURE = 25; /** @@ -549,7 +549,7 @@ public final class Sensor { * @hide Expected to be used internally for auto-rotate and speaker rotation. * */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_DEVICE_ORIENTATION = 27; /** diff --git a/core/java/android/hardware/SerialManager.java b/core/java/android/hardware/SerialManager.java index b51382e01ccd..26e5129b1fb3 100644 --- a/core/java/android/hardware/SerialManager.java +++ b/core/java/android/hardware/SerialManager.java @@ -19,6 +19,7 @@ package android.hardware; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -47,7 +48,7 @@ public class SerialManager { * * @return names of available serial ports */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String[] getSerialPorts() { try { return mService.getSerialPorts(); @@ -67,7 +68,7 @@ public class SerialManager { * @param speed at which to open the serial port * @return the serial port */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SerialPort openSerialPort(String name, int speed) throws IOException { try { ParcelFileDescriptor pfd = mService.openSerialPort(name); diff --git a/core/java/android/hardware/SerialPort.java b/core/java/android/hardware/SerialPort.java index 0fcaa4989210..2578dd67746e 100644 --- a/core/java/android/hardware/SerialPort.java +++ b/core/java/android/hardware/SerialPort.java @@ -17,6 +17,7 @@ package android.hardware; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -31,7 +32,7 @@ public class SerialPort { private static final String TAG = "SerialPort"; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mNativeContext; private final String mName; private ParcelFileDescriptor mFileDescriptor; @@ -60,7 +61,7 @@ public class SerialPort { /** * Closes the serial port */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void close() throws IOException { if (mFileDescriptor != null) { mFileDescriptor.close(); @@ -104,7 +105,7 @@ public class SerialPort { * @param buffer to write * @param length number of bytes to write */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void write(ByteBuffer buffer, int length) throws IOException { if (buffer.isDirect()) { native_write_direct(buffer, length); diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 974913b290b1..376503e79cfc 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -21,6 +21,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.MemoryFile; @@ -759,13 +760,13 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) throw new NullPointerException(); return nativeDisableSensor(mNativeSensorEventQueue, sensor.getHandle()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void dispatchSensorEvent(int handle, float[] values, int accuracy, long timestamp); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected abstract void dispatchFlushCompleteEvent(int handle); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void dispatchAdditionalInfoEvent( int handle, int type, int serial, float[] floatValues, int[] intValues) { // default implementation is do nothing diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java index bed9a0640693..76d50bdf414c 100644 --- a/core/java/android/hardware/biometrics/BiometricConstants.java +++ b/core/java/android/hardware/biometrics/BiometricConstants.java @@ -20,6 +20,7 @@ import static android.hardware.biometrics.BiometricManager.Authenticators; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -153,7 +154,7 @@ public interface BiometricConstants { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int BIOMETRIC_ERROR_VENDOR_BASE = 1000; @IntDef({BIOMETRIC_SUCCESS, diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index c7b554b3aafc..01f0e71a7c33 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -21,6 +21,7 @@ import android.app.KeyguardManager; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.biometrics.BiometricManager.Authenticators; import android.hardware.fingerprint.FingerprintManager; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -167,7 +168,7 @@ public interface BiometricFingerprintConstants { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int FINGERPRINT_ERROR_VENDOR_BASE = 1000; // diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 62df92e656d6..232056cb13d4 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -26,6 +26,7 @@ import android.hardware.camera2.params.RecommendedStreamConfigurationMap; import android.hardware.camera2.params.SessionConfiguration; import android.hardware.camera2.utils.ArrayUtils; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.util.Rational; import java.util.ArrayList; @@ -79,7 +80,7 @@ public final class CameraCharacteristics extends CameraMetadata type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -193,7 +194,7 @@ public final class CameraCharacteristics extends CameraMetadata> mKeys; private List> mKeysNeedingPermission; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 47dafa0c61a8..d931789a7005 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -26,6 +26,7 @@ import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.utils.HashCodeHelpers; import android.hardware.camera2.utils.SurfaceUtils; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.ArraySet; @@ -108,7 +109,7 @@ public final class CaptureRequest extends CameraMetadata> * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } @@ -229,7 +230,7 @@ public final class CaptureRequest extends CameraMetadata> private static final ArraySet mEmptySurfaceSet = new ArraySet(); private String mLogicalCameraId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CameraMetadataNative mLogicalCameraSettings; private final HashMap mPhysicalCameraSettings = new HashMap(); diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 228617c74388..cd69788f1924 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -24,6 +24,7 @@ import android.hardware.camera2.impl.CaptureResultExtras; import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.SyntheticKey; import android.hardware.camera2.utils.TypeReference; +import android.os.Build; import android.util.Log; import android.util.Rational; @@ -79,7 +80,7 @@ public class CaptureResult extends CameraMetadata> { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Key(String name, Class type, long vendorId) { mKey = new CameraMetadataNative.Key(name, type, vendorId); } diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 9d4ab0b08e92..19f4cd6e991a 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -64,6 +64,7 @@ import android.hardware.camera2.params.TonemapCurve; import android.hardware.camera2.utils.TypeReference; import android.location.Location; import android.location.LocationManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.ServiceSpecificException; @@ -261,7 +262,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean hasTag() { return mHasTag; } @@ -271,7 +272,7 @@ public class CameraMetadataNative implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void cacheTag(int tag) { mHasTag = true; mTag = tag; @@ -1709,7 +1710,7 @@ public class CameraMetadataNative implements Parcelable { mDisplaySize = displaySize; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mMetadataPtr; // native std::shared_ptr* @FastNative @@ -1734,7 +1735,7 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native long nativeGetBufferSize(long ptr); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native byte[] nativeReadValues(int tag, long ptr); @FastNative @@ -1743,11 +1744,11 @@ public class CameraMetadataNative implements Parcelable { @FastNative private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName) throws IllegalArgumentException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @FastNative private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag) throws IllegalArgumentException; diff --git a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java index 16f3f2ab2023..064d4b31363b 100644 --- a/core/java/android/hardware/camera2/utils/HashCodeHelpers.java +++ b/core/java/android/hardware/camera2/utils/HashCodeHelpers.java @@ -17,6 +17,7 @@ package android.hardware.camera2.utils; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Provide hashing functions using the Modified Bernstein hash @@ -32,7 +33,7 @@ public final class HashCodeHelpers { * * @return the numeric hash code */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int hashCode(int... array) { if (array == null) { return 0; diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index d6cd3feafca7..32900225d887 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.media.projection.MediaProjection; +import android.os.Build; import android.os.Handler; import android.util.Pair; import android.util.SparseArray; @@ -66,7 +67,7 @@ public final class DisplayManager { *

* @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_WIFI_DISPLAY_STATUS_CHANGED = "android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED"; @@ -74,7 +75,7 @@ public final class DisplayManager { * Contains a {@link WifiDisplayStatus} object. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_WIFI_DISPLAY_STATUS = "android.hardware.display.extra.WIFI_DISPLAY_STATUS"; diff --git a/core/java/android/hardware/display/WifiDisplayStatus.java b/core/java/android/hardware/display/WifiDisplayStatus.java index e2a825fd990a..0004b39e54e8 100644 --- a/core/java/android/hardware/display/WifiDisplayStatus.java +++ b/core/java/android/hardware/display/WifiDisplayStatus.java @@ -17,6 +17,7 @@ package android.hardware.display; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,9 +36,9 @@ public final class WifiDisplayStatus implements Parcelable { private final int mFeatureState; private final int mScanState; private final int mActiveDisplayState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WifiDisplay mActiveDisplay; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WifiDisplay[] mDisplays; /** Session info needed for Miracast Certification */ @@ -50,23 +51,23 @@ public final class WifiDisplayStatus implements Parcelable { /** Feature state: Wifi display is turned off in settings. */ public static final int FEATURE_STATE_OFF = 2; /** Feature state: Wifi display is turned on in settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FEATURE_STATE_ON = 3; /** Scan state: Not currently scanning. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int SCAN_STATE_NOT_SCANNING = 0; /** Scan state: Currently scanning. */ public static final int SCAN_STATE_SCANNING = 1; /** Display state: Not connected. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_NOT_CONNECTED = 0; /** Display state: Connecting to active display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_CONNECTING = 1; /** Display state: Connected to active display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DISPLAY_STATE_CONNECTED = 2; public static final @android.annotation.NonNull Creator CREATOR = new Creator() { diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 2aefb1da4783..63397c05edc2 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -41,6 +41,7 @@ import android.hardware.biometrics.BiometricTestSession; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.biometrics.SensorProperties; import android.os.Binder; +import android.os.Build; import android.os.CancellationSignal; import android.os.CancellationSignal.OnCancelListener; import android.os.Handler; @@ -761,7 +762,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * @hide */ @RequiresPermission(USE_FINGERPRINT) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List getEnrolledFingerprints(int userId) { if (mService != null) try { return mService.getEnrolledFingerprints(userId, mContext.getOpPackageName()); diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java index a1866af43706..313d8efc19be 100644 --- a/core/java/android/hardware/location/GeofenceHardware.java +++ b/core/java/android/hardware/location/GeofenceHardware.java @@ -169,7 +169,7 @@ public final class GeofenceHardware { GeofenceHardwareMonitorCallbackWrapper>(); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public GeofenceHardware(IGeofenceHardware service) { mService = service; } diff --git a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl index 2dfaf601c6f5..b32b7e555622 100644 --- a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl +++ b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl @@ -32,6 +32,6 @@ oneway interface IActivityRecognitionHardwareClient { * @param isSupported whether the platform has hardware support for the feature * @param instance the available instance to provide access to the feature */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAvailabilityChanged(in boolean isSupported, in IActivityRecognitionHardware instance); } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index e58403fe387d..11f3e4582ac2 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -45,6 +45,7 @@ import android.media.soundtrigger_middleware.ISoundTriggerMiddlewareService; import android.media.soundtrigger_middleware.SoundTriggerModuleDescriptor; import android.media.soundtrigger_middleware.Status; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -1174,7 +1175,7 @@ public class SoundTrigger { /** @hide */ @TestApi - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data) { @@ -1380,7 +1381,7 @@ public class SoundTrigger { public static class RecognitionConfig implements Parcelable { /** True if the DSP should capture the trigger sound and make it available for further * capture. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean captureRequested; /** * True if the service should restart listening after the DSP triggers. @@ -1389,12 +1390,12 @@ public class SoundTrigger { public final boolean allowMultipleTriggers; /** List of all keyphrases in the sound model for which recognition should be performed with * options for each keyphrase. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final KeyphraseRecognitionExtra keyphrases[]; /** Opaque data for use by system applications who know about voice engine internals, * typically during enrollment. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final byte[] data; @@ -1560,7 +1561,7 @@ public class SoundTrigger { public final int id; /** Recognition modes matched for this event */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int recognitionModes; /** Confidence level for mode RECOGNITION_MODE_VOICE_TRIGGER when user identification @@ -1667,7 +1668,7 @@ public class SoundTrigger { @NonNull public final KeyphraseRecognitionExtra[] keyphraseExtras; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeyphraseRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data, @@ -1789,7 +1790,7 @@ public class SoundTrigger { * @hide */ public static class GenericRecognitionEvent extends RecognitionEvent implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public GenericRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, @NonNull AudioFormat captureFormat, @@ -1860,7 +1861,7 @@ public class SoundTrigger { @NonNull public final byte[] data; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SoundModelEvent(int status, int soundModelHandle, @Nullable byte[] data) { this.status = status; this.soundModelHandle = soundModelHandle; diff --git a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java index 05823bf14b63..431c99dbdc1f 100644 --- a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java +++ b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java @@ -29,6 +29,7 @@ import android.media.soundtrigger_middleware.PhraseRecognitionEvent; import android.media.soundtrigger_middleware.PhraseSoundModel; import android.media.soundtrigger_middleware.RecognitionEvent; import android.media.soundtrigger_middleware.SoundModel; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -48,7 +49,7 @@ public class SoundTriggerModule { private static final int EVENT_RECOGNITION = 1; private static final int EVENT_SERVICE_DIED = 2; private static final int EVENT_SERVICE_STATE_CHANGE = 3; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mId; private EventHandlerDelegate mEventHandlerDelegate; private ISoundTriggerModule mService; diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 53a5785f7c76..21634cc544e7 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -47,7 +47,7 @@ public class UsbDeviceConnection { private Context mContext; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; private final CloseGuard mCloseGuard = CloseGuard.get(); diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index ef305e2c1867..62a5782cb55d 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -209,7 +209,7 @@ public class UsbManager { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String USB_DATA_UNLOCKED = "unlocked"; /** @@ -771,7 +771,7 @@ public class UsbManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFunctionEnabled(String function) { try { return mService.isFunctionEnabled(function); diff --git a/core/java/android/hardware/usb/UsbRequest.java b/core/java/android/hardware/usb/UsbRequest.java index 473df712e3f9..d1c6465d62c8 100644 --- a/core/java/android/hardware/usb/UsbRequest.java +++ b/core/java/android/hardware/usb/UsbRequest.java @@ -49,7 +49,7 @@ public class UsbRequest { static final int MAX_USBFS_BUFFER_SIZE = 16384; // used by the JNI code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; private UsbEndpoint mEndpoint; diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 78cc71a782a5..070bec11b93a 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1139,7 +1139,7 @@ public class InputMethodService extends AbstractInputMethodService { mService.getContentResolver().unregisterContentObserver(this); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean shouldShowImeWithHardKeyboard() { // Lazily initialize as needed. if (mShowImeWithHardKeyboard == ShowImeWithHardKeyboardType.UNKNOWN) { @@ -1179,7 +1179,7 @@ public class InputMethodService extends AbstractInputMethodService { return "SettingsObserver{mShowImeWithHardKeyboard=" + mShowImeWithHardKeyboard + "}"; } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private SettingsObserver mSettingsObserver; /** diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1012f47f8c0a..224113fc29cb 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -354,7 +354,7 @@ public class ConnectivityManager { * @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_TETHER_STATE_CHANGED = TetheringManager.ACTION_TETHER_STATE_CHANGED; @@ -363,7 +363,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces configured for * tethering and currently available for tethering. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_AVAILABLE_TETHER = TetheringManager.EXTRA_AVAILABLE_TETHER; /** @@ -378,7 +378,7 @@ public class ConnectivityManager { * gives a String[] listing all the interfaces currently tethered * (ie, has DHCPv4 support and packets potentially forwarded/NATed) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_ACTIVE_TETHER = TetheringManager.EXTRA_ACTIVE_TETHER; /** @@ -387,7 +387,7 @@ public class ConnectivityManager { * failed. Use {@link #getLastTetherError} to find the error code * for any interfaces listed here. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_ERRORED_TETHER = TetheringManager.EXTRA_ERRORED_TETHER; /** @@ -850,7 +850,7 @@ public class ConnectivityManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getNetworkTypeName(int type) { switch (type) { case TYPE_NONE: @@ -1173,7 +1173,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.NETWORK_STACK) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkInfo getActiveNetworkInfoForUid(int uid) { return getActiveNetworkInfoForUid(uid, false); } @@ -1520,7 +1520,7 @@ public class ConnectivityManager { return 1; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { if (networkType == TYPE_MOBILE) { switch (feature) { @@ -1606,7 +1606,7 @@ public class ConnectivityManager { }; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashMap sLegacyRequests = new HashMap<>(); @@ -1635,7 +1635,7 @@ public class ConnectivityManager { Log.d(TAG, "expireRequest with " + ourSeqNum + ", " + sequenceNum); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NetworkRequest requestNetworkForFeatureLocked(NetworkCapabilities netCap) { int delay = -1; int type = legacyTypeForNetworkCapabilities(netCap); @@ -1665,7 +1665,7 @@ public class ConnectivityManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean removeRequestForFeature(NetworkCapabilities netCap) { final LegacyRequest l; synchronized (sLegacyRequests) { @@ -1732,17 +1732,17 @@ public class ConnectivityManager { /** @hide */ public static class PacketKeepaliveCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PacketKeepaliveCallback() { } /** The requested keepalive was successfully started. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onStarted() {} /** The keepalive was successfully stopped. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onStopped() {} /** An error occurred. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onError(int error) {} } @@ -1806,7 +1806,7 @@ public class ConnectivityManager { private volatile Integer mSlot; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void stop() { try { mExecutor.execute(() -> { @@ -1875,7 +1875,7 @@ public class ConnectivityManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PacketKeepalive startNattKeepalive( Network network, int intervalSeconds, PacketKeepaliveCallback callback, InetAddress srcAddr, int srcPort, InetAddress dstAddr) { @@ -2110,7 +2110,7 @@ public class ConnectivityManager { /** {@hide} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkQuotaInfo getActiveNetworkQuotaInfo() { try { return mService.getActiveNetworkQuotaInfo(); @@ -2408,7 +2408,7 @@ public class ConnectivityManager { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public int tether(String iface) { return mTetheringManager.tether(iface); @@ -2849,7 +2849,7 @@ public class ConnectivityManager { * {@hide} */ @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public int getLastTetherError(String iface) { int error = mTetheringManager.getLastTetherError(iface); @@ -4659,7 +4659,7 @@ public class ConnectivityManager { * @deprecated This is strictly for legacy usage to support {@link #startUsingNetworkFeature}. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean setProcessDefaultNetworkForHostResolution(Network network) { return NetworkUtils.bindProcessToNetworkForHostResolution( (network == null) ? NETID_UNSET : network.getNetIdForResolv()); diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java index 6819c349d20a..82ba156b08d0 100644 --- a/core/java/android/net/DhcpResults.java +++ b/core/java/android/net/DhcpResults.java @@ -18,6 +18,7 @@ package android.net; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -40,30 +41,30 @@ import java.util.Objects; public final class DhcpResults implements Parcelable { private static final String TAG = "DhcpResults"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LinkAddress ipAddress; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InetAddress gateway; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ArrayList dnsServers = new ArrayList<>(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String domains; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Inet4Address serverAddress; /** Vendor specific information (from RFC 2132). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String vendorInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int leaseDuration; /** Link MTU option. 0 means unset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mtu; public String serverHostName; diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index 5860e20ad3b4..84a8e1c3dcc1 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -23,6 +23,7 @@ import android.annotation.SystemService; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.RemoteException; @@ -76,7 +77,7 @@ public class EthernetManager { * @param isAvailable {@code true} if Ethernet port exists. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void onAvailabilityChanged(String iface, boolean isAvailable); } @@ -97,7 +98,7 @@ public class EthernetManager { * @return the Ethernet Configuration, contained in {@link IpConfiguration}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IpConfiguration getConfiguration(String iface) { try { return mService.getConfiguration(iface); @@ -110,7 +111,7 @@ public class EthernetManager { * Set Ethernet configuration. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setConfiguration(String iface, IpConfiguration config) { try { mService.setConfiguration(iface, config); @@ -123,7 +124,7 @@ public class EthernetManager { * Indicates whether the system currently has one or more Ethernet interfaces. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAvailable() { return getAvailableInterfaces().length > 0; } @@ -134,7 +135,7 @@ public class EthernetManager { * @param iface Ethernet interface name * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAvailable(String iface) { try { return mService.isAvailable(iface); @@ -149,7 +150,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); @@ -168,7 +169,7 @@ public class EthernetManager { * Returns an array of available Ethernet interface names. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String[] getAvailableInterfaces() { try { return mService.getAvailableInterfaces(); @@ -183,7 +184,7 @@ public class EthernetManager { * @throws IllegalArgumentException If the listener is null. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeListener(Listener listener) { if (listener == null) { throw new IllegalArgumentException("listener must not be null"); diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 059ec28298f9..41732008b4ee 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -73,7 +73,7 @@ interface IConnectivityManager NetworkCapabilities getNetworkCapabilities(in Network network, String callingPackageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) NetworkState[] getAllNetworkState(); NetworkQuotaInfo getActiveNetworkQuotaInfo(); @@ -134,7 +134,7 @@ interface IConnectivityManager VpnConfig getVpnConfig(int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void startLegacyVpn(in VpnProfile profile); LegacyVpnInfo getLegacyVpnInfo(int userId); diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl index 72a6b397a30c..e486052e0e53 100644 --- a/core/java/android/net/INetworkPolicyManager.aidl +++ b/core/java/android/net/INetworkPolicyManager.aidl @@ -67,7 +67,7 @@ interface INetworkPolicyManager { void setDeviceIdleMode(boolean enabled); void setWifiMeteredOverride(String networkId, int meteredOverride); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state); SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage); diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl index 5fa515a14343..1a3dc974480c 100644 --- a/core/java/android/net/INetworkStatsService.aidl +++ b/core/java/android/net/INetworkStatsService.aidl @@ -42,7 +42,7 @@ interface INetworkStatsService { * PACKAGE_USAGE_STATS permission is always checked. If PACKAGE_USAGE_STATS is not granted * READ_NETWORK_USAGE_STATS is checked for. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) INetworkStatsSession openSessionForUsageStats(int flags, String callingPackage); /** Return data layer snapshot of UID network usage. */ diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java index fa31b806ba9f..d5f8b2edb6bb 100644 --- a/core/java/android/net/IpConfiguration.java +++ b/core/java/android/net/IpConfiguration.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -98,7 +99,7 @@ public final class IpConfiguration implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IpConfiguration(IpAssignment ipAssignment, ProxySettings proxySettings, StaticIpConfiguration staticIpConfiguration, diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 25a76f43553a..209a3fa839c0 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -111,7 +111,7 @@ public final class LinkProperties implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ProvisioningChange compareProvisioning( LinkProperties before, LinkProperties after) { if (before.isProvisioned() && after.isProvisioned()) { @@ -849,7 +849,7 @@ public final class LinkProperties implements Parcelable { * Returns all the links stacked on top of this link. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull List getStackedLinks() { if (mStackedLinks.isEmpty()) { return Collections.emptyList(); @@ -1448,7 +1448,7 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if both are identical, {@code false} otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIdenticalStackedLinks(@NonNull LinkProperties target) { if (!mStackedLinks.keySet().equals(target.mStackedLinks.keySet())) { return false; diff --git a/core/java/android/net/LinkQualityInfo.java b/core/java/android/net/LinkQualityInfo.java index aa56cff50f63..2bf1fbc848f7 100644 --- a/core/java/android/net/LinkQualityInfo.java +++ b/core/java/android/net/LinkQualityInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -190,7 +191,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPacketCount(long packetCount) { mPacketCount = packetCount; } @@ -206,7 +207,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPacketErrorCount(long packetErrorCount) { mPacketErrorCount = packetErrorCount; } @@ -268,7 +269,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLastDataSampleTime(long lastDataSampleTime) { mLastDataSampleTime = lastDataSampleTime; } @@ -284,7 +285,7 @@ public class LinkQualityInfo implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataSampleDuration(int dataSampleDuration) { mDataSampleDuration = dataSampleDuration; } diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index e80e3a6f93ec..e01e5aecc7e6 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.system.ErrnoException; import android.system.Int32Ref; import android.system.Os; @@ -51,7 +52,7 @@ class LocalSocketImpl @UnsupportedAppUsage FileDescriptor[] inboundFileDescriptors; /** file descriptor array that should be written during next write */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) FileDescriptor[] outboundFileDescriptors; /** diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 6949bf2a7807..049e9bcc2509 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.util.MacAddressUtils; import android.net.wifi.WifiInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -58,7 +59,7 @@ public final class MacAddress implements Parcelable { *

Not publicly exposed or treated specially since the OUI 00:00:00 is registered. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final MacAddress ALL_ZEROS_ADDRESS = new MacAddress(0); /** @hide */ diff --git a/core/java/android/net/MobileLinkQualityInfo.java b/core/java/android/net/MobileLinkQualityInfo.java index a65de6bb2908..f51c4df2d6b5 100644 --- a/core/java/android/net/MobileLinkQualityInfo.java +++ b/core/java/android/net/MobileLinkQualityInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** @@ -40,7 +41,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { private int mLteRssnr = UNKNOWN_INT; private int mLteCqi = UNKNOWN_INT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MobileLinkQualityInfo() { } @@ -98,7 +99,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { * returns mobile network type as defined by {@link android.telephony.TelephonyManager} * @return network type or {@link android.net.LinkQualityInfo#UNKNOWN_INT} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getMobileNetworkType() { return mMobileNetworkType; } @@ -106,7 +107,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setMobileNetworkType(int mobileNetworkType) { mMobileNetworkType = mobileNetworkType; } @@ -122,7 +123,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRssi(int Rssi) { mRssi = Rssi; } @@ -138,7 +139,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGsmErrorRate(int gsmErrorRate) { mGsmErrorRate = gsmErrorRate; } @@ -154,7 +155,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdmaDbm(int cdmaDbm) { mCdmaDbm = cdmaDbm; } @@ -170,7 +171,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdmaEcio(int cdmaEcio) { mCdmaEcio = cdmaEcio; } @@ -186,7 +187,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoDbm(int evdoDbm) { mEvdoDbm = evdoDbm; } @@ -202,7 +203,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoEcio(int evdoEcio) { mEvdoEcio = evdoEcio; } @@ -218,7 +219,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setEvdoSnr(int evdoSnr) { mEvdoSnr = evdoSnr; } @@ -234,7 +235,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteSignalStrength(int lteSignalStrength) { mLteSignalStrength = lteSignalStrength; } @@ -250,7 +251,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRsrp(int lteRsrp) { mLteRsrp = lteRsrp; } @@ -266,7 +267,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRsrq(int lteRsrq) { mLteRsrq = lteRsrq; } @@ -282,7 +283,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteRssnr(int lteRssnr) { mLteRssnr = lteRssnr; } @@ -298,7 +299,7 @@ public class MobileLinkQualityInfo extends LinkQualityInfo { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setLteCqi(int lteCqi) { mLteCqi = lteCqi; } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 3e4f73555e58..53996a5fc503 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.system.ErrnoException; @@ -110,7 +111,7 @@ public class Network implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Network(int netId) { this(netId, false); } diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 12ddc628f4bd..f806b565b127 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -133,7 +133,7 @@ public final class NetworkCapabilities implements Parcelable { * Represents the network's capabilities. If any are specified they will be satisfied * by any Network that matches all of them. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNetworkCapabilities; /** @@ -1288,7 +1288,7 @@ public final class NetworkCapabilities implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasSignalStrength() { return mSignalStrength > SIGNAL_STRENGTH_UNSPECIFIED; } @@ -1927,7 +1927,7 @@ public final class NetworkCapabilities implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @NonNull String transportNamesOf(@Nullable @Transport int[] types) { StringJoiner joiner = new StringJoiner("|"); if (types != null) { diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index e9e242e2b08a..a643d09eef49 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -253,7 +253,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getUidPolicy(int uid) { try { return mService.getUidPolicy(uid); @@ -339,7 +339,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRestrictBackground(boolean restrictBackground) { try { mService.setRestrictBackground(restrictBackground); @@ -349,7 +349,7 @@ public class NetworkPolicyManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean getRestrictBackground() { try { return mService.getRestrictBackground(); diff --git a/core/java/android/net/NetworkQuotaInfo.java b/core/java/android/net/NetworkQuotaInfo.java index 2e52d9cd19ab..d39bf29a4ef1 100644 --- a/core/java/android/net/NetworkQuotaInfo.java +++ b/core/java/android/net/NetworkQuotaInfo.java @@ -17,6 +17,7 @@ package android.net; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -37,17 +38,17 @@ public class NetworkQuotaInfo implements Parcelable { public NetworkQuotaInfo(Parcel in) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getEstimatedBytes() { return 0; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getSoftLimitBytes() { return NO_LIMIT; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getHardLimitBytes() { return NO_LIMIT; } diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 1d6e50710df1..6209718e8788 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -43,7 +43,7 @@ public class NetworkRequest implements Parcelable { * The {@link NetworkCapabilities} that define this request. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final @NonNull NetworkCapabilities networkCapabilities; /** @@ -52,7 +52,7 @@ public class NetworkRequest implements Parcelable { * the request. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int requestId; /** diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index cbee01024622..d42beae601ed 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -219,11 +220,11 @@ public final class NetworkStats implements Parcelable { * generated. */ private long elapsedRealtime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int size; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int capacity; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String[] iface; @UnsupportedAppUsage private int[] uid; @@ -231,21 +232,21 @@ public final class NetworkStats implements Parcelable { private int[] set; @UnsupportedAppUsage private int[] tag; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] metered; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] roaming; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int[] defaultNetwork; @UnsupportedAppUsage private long[] rxBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] rxPackets; @UnsupportedAppUsage private long[] txBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] txPackets; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long[] operations; /** @@ -258,7 +259,7 @@ public final class NetworkStats implements Parcelable { @SystemApi public static class Entry { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String iface; /** @hide */ @UnsupportedAppUsage @@ -267,7 +268,7 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public int set; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int tag; /** * Note that this is only populated w/ the default value when read from /proc or written @@ -294,20 +295,20 @@ public final class NetworkStats implements Parcelable { @UnsupportedAppUsage public long rxBytes; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rxPackets; /** @hide */ @UnsupportedAppUsage public long txBytes; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long txPackets; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long operations; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Entry() { this(IFACE_ALL, UID_ALL, SET_DEFAULT, TAG_NONE, 0L, 0L, 0L, 0L, 0L); } @@ -454,7 +455,7 @@ public final class NetworkStats implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStats(Parcel parcel) { elapsedRealtime = parcel.readLong(); size = parcel.readInt(); diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java index 51f09a0103ff..fba75614342d 100644 --- a/core/java/android/net/NetworkStatsHistory.java +++ b/core/java/android/net/NetworkStatsHistory.java @@ -32,6 +32,7 @@ import static android.text.format.DateUtils.SECOND_IN_MILLIS; import static com.android.internal.util.ArrayUtils.total; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.NetworkStatsHistoryBucketProto; @@ -91,18 +92,18 @@ public class NetworkStatsHistory implements Parcelable { public static class Entry { public static final long UNKNOWN = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long bucketDuration; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long bucketStart; public long activeTime; @UnsupportedAppUsage public long rxBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rxPackets; @UnsupportedAppUsage public long txBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long txPackets; public long operations; } @@ -134,7 +135,7 @@ public class NetworkStatsHistory implements Parcelable { recordEntireHistory(existing); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetworkStatsHistory(Parcel in) { bucketDuration = in.readLong(); bucketStart = readLongArray(in); @@ -220,7 +221,7 @@ public class NetworkStatsHistory implements Parcelable { return 0; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int size() { return bucketCount; } @@ -258,7 +259,7 @@ public class NetworkStatsHistory implements Parcelable { * Return index of bucket that contains or is immediately before the * requested time. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getIndexBefore(long time) { int index = Arrays.binarySearch(bucketStart, 0, bucketCount, time); if (index < 0) { @@ -286,7 +287,7 @@ public class NetworkStatsHistory implements Parcelable { /** * Return specific stats entry. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Entry getValues(int i, Entry recycle) { final Entry entry = recycle != null ? recycle : new Entry(); entry.bucketStart = bucketStart[i]; diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index a95ba12f6544..dc33cc7b614d 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -37,6 +37,7 @@ import static android.net.wifi.WifiInfo.sanitizeSsid; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Annotation.NetworkType; @@ -159,7 +160,7 @@ public class NetworkTemplate implements Parcelable { * Template to match metered {@link ConnectivityManager#TYPE_MOBILE} networks, * regardless of IMSI. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static NetworkTemplate buildTemplateMobileWildcard() { return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null); } diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 1e5b6d5ab5c0..a0faafa779a8 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -98,7 +98,7 @@ public class NetworkUtils { * this socket will go directly to the underlying network, so its traffic will not be * forwarded through the VPN. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean protectFromVpn(FileDescriptor fd) { return protectFromVpn(fd.getInt$()); } @@ -223,7 +223,7 @@ public class NetworkUtils { * @hide * @deprecated use {@link Inet4AddressUtils#netmaskToPrefixLength(Inet4Address)} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static int netmaskToPrefixLength(Inet4Address netmask) { // This is only here because some apps seem to be using it (@UnsupportedAppUsage). @@ -290,7 +290,7 @@ public class NetworkUtils { /** * Returns the implicit netmask of an IPv4 address, as was the custom before 1993. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getImplicitNetmask(Inet4Address address) { // Only here because it seems to be used by apps return Inet4AddressUtils.getImplicitNetmask(address); diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 4ba7394a4bb2..f1d9669a8309 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -20,6 +20,7 @@ import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.text.TextUtils; import android.util.Log; @@ -241,7 +242,7 @@ public final class Proxy { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final void setHttpProxySystemProperty(ProxyInfo p) { String host = null; String port = null; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 93ad41f7c524..2543aa3ab48a 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -232,7 +232,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RouteInfo(@Nullable IpPrefix destination, @Nullable InetAddress gateway, @Nullable String iface) { this(destination, gateway, iface, RTN_UNICAST); @@ -501,7 +501,7 @@ public final class RouteInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public static RouteInfo selectBestRoute(Collection routes, InetAddress dest) { return NetUtils.selectBestRoute(routes, dest); diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index e51145800cc7..f3d3c6560fc2 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -115,20 +115,20 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private SSLSocketFactory mInsecureFactory = null; @UnsupportedAppUsage private SSLSocketFactory mSecureFactory = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TrustManager[] mTrustManagers = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private KeyManager[] mKeyManagers = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] mNpnProtocols = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] mAlpnProtocols = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PrivateKey mChannelIdPrivateKey = null; @UnsupportedAppUsage private final int mHandshakeTimeoutMillis; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SSLClientSessionCache mSessionCache; @UnsupportedAppUsage private final boolean mSecure; @@ -249,7 +249,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private SSLSocketFactory makeSocketFactory( KeyManager[] keyManagers, TrustManager[] trustManagers) { try { @@ -343,7 +343,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * must be non-empty and of length less than 256. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAlpnProtocols(byte[][] protocols) { this.mAlpnProtocols = toLengthPrefixedList(protocols); } @@ -464,13 +464,13 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds) throws SocketException { castToOpenSSLSocket(socket).setSoWriteTimeout(writeTimeoutMilliseconds); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static OpenSSLSocketImpl castToOpenSSLSocket(Socket socket) { if (!(socket instanceof OpenSSLSocketImpl)) { throw new IllegalArgumentException("Socket not created by this factory: " diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index f56d656f07ed..ce545974f5cb 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -53,19 +54,19 @@ import java.util.Objects; @SystemApi public final class StaticIpConfiguration implements Parcelable { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public LinkAddress ipAddress; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public InetAddress gateway; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public final ArrayList dnsServers; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public String domains; diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index e7bba69dbb84..a985e934ed3c 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -565,7 +565,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getMobileTcpRxPackets() { long total = 0; for (String iface : getMobileIfaces()) { @@ -581,7 +581,7 @@ public class TrafficStats { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getMobileTcpTxPackets() { long total = 0; for (String iface : getMobileIfaces()) { diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index aa3777d55342..77fb18411546 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -161,7 +161,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setHost(String host) { mHost = host; } @@ -201,7 +201,7 @@ public class WebAddress { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getAuthInfo() { return mAuthInfo; } diff --git a/core/java/android/net/metrics/ApfProgramEvent.java b/core/java/android/net/metrics/ApfProgramEvent.java index c50bae90488b..ab12cdd22685 100644 --- a/core/java/android/net/metrics/ApfProgramEvent.java +++ b/core/java/android/net/metrics/ApfProgramEvent.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -55,22 +56,22 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { public @interface Flags {} /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long lifetime; // Maximum computed lifetime of the program in seconds /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long actualLifetime; // Effective program lifetime in seconds /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int filteredRas; // Number of RAs filtered by the APF program /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int currentRas; // Total number of current RAs at generation time /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programLength; // Length of the APF program in bytes /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int flags; // Bitfield compound of FLAG_* constants private ApfProgramEvent(long lifetime, long actualLifetime, int filteredRas, int currentRas, @@ -217,7 +218,7 @@ public final class ApfProgramEvent implements IpConnectivityLog.Event { }; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static @Flags int flagsFor(boolean hasIPv4, boolean multicastFilterOn) { int bitfield = 0; if (hasIPv4) { diff --git a/core/java/android/net/metrics/ApfStats.java b/core/java/android/net/metrics/ApfStats.java index 2a601b273ef4..fcafb7ebd676 100644 --- a/core/java/android/net/metrics/ApfStats.java +++ b/core/java/android/net/metrics/ApfStats.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -34,61 +35,61 @@ public final class ApfStats implements IpConnectivityLog.Event { * time interval in milliseconds these stastistics covers. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long durationMs; /** * number of received RAs. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int receivedRas; /** * number of received RAs matching a known RA. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int matchingRas; /** * number of received RAs ignored due to the MAX_RAS limit. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int droppedRas; /** * number of received RAs with a minimum lifetime of 0. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int zeroLifetimeRas; /** * number of received RAs that could not be parsed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int parseErrors; /** * number of APF program updates from receiving RAs. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdates; /** * total number of APF program updates. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdatesAll; /** * number of APF program updates from allowing multicast traffic. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int programUpdatesAllowingMulticast; /** * maximum APF program size advertised by hardware. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int maxProgramSize; private ApfStats(Parcel in) { diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index e0a93dd1c18f..8de427de1dab 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -38,7 +39,7 @@ public final class DhcpClientEvent implements IpConnectivityLog.Event { /** @hide */ public final int durationMs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DhcpClientEvent(String msg, int durationMs) { this.msg = msg; this.durationMs = durationMs; diff --git a/core/java/android/net/nsd/INsdManager.aidl b/core/java/android/net/nsd/INsdManager.aidl index 9484c74bcb23..e9e8935a19b2 100644 --- a/core/java/android/net/nsd/INsdManager.aidl +++ b/core/java/android/net/nsd/INsdManager.aidl @@ -25,7 +25,7 @@ import android.os.Messenger; */ interface INsdManager { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Messenger getMessenger(); void setEnabled(boolean enable); } diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl index dd260bc6f2f6..cde57c58ca1f 100644 --- a/core/java/android/nfc/INfcAdapterExtras.aidl +++ b/core/java/android/nfc/INfcAdapterExtras.aidl @@ -23,18 +23,18 @@ import android.os.Bundle; * {@hide} */ interface INfcAdapterExtras { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle open(in String pkg, IBinder b); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle close(in String pkg, IBinder b); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Bundle transceive(in String pkg, in byte[] data_in); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCardEmulationRoute(in String pkg); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setCardEmulationRoute(in String pkg, int route); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void authenticate(in String pkg, in byte[] token); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getDriverName(in String pkg); } diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 421eb33392db..7bf4355d5b35 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -282,7 +283,7 @@ public final class NdefRecord implements Parcelable { private final short mTnf; private final byte[] mType; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final byte[] mId; private final byte[] mPayload; diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index c61f10f50c93..90e01ebe6205 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -35,6 +35,7 @@ import android.nfc.tech.MifareClassic; import android.nfc.tech.Ndef; import android.nfc.tech.NfcA; import android.nfc.tech.NfcF; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -2077,7 +2078,7 @@ public final class NfcAdapter { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public INfcAdapterExtras getNfcAdapterExtrasInterface() { if (mContext == null) { throw new UnsupportedOperationException("You need a context on NfcAdapter to use the " diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index b9e6ff4a5a9e..398ec63a931b 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -29,6 +29,7 @@ import android.nfc.tech.NfcBarcode; import android.nfc.tech.NfcF; import android.nfc.tech.NfcV; import android.nfc.tech.TagTechnology; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -111,7 +112,7 @@ import java.util.HashMap; *

*/ public final class Tag implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final byte[] mId; final int[] mTechList; final String[] mTechStringList; diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index 1d28489d2ac8..1692921f4a8f 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -315,7 +315,7 @@ public class BaseBundle { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isParcelled() { return mParcelledData != null; } diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 9a16d3fee600..6d4593a2ce87 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -120,7 +120,7 @@ public class BatteryManager { * Int value set to the maximum charging current supported by the charger in micro amperes. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_MAX_CHARGING_CURRENT = "max_charging_current"; /** @@ -128,7 +128,7 @@ public class BatteryManager { * Int value set to the maximum charging voltage supported by the charger in micro volts. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_MAX_CHARGING_VOLTAGE = "max_charging_voltage"; /** @@ -136,7 +136,7 @@ public class BatteryManager { * integer containing the charge counter present in the battery. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_CHARGE_COUNTER = "charge_counter"; /** diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b550c7d4ba81..00023a5caf75 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -87,7 +87,7 @@ public abstract class BatteryStats implements Parcelable { /** * A constant indicating a partial wake lock timer. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int WAKE_TYPE_PARTIAL = 0; /** @@ -790,7 +790,7 @@ public abstract class BatteryStats implements Parcelable { * Returns the timer keeping track of background wifi scans. */ public abstract Timer getWifiScanBackgroundTimer(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract long getWifiBatchedScanTime(int csphBin, long elapsedRealtimeUs, int which); public abstract int getWifiBatchedScanCount(int csphBin, int which); @UnsupportedAppUsage diff --git a/core/java/android/os/Broadcaster.java b/core/java/android/os/Broadcaster.java index d1a953f23f7f..88760b0b6828 100644 --- a/core/java/android/os/Broadcaster.java +++ b/core/java/android/os/Broadcaster.java @@ -21,7 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; /** @hide */ public class Broadcaster { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Broadcaster() { } @@ -32,7 +32,7 @@ public class Broadcaster * When this broadcaster pushes a message with senderWhat in the what field, * target will be sent a copy of that message with targetWhat in the what field. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void request(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -100,7 +100,7 @@ public class Broadcaster /** * Unregister for notifications for this senderWhat/target/targetWhat tuple. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void cancelRequest(int senderWhat, Handler target, int targetWhat) { synchronized (this) { @@ -173,7 +173,7 @@ public class Broadcaster * Send out msg. Anyone who has registered via the request() method will be * sent the message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void broadcast(Message msg) { synchronized (this) { diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index f8f8bf746afd..1c1f5c034cd9 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -174,7 +174,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Bundle forPair(String key, String value) { Bundle b = new Bundle(1); b.putString(key, value); @@ -306,7 +306,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSize() { if (mParcelledData != null) { return mParcelledData.dataSize(); @@ -389,7 +389,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { * Filter values in Bundle to only basic types. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle filterValues() { unparcel(); Bundle bundle = this; diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 4fed93204f59..a4af0dbed0bd 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -88,7 +88,7 @@ public final class Debug // set/cleared by waitForDebugger() private static volatile boolean mWaiting = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Debug() {} /* @@ -120,7 +120,7 @@ public final class Debug @UnsupportedAppUsage public int dalvikSwappablePss; /** @hide The resident set size for dalvik heap. (Without other Dalvik overhead.) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int dalvikRss; /** The private dirty pages used by dalvik heap. */ public int dalvikPrivateDirty; @@ -140,7 +140,7 @@ public final class Debug public int dalvikSwappedOut; /** The dirty dalvik pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int dalvikSwappedOutPss; /** The proportional set size for the native heap. */ @@ -150,7 +150,7 @@ public final class Debug @UnsupportedAppUsage public int nativeSwappablePss; /** @hide The resident set size for the native heap. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nativeRss; /** The private dirty pages used by the native heap. */ public int nativePrivateDirty; @@ -170,7 +170,7 @@ public final class Debug public int nativeSwappedOut; /** The dirty native pages that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nativeSwappedOutPss; /** The proportional set size for everything else. */ @@ -180,7 +180,7 @@ public final class Debug @UnsupportedAppUsage public int otherSwappablePss; /** @hide The resident set size for everything else. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int otherRss; /** The private dirty pages used by everything else. */ public int otherPrivateDirty; @@ -200,12 +200,12 @@ public final class Debug public int otherSwappedOut; /** The dirty pages used by anyting else that have been swapped out, proportional. */ /** @hide We may want to expose this, eventually. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int otherSwappedOutPss; /** Whether the kernel reports proportional swap usage */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasSwappedOutPss; /** @hide */ @@ -2042,7 +2042,7 @@ public final class Debug * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native void dumpNativeHeap(FileDescriptor fd); /** diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 5745187fcbb9..518e29d51091 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -719,7 +719,7 @@ public class Environment { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static File getLegacyExternalStorageObbDirectory() { return buildPath(getLegacyExternalStorageDirectory(), DIR_ANDROID, DIR_OBB); } @@ -1040,7 +1040,7 @@ public class Environment { * Generates the raw path to an application's OBB files * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static File[] buildExternalStorageAppObbDirs(String packageName) { throwIfUserRequired(); return sCurrentUser.buildExternalStorageAppObbDirs(packageName); diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java index 25bffbc9e8d5..6f44b20a0ff4 100644 --- a/core/java/android/os/FileObserver.java +++ b/core/java/android/os/FileObserver.java @@ -145,7 +145,7 @@ public abstract class FileObserver { stopWatching(m_fd, descriptors); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onEvent(int wfd, @NotifyEventType int mask, String path) { // look up our observer, fixing up the map if necessary... FileObserver observer = null; diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index bbafc7b0875a..d151c16061d9 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -189,7 +189,7 @@ public final class FileUtils { * @return 0 on success, otherwise errno. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int setPermissions(FileDescriptor fd, int mode, int uid, int gid) { try { Os.fchmod(fd, mode); @@ -672,7 +672,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void stringToFile(File file, String string) throws IOException { stringToFile(file.getAbsolutePath(), string); } @@ -721,7 +721,7 @@ public final class FileUtils { * to its potential for collision. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static long checksumCrc32(File file) throws FileNotFoundException, IOException { CRC32 checkSummer = new CRC32(); @@ -808,7 +808,7 @@ public final class FileUtils { * @return if any files were deleted. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean deleteOlderFiles(File dir, int minCount, long minAgeMs) { if (minCount < 0 || minAgeMs < 0) { throw new IllegalArgumentException("Constraints must be positive or 0"); @@ -917,7 +917,7 @@ public final class FileUtils { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean deleteContents(File dir) { File[] files = dir.listFiles(); boolean success = true; diff --git a/core/java/android/os/Handler.java b/core/java/android/os/Handler.java index 24aaa583f542..d310d6e7530d 100644 --- a/core/java/android/os/Handler.java +++ b/core/java/android/os/Handler.java @@ -189,7 +189,7 @@ public class Handler { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Handler(boolean async) { this(null, async); } @@ -297,7 +297,7 @@ public class Handler { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @NonNull public static Handler getMain() { if (MAIN_THREAD_HANDLER == null) { diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index 0d2bfdf04905..feed20800fd4 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -159,7 +159,7 @@ public abstract class HwBinder implements IHwBinder { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) public static void reportSyspropChanged() { native_report_sysprop_change(); } diff --git a/core/java/android/os/IBinder.java b/core/java/android/os/IBinder.java index 8a8a6af09e5f..d91c458a474b 100644 --- a/core/java/android/os/IBinder.java +++ b/core/java/android/os/IBinder.java @@ -150,7 +150,7 @@ public interface IBinder { int LIKE_TRANSACTION = ('_'<<24)|('L'<<16)|('I'<<8)|'K'; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int SYSPROPS_TRANSACTION = ('_'<<24)|('S'<<16)|('P'<<8)|'R'; /** diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 136f6121e585..e1d900528f07 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -68,7 +68,7 @@ interface INetworkManagementService /** * Clear all IP addresses on the specified interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void clearInterfaceAddresses(String iface); /** @@ -84,26 +84,26 @@ interface INetworkManagementService /** * Set interface IPv6 privacy extensions */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setInterfaceIpv6PrivacyExtensions(String iface, boolean enable); /** * Disable IPv6 on an interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void disableIpv6(String iface); /** * Enable IPv6 on an interface */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void enableIpv6(String iface); /** * Set IPv6 autoconf address generation mode. * This is a no-op if an unsupported mode is requested. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setIPv6AddrGenMode(String iface, int mode); /** @@ -291,7 +291,7 @@ interface INetworkManagementService /** * Return status of bandwidth control module. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isBandwidthControlEnabled(); /** diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index e996809f1299..90cbac50b391 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -45,7 +45,7 @@ interface IPowerManager @UnsupportedAppUsage void userActivity(long time, int event, int flags); void wakeUp(long time, int reason, String details, String opPackageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void goToSleep(long time, int reason, int flags); @UnsupportedAppUsage(maxTargetSdk = 28) void nap(long time); diff --git a/core/java/android/os/LocaleList.java b/core/java/android/os/LocaleList.java index ee64551df226..cfa823cffe86 100644 --- a/core/java/android/os/LocaleList.java +++ b/core/java/android/os/LocaleList.java @@ -546,7 +546,7 @@ public final class LocaleList implements Parcelable { * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setDefault(@NonNull @Size(min=1) LocaleList locales, int localeIndex) { if (locales == null) { throw new NullPointerException("locales is null"); diff --git a/core/java/android/os/MemoryFile.java b/core/java/android/os/MemoryFile.java index f84f9f05b13e..95337f6a1b1e 100644 --- a/core/java/android/os/MemoryFile.java +++ b/core/java/android/os/MemoryFile.java @@ -41,7 +41,7 @@ public class MemoryFile { private static String TAG = "MemoryFile"; // Returns 'true' if purged, 'false' otherwise - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native boolean native_pin(FileDescriptor fd, boolean pin) throws IOException; @UnsupportedAppUsage private static native int native_get_size(FileDescriptor fd) throws IOException; diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index 7213b067a691..87c4f331e93f 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -266,7 +266,7 @@ public final class MessageQueue { } // Called from native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int dispatchEvents(int fd, int events) { // Get the file descriptor record and any state that might change. final FileDescriptorRecord record; @@ -635,7 +635,7 @@ public final class MessageQueue { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean hasMessages(Handler h, Runnable r, Object object) { if (h == null) { return false; diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 765ef48308ae..a04fcb580e63 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -514,11 +514,11 @@ public final class Parcel { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native long getGlobalAllocSize(); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native long getGlobalAllocCount(); /** @@ -742,7 +742,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void writeBlob(@Nullable byte[] b) { writeBlob(b, 0, (b != null) ? b.length : 0); } @@ -1014,7 +1014,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArrayMap(@Nullable ArrayMap val) { writeArrayMapInternal(val); } @@ -1053,7 +1053,7 @@ public final class Parcel { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArraySet(@Nullable ArraySet val) { final int size = (val != null) ? val.size() : -1; writeInt(size); @@ -2719,7 +2719,7 @@ public final class Parcel { * {@hide} * {@SystemApi} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Nullable public final byte[] readBlob() { return nativeReadBlob(mNativePtr); @@ -3633,7 +3633,7 @@ public final class Parcel { /** * @hide For testing only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readArrayMap(@NonNull ArrayMap outVal, @Nullable ClassLoader loader) { final int N = readInt(); if (N < 0) { diff --git a/core/java/android/os/ParcelableParcel.java b/core/java/android/os/ParcelableParcel.java index 38d980ecb0f1..3be630f2b382 100644 --- a/core/java/android/os/ParcelableParcel.java +++ b/core/java/android/os/ParcelableParcel.java @@ -27,7 +27,7 @@ public class ParcelableParcel implements Parcelable { final Parcel mParcel; final ClassLoader mClassLoader; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ParcelableParcel(ClassLoader loader) { mParcel = Parcel.obtain(); mClassLoader = loader; @@ -46,13 +46,13 @@ public class ParcelableParcel implements Parcelable { mParcel.appendFrom(src, pos, size); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Parcel getParcel() { mParcel.setDataPosition(0); return mParcel; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ClassLoader getClassLoader() { return mClassLoader; } @@ -68,7 +68,7 @@ public class ParcelableParcel implements Parcelable { dest.appendFrom(mParcel, 0, mParcel.dataSize()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Parcelable.ClassLoaderCreator CREATOR = new Parcelable.ClassLoaderCreator() { public ParcelableParcel createFromParcel(Parcel in) { diff --git a/core/java/android/os/PerformanceCollector.java b/core/java/android/os/PerformanceCollector.java index 27de48d40188..e6471ae1c00a 100644 --- a/core/java/android/os/PerformanceCollector.java +++ b/core/java/android/os/PerformanceCollector.java @@ -364,7 +364,7 @@ public class PerformanceCollector { * @param label description of code block between startTiming and * stopTiming, used to label output */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startTiming(String label) { if (mPerfWriter != null) mPerfWriter.writeStartTiming(label); @@ -414,7 +414,7 @@ public class PerformanceCollector { * between calls to startTiming and stopTiming. List of iterations * is keyed by {@link #METRIC_KEY_ITERATIONS iterations}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle stopTiming(String label) { addIteration(label); if (mPerfWriter != null) diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index e736e30b51e5..d130bc5d37e7 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1014,7 +1014,7 @@ public final class PowerManager { * Gets a float screen brightness setting. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getBrightnessConstraint(int constraint) { try { return mService.getBrightnessConstraint(constraint); @@ -2304,7 +2304,7 @@ public final class PowerManager { * This broadcast is only sent to registered receivers. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED"; diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index e62ad1fa9052..ab7d75655db9 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -71,7 +71,7 @@ public class Process { * Defines the UID/GID for the log group. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int LOG_UID = 1007; /** @@ -84,14 +84,14 @@ public class Process { * Defines the UID/GID for the mediaserver process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_UID = 1013; /** * Defines the UID/GID for the DRM process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DRM_UID = 1019; /** @@ -104,7 +104,7 @@ public class Process { * Defines the UID/GID for the group that controls VPN services. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int VPN_UID = 1016; /** @@ -123,7 +123,7 @@ public class Process { * Defines the UID/GID for the NFC service process. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NFC_UID = 1027; /** @@ -277,7 +277,7 @@ public class Process { * First uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int FIRST_ISOLATED_UID = 99000; @@ -285,7 +285,7 @@ public class Process { * Last uid used for fully isolated sandboxed processes (with no permissions of their own) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int LAST_ISOLATED_UID = 99999; @@ -1165,38 +1165,38 @@ public class Process { public static final native int[] getPids(String path, int[] lastArray); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_TERM_MASK = 0xff; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_ZERO_TERM = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_SPACE_TERM = (int)' '; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_TAB_TERM = (int)'\t'; /** @hide */ public static final int PROC_NEWLINE_TERM = (int) '\n'; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_COMBINE = 0x100; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_PARENS = 0x200; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_QUOTES = 0x400; /** @hide */ public static final int PROC_CHAR = 0x800; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_STRING = 0x1000; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_LONG = 0x2000; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROC_OUT_FLOAT = 0x4000; /** diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 35e7bad83736..71344f90de75 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -190,7 +190,7 @@ public final class ServiceManager { * @param dumpPriority supported dump priority levels as a bitmask * to access this service */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void addService(String name, IBinder service, boolean allowIsolated, int dumpPriority) { try { diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java index 0be3d681c80a..3358ce13ed52 100644 --- a/core/java/android/os/ShellCommand.java +++ b/core/java/android/os/ShellCommand.java @@ -98,7 +98,7 @@ public abstract class ShellCommand extends BasicShellCommandHandler { return super.handleDefaultCommands(cmd); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String peekNextArg() { return super.peekNextArg(); } diff --git a/core/java/android/os/StatFs.java b/core/java/android/os/StatFs.java index 6d1a1164abb4..eb8e71761294 100644 --- a/core/java/android/os/StatFs.java +++ b/core/java/android/os/StatFs.java @@ -26,7 +26,7 @@ import android.system.StructStatVfs; * wrapper for Unix statvfs(). */ public class StatFs { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private StructStatVfs mStat; /** diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 0fba8950cf15..c89adadfbf2d 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2381,7 +2381,7 @@ public final class StrictMode { * Binder for its current (native) thread-local policy value and synchronize it to libcore's * (Java) thread-local policy value. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void onBinderStrictModePolicyChange(@ThreadPolicyMask int newPolicy) { setBlockGuardPolicy(newPolicy); } @@ -2621,7 +2621,7 @@ public final class StrictMode { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void incrementExpectedActivityCount(Class klass) { if (klass == null) { return; diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index 26f3af0c68bb..e29d75611856 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -247,7 +247,7 @@ public final class SystemClock { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @CriticalNative public static native long currentThreadTimeMicro(); diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java index a16452705efc..ded9be5eb74a 100644 --- a/core/java/android/os/SystemProperties.java +++ b/core/java/android/os/SystemProperties.java @@ -60,7 +60,7 @@ public class SystemProperties { * uses reflection to read this whenever text is selected (http://b/36095274). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int PROP_NAME_MAX = Integer.MAX_VALUE; /** @hide */ @@ -256,7 +256,7 @@ public class SystemProperties { * @param callback The {@link Runnable} that should be removed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void removeChangeCallback(@NonNull Runnable callback) { synchronized (sChangeCallbacks) { if (sChangeCallbacks.contains(callback)) { diff --git a/core/java/android/os/SystemService.java b/core/java/android/os/SystemService.java index 5871d2d9b58f..9b0ac8fdeb7a 100644 --- a/core/java/android/os/SystemService.java +++ b/core/java/android/os/SystemService.java @@ -66,7 +66,7 @@ public class SystemService { } /** Request that the init daemon stop a named service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void stop(String name) { SystemProperties.set("ctl.stop", name); } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 58c8efa3a972..9c9e4995d673 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -52,7 +52,7 @@ public final class Trace { /** @hide */ public static final long TRACE_TAG_INPUT = 1L << 2; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final long TRACE_TAG_VIEW = 1L << 3; /** @hide */ public static final long TRACE_TAG_WEBVIEW = 1L << 4; diff --git a/core/java/android/os/UpdateLock.java b/core/java/android/os/UpdateLock.java index 036d0951c19a..5aa9401ddb27 100644 --- a/core/java/android/os/UpdateLock.java +++ b/core/java/android/os/UpdateLock.java @@ -51,7 +51,7 @@ public class UpdateLock { * locker releases theirs. The broadcast is sticky but is sent only to * registered receivers. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String UPDATE_LOCK_CHANGED = "android.os.UpdateLock.UPDATE_LOCK_CHANGED"; /** @@ -60,7 +60,7 @@ public class UpdateLock { * update operation. True means that updates are okay right now; false indicates * that perhaps later would be a better time. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NOW_IS_CONVENIENT = "nowisconvenient"; /** @@ -69,7 +69,7 @@ public class UpdateLock { * in the System.currentTimeMillis() time base, which may be non-monotonic especially * around reboots. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String TIMESTAMP = "timestamp"; /** @@ -94,7 +94,7 @@ public class UpdateLock { /** * Is this lock currently held? */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isHeld() { synchronized (mToken) { return mHeld; @@ -104,7 +104,7 @@ public class UpdateLock { /** * Acquire an update lock. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void acquire() { if (DEBUG) { Log.v(TAG, "acquire() : " + this, new RuntimeException("here")); @@ -131,7 +131,7 @@ public class UpdateLock { /** * Release this update lock. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void release() { if (DEBUG) Log.v(TAG, "release() : " + this, new RuntimeException("here")); checkService(); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index d39c5328e330..d6720248720a 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -100,7 +100,7 @@ public final class UserHandle implements Parcelable { public static final @UserIdInt int USER_SYSTEM = 0; /** @hide A user serial constant to indicate the "system" user of the device */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int USER_SERIAL_SYSTEM = 0; /** @hide A user handle to indicate the "system" user of the device */ @@ -136,22 +136,22 @@ public final class UserHandle implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ERR_GID = -1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_ROOT = android.os.Process.ROOT_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_APP_START = android.os.Process.FIRST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_APP_END = android.os.Process.LAST_APPLICATION_UID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_SHARED_GID_START = android.os.Process.FIRST_SHARED_APPLICATION_GID; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int AID_CACHE_GID_START = android.os.Process.FIRST_APPLICATION_CACHE_GID; /** The userId represented by this UserHandle. */ diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 93d6cae82bfe..2edd3227cf36 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -1020,7 +1020,7 @@ public class UserManager { * @see #getUserRestrictions() * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DISALLOW_RECORD_AUDIO = "no_record_audio"; /** @@ -1704,7 +1704,7 @@ public class UserManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean canSwitchUsers() { boolean allowUserSwitchingWhenSystemUserLocked = Settings.Global.getInt( mContext.getContentResolver(), @@ -2066,7 +2066,7 @@ public class UserManager { * @return whether user is a guest user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}) public boolean isGuestUser(@UserIdInt int userId) { @@ -2397,7 +2397,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUserStartRealtime() { try { return mService.getUserStartRealtime(); @@ -2412,7 +2412,7 @@ public class UserManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUserUnlockRealtime() { try { return mService.getUserUnlockRealtime(); @@ -4227,7 +4227,7 @@ public class UserManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isDeviceInDemoMode(Context context) { return Settings.Global.getInt(context.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0) > 0; diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 21ad38b0e371..f82cc22bd764 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -85,7 +85,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int EFFECT_THUD = Effect.THUD; @@ -94,7 +94,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int EFFECT_POP = Effect.POP; @@ -135,7 +135,7 @@ public abstract class VibrationEffect implements Parcelable { * @see #get(Uri, Context) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int[] RINGTONES = { Effect.RINGTONE_1, @@ -567,7 +567,7 @@ public abstract class VibrationEffect implements Parcelable { out.writeInt(mAmplitude); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/os/health/HealthStatsParceler.java b/core/java/android/os/health/HealthStatsParceler.java index f28a9747bc44..eb864a4c3d3f 100644 --- a/core/java/android/os/health/HealthStatsParceler.java +++ b/core/java/android/os/health/HealthStatsParceler.java @@ -18,6 +18,7 @@ package android.os.health; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -38,7 +39,7 @@ public class HealthStatsParceler implements Parcelable { private HealthStatsWriter mWriter; private HealthStats mHealthStats; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public HealthStatsParceler createFromParcel(Parcel in) { diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index 6e259ea2642c..8181911ec783 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -52,7 +52,7 @@ public class SystemHealthManager { * Construct a new SystemHealthManager object. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SystemHealthManager() { this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME))); } diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 9fd9e4e4067d..694ff19f7dad 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -17,6 +17,7 @@ package android.os.storage; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Used for receiving notifications from the StorageManager @@ -47,23 +48,23 @@ public class StorageEventListener { public void onStorageStateChanged(String path, String oldState, String newState) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeRecordChanged(VolumeRecord rec) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onVolumeForgotten(String fsUuid) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDiskScanned(DiskInfo disk, int volumeCount) { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDiskDestroyed(DiskInfo disk) { } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 270115beb09b..5d3c66cc3f34 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -60,6 +60,7 @@ import android.content.res.ObbScanner; import android.database.Cursor; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.Handler; @@ -287,7 +288,7 @@ public class StorageManager { public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM; /** @hide The volume is not encrypted. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ENCRYPTION_STATE_NONE = IVold.ENCRYPTION_STATE_NONE; @@ -627,7 +628,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void enableUsbMassStorage() { } @@ -637,7 +638,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void disableUsbMassStorage() { } @@ -648,7 +649,7 @@ public class StorageManager { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isUsbMassStorageConnected() { return false; } @@ -804,7 +805,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable VolumeInfo findVolumeById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -1025,7 +1026,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void format(String volId) { try { mStorageManager.format(volId); @@ -1067,7 +1068,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void partitionPublic(String diskId) { try { mStorageManager.partitionPublic(diskId); @@ -1229,7 +1230,7 @@ public class StorageManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) { if (file == null) { return null; @@ -1477,7 +1478,7 @@ public class StorageManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getStorageFullBytes(File path) { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); @@ -1594,7 +1595,7 @@ public class StorageManager { * @return true for file encrypted. (Implies isEncrypted() == true) * false not encrypted or block encrypted */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isFileEncryptedNativeOnly() { if (!isEncrypted()) { return false; @@ -2676,10 +2677,10 @@ public class StorageManager { /// Consts to match the password types in cryptfs.h /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; /** @hide */ public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index eed36d714653..a52eeccaca64 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -327,7 +327,7 @@ public final class StorageVolume implements Parcelable { * parse or UUID is unknown. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getFatVolumeId() { if (mFsUuid == null || mFsUuid.length() != 9) { return -1; diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 74c0ecb2ecc3..901494b845b0 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.net.Uri; +import android.os.Build; import android.os.Environment; import android.os.IVold; import android.os.Parcel; @@ -179,7 +180,7 @@ public class VolumeInfo implements Parcelable { this.partGuid = partGuid; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VolumeInfo(Parcel parcel) { id = parcel.readString8(); type = parcel.readInt(); @@ -312,7 +313,7 @@ public class VolumeInfo implements Parcelable { * Returns {@code true} if this volume is the primary emulated volume for {@code userId}, * {@code false} otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isPrimaryEmulatedForUser(int userId) { return id.equals(ID_EMULATED_INTERNAL + ";" + userId); } @@ -321,7 +322,7 @@ public class VolumeInfo implements Parcelable { return isVisibleForUser(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVisibleForWrite(int userId) { return isVisibleForUser(userId); } @@ -331,7 +332,7 @@ public class VolumeInfo implements Parcelable { return (path != null) ? new File(path) : null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public File getInternalPath() { return (internalPath != null) ? new File(internalPath) : null; } @@ -533,7 +534,7 @@ public class VolumeInfo implements Parcelable { return id.hashCode(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java index 0f58a714749b..ee67ca6b7cd0 100644 --- a/core/java/android/os/storage/VolumeRecord.java +++ b/core/java/android/os/storage/VolumeRecord.java @@ -19,6 +19,7 @@ package android.os.storage; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; @@ -60,7 +61,7 @@ public class VolumeRecord implements Parcelable { this.fsUuid = Preconditions.checkNotNull(fsUuid); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public VolumeRecord(Parcel parcel) { type = parcel.readInt(); fsUuid = parcel.readString(); @@ -163,7 +164,7 @@ public class VolumeRecord implements Parcelable { return fsUuid.hashCode(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { @Override public VolumeRecord createFromParcel(Parcel in) { diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index ae4a626cdd5d..53b1dab9f760 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -31,6 +31,7 @@ import android.content.Intent; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -728,7 +729,7 @@ public abstract class PreferenceActivity extends ListActivity implements * Returns the Header list * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public List

getHeaders() { return mHeaders; } diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 3f6e5051a3f8..22399f517908 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.TypedArray; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -103,7 +104,7 @@ public abstract class PreferenceFragment extends Fragment implements private static final String PREFERENCES_TAG = "android:preferences"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PreferenceManager mPreferenceManager; private ListView mList; private boolean mHavePrefs; diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index 01fe2f3f6b3a..6b813b0c04f6 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -102,7 +103,7 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi private Dialog mDialog; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ListView mListView; private int mLayoutResId = com.android.internal.R.layout.preference_list_fragment; diff --git a/core/java/android/preference/SeekBarPreference.java b/core/java/android/preference/SeekBarPreference.java index a2852bc2cce3..e31165e6adcc 100644 --- a/core/java/android/preference/SeekBarPreference.java +++ b/core/java/android/preference/SeekBarPreference.java @@ -19,6 +19,7 @@ package android.preference; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; @@ -73,7 +74,7 @@ public class SeekBarPreference extends Preference this(context, attrs, com.android.internal.R.attr.seekBarPreferenceStyle); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SeekBarPreference(Context context) { this(context, null); } diff --git a/core/java/android/preference/SwitchPreference.java b/core/java/android/preference/SwitchPreference.java index baa023e41aad..57fefda35de3 100644 --- a/core/java/android/preference/SwitchPreference.java +++ b/core/java/android/preference/SwitchPreference.java @@ -20,6 +20,7 @@ import android.annotation.StringRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.widget.Checkable; @@ -45,7 +46,7 @@ import android.widget.Switch; */ @Deprecated public class SwitchPreference extends TwoStatePreference { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Listener mListener = new Listener(); // Switch text for on and off states diff --git a/core/java/android/provider/BrowserContract.java b/core/java/android/provider/BrowserContract.java index 5083b8b254ab..7d77d37e117b 100644 --- a/core/java/android/provider/BrowserContract.java +++ b/core/java/android/provider/BrowserContract.java @@ -27,6 +27,7 @@ import android.content.Context; import android.database.Cursor; import android.graphics.BitmapFactory; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.util.Pair; @@ -47,7 +48,7 @@ public class BrowserContract { public static final String AUTHORITY = "com.android.browser"; /** A content:// style uri to the authority for the browser provider */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY); /** @@ -303,7 +304,7 @@ public class BrowserContract { * The content:// style URI for the default folder * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI_DEFAULT_FOLDER = Uri.withAppendedPath(CONTENT_URI, "folder"); @@ -324,7 +325,7 @@ public class BrowserContract { * @param folderId the ID of the folder to point to * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri buildFolderUri(long folderId) { return ContentUris.withAppendedId(CONTENT_URI_DEFAULT_FOLDER, folderId); } @@ -412,7 +413,7 @@ public class BrowserContract { /** * Directory under {@link Bookmarks#CONTENT_URI} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = AUTHORITY_URI.buildUpon().appendPath("accounts").build(); @@ -450,7 +451,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "history"); /** @@ -580,7 +581,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "images"); /** @@ -681,7 +682,7 @@ public class BrowserContract { /** * The content:// style URI for this table */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "combined"); /** diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 8ac1d84e04e4..1ee2f19038db 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -38,6 +38,7 @@ import android.content.Intent; import android.database.Cursor; import android.database.DatabaseUtils; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.text.format.DateUtils; import android.text.format.TimeMigrationUtils; @@ -1825,7 +1826,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String[] PROVIDER_WRITABLE_COLUMNS = new String[] { ACCOUNT_NAME, ACCOUNT_TYPE, @@ -1860,7 +1861,7 @@ public final class CalendarContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String[] SYNC_WRITABLE_COLUMNS = new String[] { _SYNC_ID, @@ -2512,7 +2513,7 @@ public final class CalendarContract { * if no such alarm exists. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final long findNextAlarmTime(ContentResolver cr, long millis) { String selection = ALARM_TIME + ">=" + millis; // TODO: construct an explicit SQL query so that we can add @@ -2546,7 +2547,7 @@ public final class CalendarContract { * @param manager the AlarmManager * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final void rescheduleMissedAlarms(ContentResolver cr, Context context, AlarmManager manager) { // Get all the alerts that have been scheduled but have not fired @@ -2603,7 +2604,7 @@ public final class CalendarContract { * epoch * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void scheduleAlarm(Context context, AlarmManager manager, long alarmTime) { if (DEBUG) { String schedTime = TimeMigrationUtils.formatMillisWithFixedFormat(alarmTime); diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 24cde0667444..bbd838db68c3 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -46,6 +46,7 @@ import android.database.CursorWrapper; import android.database.DatabaseUtils; import android.graphics.Rect; import android.net.Uri; +import android.os.Build; import android.os.RemoteException; import android.telecom.PhoneAccountHandle; import android.text.TextUtils; @@ -129,7 +130,7 @@ public final class ContactsContract { * Prefix for column names that are not visible to client apps. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String HIDDEN_COLUMN_PREFIX = "x_"; @@ -6140,7 +6141,7 @@ public final class ContactsContract { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final Uri ENTERPRISE_CONTENT_URI = Uri.withAppendedPath(Data.ENTERPRISE_CONTENT_URI, "phones"); diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 062d92900643..0fea48442941 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -842,7 +842,7 @@ public final class DocumentsContract { public static final String EXTRA_RESULT = "result"; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String METHOD_CREATE_DOCUMENT = "android:createDocument"; /** {@hide} */ public static final String METHOD_RENAME_DOCUMENT = "android:renameDocument"; @@ -877,11 +877,11 @@ public final class DocumentsContract { private static final String PATH_ROOT = "root"; private static final String PATH_RECENT = "recent"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String PATH_DOCUMENT = "document"; private static final String PATH_CHILDREN = "children"; private static final String PATH_SEARCH = "search"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String PATH_TREE = "tree"; private static final String PARAM_QUERY = "query"; diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 48410a748766..0829d85801ac 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.NetworkPolicyManager; import android.net.Uri; +import android.os.Build; /** * The Download Manager @@ -138,7 +139,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_URI = "uri"; /** @@ -168,7 +169,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_FILE_NAME_HINT = "hint"; /** @@ -184,7 +185,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_MIME_TYPE = "mimetype"; /** @@ -193,7 +194,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DESTINATION = "destination"; /** @@ -203,7 +204,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_VISIBILITY = "visibility"; /** @@ -240,7 +241,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_PACKAGE = "notificationpackage"; /** @@ -251,7 +252,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_CLASS = "notificationclass"; /** @@ -260,7 +261,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_NOTIFICATION_EXTRAS = "notificationextras"; /** @@ -270,7 +271,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_COOKIE_DATA = "cookiedata"; /** @@ -287,7 +288,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_REFERER = "referer"; /** @@ -325,7 +326,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_TITLE = "title"; /** @@ -335,7 +336,7 @@ public final class Downloads { *

Type: TEXT

*

Owner can Init/Read/Write

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DESCRIPTION = "description"; /** @@ -344,7 +345,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_IS_PUBLIC_API = "is_public_api"; /** @@ -353,7 +354,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; /** @@ -362,7 +363,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_ALLOW_ROAMING = "allow_roaming"; /** @@ -379,7 +380,7 @@ public final class Downloads { *

Type: INTEGER

*

Owner can Init/Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI = "is_visible_in_downloads_ui"; /** @@ -396,7 +397,7 @@ public final class Downloads { *

Type: BOOLEAN

*

Owner can Read

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_DELETED = "deleted"; /** @@ -425,7 +426,7 @@ public final class Downloads { * *

Type: TEXT

*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String COLUMN_MEDIA_SCANNED = "scanned"; /** Possible values for column {@link #COLUMN_MEDIA_SCANNED} */ @@ -504,7 +505,7 @@ public final class Downloads { * immediately after they are used, and are kept around by the download * manager as long as space is available. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DESTINATION_CACHE_PARTITION_PURGEABLE = 2; /** @@ -518,7 +519,7 @@ public final class Downloads { * This download will be saved to the location given by the file URI in * {@link #COLUMN_FILE_NAME_HINT}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DESTINATION_FILE_URI = 4; /** @@ -599,7 +600,7 @@ public final class Downloads { * @param visibility the value of {@link #COLUMN_VISIBILITY}. * @return true if the notification should be displayed. false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isNotificationToBeDisplayed(int visibility) { return visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED || visibility == DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION; @@ -840,7 +841,7 @@ public final class Downloads { * Prefix for ContentValues keys that contain HTTP header lines, to be passed to * DownloadProvider.insert(). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String INSERT_KEY_PREFIX = "http_header_"; } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 319f1cd35369..47678d945bcd 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -60,6 +60,7 @@ import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pManager; import android.os.BatteryManager; import android.os.Binder; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.DropBoxManager; @@ -942,7 +943,7 @@ public final class Settings { * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACTION_USER_DICTIONARY_INSERT = "com.android.settings.USER_DICTIONARY_INSERT"; @@ -1893,7 +1894,7 @@ public final class Settings { = "android.settings.ACTION_APP_NOTIFICATION_REDACTION"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String EXTRA_APP_UID = "app_uid"; /** @@ -2421,7 +2422,7 @@ public final class Settings { * This is the only type of reset available to non-system clients. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; @@ -3066,7 +3067,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/system"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -3115,9 +3116,9 @@ public final class Settings { MOVED_TO_SECURE.add(Secure.INSTALL_NON_MARKET_APPS); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashSet MOVED_TO_GLOBAL; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final HashSet MOVED_TO_SECURE_THEN_GLOBAL; static { MOVED_TO_GLOBAL = new HashSet<>(); @@ -4274,7 +4275,7 @@ public final class Settings { * Kept for use by legacy database upgrade code in DatabaseHelper. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String VIBRATE_IN_SILENT = "vibrate_in_silent"; /** @@ -4569,7 +4570,7 @@ public final class Settings { * 3 = HCO * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String TTY_MODE = "tty_mode"; /** @@ -4596,7 +4597,7 @@ public final class Settings { * pending. The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse"; /** @@ -4605,7 +4606,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String POINTER_LOCATION = "pointer_location"; /** @@ -4614,7 +4615,7 @@ public final class Settings { * 1 = yes * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String SHOW_TOUCHES = "show_touches"; /** @@ -4642,14 +4643,14 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DOCK_SOUNDS_ENABLED = Global.DOCK_SOUNDS_ENABLED; /** * Whether to play sounds when the keyguard is shown and dismissed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCKSCREEN_SOUNDS_ENABLED = "lockscreen_sounds_enabled"; /** @@ -4672,7 +4673,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DESK_DOCK_SOUND = Global.DESK_DOCK_SOUND; /** @@ -4681,7 +4682,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DESK_UNDOCK_SOUND = Global.DESK_UNDOCK_SOUND; /** @@ -4690,7 +4691,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String CAR_DOCK_SOUND = Global.CAR_DOCK_SOUND; /** @@ -4699,7 +4700,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String CAR_UNDOCK_SOUND = Global.CAR_UNDOCK_SOUND; /** @@ -4708,7 +4709,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SOUND = Global.LOCK_SOUND; /** @@ -4717,7 +4718,7 @@ public final class Settings { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String UNLOCK_SOUND = Global.UNLOCK_SOUND; /** @@ -4766,7 +4767,7 @@ public final class Settings { * +7 = fastest * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String POINTER_SPEED = "pointer_speed"; /** @@ -4824,7 +4825,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Set PUBLIC_SETTINGS = new ArraySet<>(); static { PUBLIC_SETTINGS.add(END_BUTTON_BEHAVIOR); @@ -4883,7 +4884,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Set PRIVATE_SETTINGS = new ArraySet<>(); static { PRIVATE_SETTINGS.add(WIFI_USE_STATIC_IP); @@ -4932,7 +4933,7 @@ public final class Settings { * These entries are considered common between the personal and the managed profile, * since the managed profile doesn't get to change them. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final Set CLONE_TO_MANAGED_PROFILE = new ArraySet<>(); static { CLONE_TO_MANAGED_PROFILE.add(DATE_FORMAT); @@ -5259,7 +5260,7 @@ public final class Settings { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/secure"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -5499,7 +5500,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putStringForUser(@NonNull ContentResolver resolver, @NonNull String name, @Nullable String value, @Nullable String tag, boolean makeDefault, @UserIdInt int userHandle, boolean overrideableByRestore) { @@ -5739,7 +5740,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getLongForUser(ContentResolver cr, String name, long def, int userHandle) { String valString = getStringForUser(cr, name, userHandle); @@ -5803,7 +5804,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putLongForUser(ContentResolver cr, String name, long value, int userHandle) { return putStringForUser(cr, name, Long.toString(value), userHandle); @@ -6486,7 +6487,7 @@ public final class Settings { * subject to current DeviceAdmin policy limits. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout"; @@ -6528,7 +6529,7 @@ public final class Settings { * @deprecated */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LOCK_SCREEN_OWNER_INFO_ENABLED = "lock_screen_owner_info_enabled"; @@ -6659,7 +6660,7 @@ public final class Settings { * accessibility feature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service"; @@ -7026,7 +7027,7 @@ public final class Settings { * @see android.graphics.Typeface * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACCESSIBILITY_CAPTIONING_TYPEFACE = "accessibility_captioning_typeface"; @@ -7066,7 +7067,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String ACCESSIBILITY_DISPLAY_DALTONIZER = "accessibility_display_daltonizer"; @@ -7480,7 +7481,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_ENABLED = "backup_enabled"; /** @@ -7489,7 +7490,7 @@ public final class Settings { * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_AUTO_RESTORE = "backup_auto_restore"; /** @@ -7497,14 +7498,14 @@ public final class Settings { * Type: int ( 0 = unprovisioned, 1 = fully provisioned ) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_PROVISIONED = "backup_provisioned"; /** * Component of the transport to use for backup/restore. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String BACKUP_TRANSPORT = "backup_transport"; /** @@ -7676,7 +7677,7 @@ public final class Settings { * Also prevents ANRs and crash dialogs from being suppressed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; @@ -7697,7 +7698,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service"; /** @@ -7706,7 +7707,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker"; @@ -7718,7 +7719,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi @SuppressLint("NoSettingsProvider") public static final String SELECTED_SPELL_CHECKER_SUBTYPE = @@ -8053,7 +8054,7 @@ public final class Settings { * The default NFC payment component * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component"; @@ -8067,14 +8068,14 @@ public final class Settings { * Specifies the package name currently configured to be the primary sms application * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String SMS_DEFAULT_APPLICATION = "sms_default_application"; /** * Specifies the package name currently configured to be the default dialer application * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String DIALER_DEFAULT_APPLICATION = "dialer_default_application"; /** @@ -8212,7 +8213,7 @@ public final class Settings { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String IMMERSIVE_MODE_CONFIRMATIONS = "immersive_mode_confirmations"; @@ -8622,7 +8623,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners"; @@ -8791,7 +8792,7 @@ public final class Settings { * The value is boolean (1 or 0). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String NOTIFICATION_BADGING = "notification_badging"; @@ -10096,7 +10097,7 @@ public final class Settings { * scorer app, external network scores will neither be requested nor accepted. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String NETWORK_SCORER_APP = "network_scorer_app"; /** @@ -10440,7 +10441,7 @@ public final class Settings { * by the system). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String WEBVIEW_PROVIDER = "webview_provider"; /** @@ -10832,7 +10833,7 @@ public final class Settings { * the setting needs to be set to 0 to disable it. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED = "wifi_watchdog_poor_network_test_enabled"; @@ -11010,7 +11011,7 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices"; @@ -11652,7 +11653,7 @@ public final class Settings { * @hide * @see com.android.server.power.batterysaver.BatterySaverPolicy */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants"; @@ -12294,7 +12295,7 @@ public final class Settings { * See RIL_PreferredNetworkType in ril.h * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String PREFERRED_NETWORK_MODE = "preferred_network_mode"; @@ -12901,7 +12902,7 @@ public final class Settings { @UnsupportedAppUsage public static final int ZEN_MODE_NO_INTERRUPTIONS = 2; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int ZEN_MODE_ALARMS = 3; /** @hide */ public static String zenModeToString(int mode) { @@ -12964,15 +12965,15 @@ public final class Settings { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String HEADS_UP_NOTIFICATIONS_ENABLED = "heads_up_notifications_enabled"; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HEADS_UP_OFF = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HEADS_UP_ON = 1; /** @@ -13446,7 +13447,7 @@ public final class Settings { public static final String[] LEGACY_RESTORE_SETTINGS = { }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final ContentProviderHolder sProviderHolder = new ContentProviderHolder(CONTENT_URI); @@ -13496,7 +13497,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getStringForUser(ContentResolver resolver, String name, int userHandle) { if (MOVED_TO_SECURE.contains(name)) { @@ -13646,7 +13647,7 @@ public final class Settings { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putStringForUser(ContentResolver resolver, String name, String value, int userHandle) { return putStringForUser(resolver, name, value, null, false, userHandle, @@ -15221,7 +15222,7 @@ public final class Settings { * callingPackage, a negative result will be returned. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isCallingPackageAllowedToWriteSettings(Context context, int uid, String callingPackage, boolean throwException) { return isCallingPackageAllowedToPerformAppOpsProtectedOperation(context, uid, diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 2c735fd9012f..649c8f353196 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -627,7 +627,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date, boolean read) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -687,7 +687,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -734,7 +734,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(int subId, ContentResolver resolver, String address, String body, String subject, Long date) { return addMessageToUri(subId, resolver, CONTENT_URI, address, body, @@ -781,7 +781,7 @@ public final class Telephony { * @return the URI for the new message * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Uri addMessage(ContentResolver resolver, String address, String body, String subject, Long date, boolean deliveryReport, long threadId) { diff --git a/core/java/android/security/KeystoreArguments.java b/core/java/android/security/KeystoreArguments.java index a59c4e04285d..19f78c8500d6 100644 --- a/core/java/android/security/KeystoreArguments.java +++ b/core/java/android/security/KeystoreArguments.java @@ -17,6 +17,7 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -28,7 +29,7 @@ import android.os.Parcelable; public class KeystoreArguments implements Parcelable { public byte[][] args; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeystoreArguments createFromParcel(Parcel in) { @@ -43,7 +44,7 @@ public class KeystoreArguments implements Parcelable { args = null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeystoreArguments(byte[][] args) { this.args = args; } diff --git a/core/java/android/security/keymaster/ExportResult.java b/core/java/android/security/keymaster/ExportResult.java index 037b85270306..2c382efab1be 100644 --- a/core/java/android/security/keymaster/ExportResult.java +++ b/core/java/android/security/keymaster/ExportResult.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +34,7 @@ public class ExportResult implements Parcelable { this.exportData = new byte[0]; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public ExportResult createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeyCharacteristics.java b/core/java/android/security/keymaster/KeyCharacteristics.java index d8382fa8f969..4f2bad1127e8 100644 --- a/core/java/android/security/keymaster/KeyCharacteristics.java +++ b/core/java/android/security/keymaster/KeyCharacteristics.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -45,7 +46,7 @@ public class KeyCharacteristics implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeyCharacteristics() {} protected KeyCharacteristics(Parcel in) { @@ -71,7 +72,7 @@ public class KeyCharacteristics implements Parcelable { hwEnforced.writeToParcel(out, flags); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readFromParcel(Parcel in) { swEnforced = KeymasterArguments.CREATOR.createFromParcel(in); hwEnforced = KeymasterArguments.CREATOR.createFromParcel(in); diff --git a/core/java/android/security/keymaster/KeymasterArguments.java b/core/java/android/security/keymaster/KeymasterArguments.java index e009e128bfea..7608f3a7b9ef 100644 --- a/core/java/android/security/keymaster/KeymasterArguments.java +++ b/core/java/android/security/keymaster/KeymasterArguments.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -41,7 +42,7 @@ public class KeymasterArguments implements Parcelable { private List mArguments; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -55,7 +56,7 @@ public class KeymasterArguments implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterArguments() { mArguments = new ArrayList(); } @@ -69,7 +70,7 @@ public class KeymasterArguments implements Parcelable { * * @throws IllegalArgumentException if {@code tag} is not an enum tag. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addEnum(int tag, int value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ENUM) && (tagType != KeymasterDefs.KM_ENUM_REP)) { @@ -141,7 +142,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 32-bit int tag or if * {@code value} is outside of the permitted range [0; 2^32). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addUnsignedInt(int tag, long value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_UINT) && (tagType != KeymasterDefs.KM_UINT_REP)) { @@ -178,7 +179,7 @@ public class KeymasterArguments implements Parcelable { * @throws IllegalArgumentException if {@code tag} is not an unsigned 64-bit long tag or if * {@code value} is outside of the permitted range [0; 2^64). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addUnsignedLong(int tag, BigInteger value) { int tagType = KeymasterDefs.getTagType(tag); if ((tagType != KeymasterDefs.KM_ULONG) && (tagType != KeymasterDefs.KM_ULONG_REP)) { @@ -364,7 +365,7 @@ public class KeymasterArguments implements Parcelable { out.writeTypedList(mArguments); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readFromParcel(Parcel in) { in.readTypedList(mArguments, KeymasterArgument.CREATOR); } diff --git a/core/java/android/security/keymaster/KeymasterBlob.java b/core/java/android/security/keymaster/KeymasterBlob.java index 68365bfe603f..18cdecb167db 100644 --- a/core/java/android/security/keymaster/KeymasterBlob.java +++ b/core/java/android/security/keymaster/KeymasterBlob.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -29,7 +30,7 @@ public class KeymasterBlob implements Parcelable { public KeymasterBlob(byte[] blob) { this.blob = blob; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public KeymasterBlob createFromParcel(Parcel in) { diff --git a/core/java/android/security/keymaster/KeymasterBlobArgument.java b/core/java/android/security/keymaster/KeymasterBlobArgument.java index 81b08c5b5b0a..b4106a6f2bc9 100644 --- a/core/java/android/security/keymaster/KeymasterBlobArgument.java +++ b/core/java/android/security/keymaster/KeymasterBlobArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterBlobArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final byte[] blob; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBlobArgument(int tag, byte[] blob) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -39,7 +40,7 @@ class KeymasterBlobArgument extends KeymasterArgument { this.blob = blob; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBlobArgument(int tag, Parcel in) { super(tag); blob = in.createByteArray(); diff --git a/core/java/android/security/keymaster/KeymasterBooleanArgument.java b/core/java/android/security/keymaster/KeymasterBooleanArgument.java index 25b2ac409d97..574511c70051 100644 --- a/core/java/android/security/keymaster/KeymasterBooleanArgument.java +++ b/core/java/android/security/keymaster/KeymasterBooleanArgument.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** @@ -37,7 +38,7 @@ class KeymasterBooleanArgument extends KeymasterArgument { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterBooleanArgument(int tag, Parcel in) { super(tag); } diff --git a/core/java/android/security/keymaster/KeymasterDateArgument.java b/core/java/android/security/keymaster/KeymasterDateArgument.java index 218f4880b289..f6b8fb589b25 100644 --- a/core/java/android/security/keymaster/KeymasterDateArgument.java +++ b/core/java/android/security/keymaster/KeymasterDateArgument.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import java.util.Date; @@ -38,7 +39,7 @@ class KeymasterDateArgument extends KeymasterArgument { this.date = date; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterDateArgument(int tag, Parcel in) { super(tag); date = new Date(in.readLong()); diff --git a/core/java/android/security/keymaster/KeymasterIntArgument.java b/core/java/android/security/keymaster/KeymasterIntArgument.java index 01d38c799d9c..6aed8c998d62 100644 --- a/core/java/android/security/keymaster/KeymasterIntArgument.java +++ b/core/java/android/security/keymaster/KeymasterIntArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterIntArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int value; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterIntArgument(int tag, int value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -41,7 +42,7 @@ class KeymasterIntArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterIntArgument(int tag, Parcel in) { super(tag); value = in.readInt(); diff --git a/core/java/android/security/keymaster/KeymasterLongArgument.java b/core/java/android/security/keymaster/KeymasterLongArgument.java index 3ac27ccef295..c0c6f0e518cb 100644 --- a/core/java/android/security/keymaster/KeymasterLongArgument.java +++ b/core/java/android/security/keymaster/KeymasterLongArgument.java @@ -17,16 +17,17 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; /** * @hide */ class KeymasterLongArgument extends KeymasterArgument { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long value; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterLongArgument(int tag, long value) { super(tag); switch (KeymasterDefs.getTagType(tag)) { @@ -39,7 +40,7 @@ class KeymasterLongArgument extends KeymasterArgument { this.value = value; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public KeymasterLongArgument(int tag, Parcel in) { super(tag); value = in.readLong(); diff --git a/core/java/android/security/keymaster/OperationResult.java b/core/java/android/security/keymaster/OperationResult.java index b4e155a527de..0ace764e435b 100644 --- a/core/java/android/security/keymaster/OperationResult.java +++ b/core/java/android/security/keymaster/OperationResult.java @@ -17,6 +17,7 @@ package android.security.keymaster; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -34,7 +35,7 @@ public class OperationResult implements Parcelable { public final byte[] output; public final KeymasterArguments outParams; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 859bb51607b9..a47c3b188b79 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -771,7 +771,7 @@ public class DreamService extends Service implements Window.Callback { * @see #setDozeScreenBrightness * @hide For use by system UI components only. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDozeScreenBrightness() { return mDozeScreenBrightness; } diff --git a/core/java/android/service/dreams/IDreamManager.aidl b/core/java/android/service/dreams/IDreamManager.aidl index 6496de3e15a0..0ce9cfa7a0bf 100644 --- a/core/java/android/service/dreams/IDreamManager.aidl +++ b/core/java/android/service/dreams/IDreamManager.aidl @@ -27,9 +27,9 @@ interface IDreamManager { void dream(); @UnsupportedAppUsage void awaken(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setDreamComponents(in ComponentName[] componentNames); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) ComponentName[] getDreamComponents(); ComponentName getDefaultDreamComponentForUser(int userId); void testDream(int userId, in ComponentName componentName); diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 25f140f29e00..89e27ba21443 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -311,7 +311,7 @@ public abstract class NotificationListenerService extends Service { private Handler mHandler; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected NotificationListenerWrapper mWrapper = null; private boolean isConnected = false; diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java index 579a8bfc9d99..8e4a68e52697 100644 --- a/core/java/android/service/notification/StatusBarNotification.java +++ b/core/java/android/service/notification/StatusBarNotification.java @@ -430,7 +430,7 @@ public class StatusBarNotification implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Context getPackageContext(Context context) { if (mContext == null) { try { diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 3c90a5c099cd..787a81bac3c0 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -35,6 +35,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.Uri; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -1743,9 +1744,9 @@ public class ZenModeConfig implements Parcelable { public static class ZenRule implements Parcelable { @UnsupportedAppUsage public boolean enabled; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean snoozing; // user manually disabled this instance - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String name; // required for automatic @UnsupportedAppUsage public int zenMode; // ie: Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS @@ -1755,7 +1756,7 @@ public class ZenModeConfig implements Parcelable { public ComponentName component; // optional public ComponentName configurationActivity; // optional public String id; // required for automatic (unique) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long creationTime; // required for automatic // package name, only used for manual rules when they have turned DND on. public String enabler; diff --git a/core/java/android/service/vr/IVrManager.aidl b/core/java/android/service/vr/IVrManager.aidl index a8293b47db30..f8ae08563a52 100644 --- a/core/java/android/service/vr/IVrManager.aidl +++ b/core/java/android/service/vr/IVrManager.aidl @@ -94,7 +94,7 @@ interface IVrManager { * @return {@link android.view.Display.INVALID_DISPLAY} if there is no virtual display * currently, else return the display id of the virtual display */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getVr2dDisplayId(); /** diff --git a/core/java/android/service/vr/VrListenerService.java b/core/java/android/service/vr/VrListenerService.java index 2758ace8d00b..d92e3b8b6b9b 100644 --- a/core/java/android/service/vr/VrListenerService.java +++ b/core/java/android/service/vr/VrListenerService.java @@ -24,6 +24,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -140,7 +141,7 @@ public abstract class VrListenerService extends Service { * @see android.R.attr#enableVrMode * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onCurrentVrActivityChanged( ComponentName component, boolean running2dInVr, int pid) { // Override to implement. Default to old behaviour of sending null for 2D. diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 4249e5c20d3b..9a76f19f3e41 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -127,7 +127,7 @@ public abstract class WallpaperService extends Service { private static final int MSG_VISIBILITY_CHANGED = 10010; private static final int MSG_WALLPAPER_OFFSETS = 10020; private static final int MSG_WALLPAPER_COMMAND = 10025; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MSG_WINDOW_RESIZED = 10030; private static final int MSG_WINDOW_MOVED = 10035; private static final int MSG_TOUCH_EVENT = 10040; diff --git a/core/java/android/speech/IRecognitionListener.aidl b/core/java/android/speech/IRecognitionListener.aidl index e77851b0e405..7c79b1ae15de 100644 --- a/core/java/android/speech/IRecognitionListener.aidl +++ b/core/java/android/speech/IRecognitionListener.aidl @@ -83,6 +83,6 @@ oneway interface IRecognitionListener { * @param eventType the type of the occurred event * @param params a Bundle containing the passed parameters */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onEvent(in int eventType, in Bundle params); } diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index 6a5d5c63cb4d..479a0c16c747 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -843,7 +843,7 @@ public class PhoneStateListener { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onDataConnectionRealTimeInfoChanged( DataConnectionRealTimeInfo dcRtInfo) { // default implementation empty @@ -1046,7 +1046,7 @@ public class PhoneStateListener { * @param rawData is the byte array of the OEM hook raw data. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onOemHookRawEvent(byte[] rawData) { // default implementation empty } diff --git a/core/java/android/telephony/Rlog.java b/core/java/android/telephony/Rlog.java index 2afdd339e80b..a1c74e69e7a2 100644 --- a/core/java/android/telephony/Rlog.java +++ b/core/java/android/telephony/Rlog.java @@ -53,7 +53,7 @@ public final class Rlog { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int d(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg + '\n' + Log.getStackTraceString(tr)); diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java index b9811638b28f..31da79995172 100644 --- a/core/java/android/text/AndroidBidi.java +++ b/core/java/android/text/AndroidBidi.java @@ -18,6 +18,7 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; import android.icu.text.Bidi; +import android.os.Build; import android.text.Layout.Directions; import com.android.internal.annotations.VisibleForTesting; @@ -32,7 +33,7 @@ public class AndroidBidi { /** * Runs the bidi algorithm on input text. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int bidi(int dir, char[] chs, byte[] chInfo) { if (chs == null || chInfo == null) { throw new NullPointerException(); diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index c60d446d921d..16b45c30b69f 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -987,7 +987,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getIndexFirstChangedBlock() { return mIndexFirstChangedBlock; } @@ -995,7 +995,7 @@ public class DynamicLayout extends Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIndexFirstChangedBlock(int i) { mIndexFirstChangedBlock = i; } diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index b5688a48344e..1878d61c78ac 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; import android.net.Uri; +import android.os.Build; import java.lang.annotation.Retention; @@ -44,7 +45,7 @@ public final class FontConfig { /** * Returns the ordered list of families included in the system fonts. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull Family[] getFamilies() { return mFamilies; } @@ -91,7 +92,7 @@ public final class FontConfig { /** * Returns the index to be used to access this font when accessing a TTC file. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getTtcIndex() { return mTtcIndex; } @@ -99,7 +100,7 @@ public final class FontConfig { /** * Returns the list of axes associated to this font. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @NonNull FontVariationAxis[] getAxes() { return mAxes; } @@ -107,7 +108,7 @@ public final class FontConfig { /** * Returns the weight value for this font. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getWeight() { return mWeight; } @@ -115,7 +116,7 @@ public final class FontConfig { /** * Returns whether this font is italic. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isItalic() { return mIsItalic; } @@ -231,7 +232,7 @@ public final class FontConfig { /** * Returns the name given by the system to this font family. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable String getName() { return mName; } @@ -239,7 +240,7 @@ public final class FontConfig { /** * Returns the list of fonts included in this family. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable Font[] getFonts() { return mFonts; } @@ -254,7 +255,7 @@ public final class FontConfig { /** * Returns the font variant for this family, e.g. "elegant" or "compact". May be null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Variant int getVariant() { return mVariant; } diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index ab19fa9a1256..b80b01f5a64a 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; import android.text.style.BackgroundColorSpan; @@ -631,7 +632,7 @@ public class Html { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void withinStyle(StringBuilder out, CharSequence text, int start, int end) { for (int i = start; i < end; i++) { diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 8a4497a0f0ce..f0f0867d414b 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -24,6 +24,7 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.Rect; import android.graphics.text.LineBreaker; +import android.os.Build; import android.text.method.TextKeyListener; import android.text.style.AlignmentSpan; import android.text.style.LeadingMarginSpan; @@ -414,7 +415,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void drawText(Canvas canvas, int firstLine, int lastLine) { int previousLineBottom = getLineTop(firstLine); int previousLineEnd = getLineStart(firstLine); @@ -583,7 +584,7 @@ public abstract class Layout { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void drawBackground(Canvas canvas, Path highlight, Paint highlightPaint, int cursorOffsetVertical, int firstLine, int lastLine) { // First, draw LineBackgroundSpans. @@ -664,7 +665,7 @@ public abstract class Layout { * @return The range of lines that need to be drawn, possibly empty. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getLineRangeForDraw(Canvas canvas) { int dtop, dbottom; @@ -1154,7 +1155,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getPrimaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, trailing, clamped); @@ -1174,7 +1175,7 @@ public abstract class Layout { * optionally clamp it so that it doesn't exceed the width of the layout. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float getSecondaryHorizontal(int offset, boolean clamped) { boolean trailing = primaryIsTrailingPrevious(offset); return getHorizontal(offset, !trailing, clamped); @@ -1849,7 +1850,7 @@ public abstract class Layout { * only robust for left-aligned displays. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean shouldClampCursor(int line) { // Only clamp cursor position in left-aligned displays. switch (getParagraphAlignment(line)) { diff --git a/core/java/android/text/SpanSet.java b/core/java/android/text/SpanSet.java index 81bdd65974a8..d464278c714c 100644 --- a/core/java/android/text/SpanSet.java +++ b/core/java/android/text/SpanSet.java @@ -17,6 +17,7 @@ package android.text; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.reflect.Array; import java.util.Arrays; @@ -34,7 +35,7 @@ public class SpanSet { private final Class classType; int numberOfSpans; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) E[] spans; int[] spanStarts; int[] spanEnds; diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index c5f7f581dcd1..0e61eff86c2b 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.BaseCanvas; import android.graphics.Paint; +import android.os.Build; import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -863,7 +864,7 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public T[] getSpans(int queryStart, int queryEnd, @Nullable Class kind, boolean sortByInsertionOrder) { if (kind == null) return (T[]) ArrayUtils.emptyArray(Object.class); diff --git a/core/java/android/text/SpannableStringInternal.java b/core/java/android/text/SpannableStringInternal.java index 0fe9b6afeaea..f2ab1bb31fbc 100644 --- a/core/java/android/text/SpannableStringInternal.java +++ b/core/java/android/text/SpannableStringInternal.java @@ -18,6 +18,7 @@ package android.text; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; @@ -153,7 +154,7 @@ import java.lang.reflect.Array; * * @return True if excluded, false if included. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final boolean isOutOfCopyRange(int start, int end, int spanStart, int spanEnd) { if (spanStart > end || spanEnd < start) return true; if (spanStart != spanEnd && start != end) { @@ -185,12 +186,12 @@ import java.lang.reflect.Array; setSpan(what, start, end, flags, true/*enforceParagraph*/); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean isIndexFollowsNextLine(int index) { return index != 0 && index != length() && charAt(index - 1) != '\n'; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setSpan(Object what, int start, int end, int flags, boolean enforceParagraph) { int nstart = start; int nend = end; @@ -555,12 +556,12 @@ import java.lang.reflect.Array; * * Due to backward compatibility reasons, we copy even NoCopySpan by default */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void copySpans(Spanned src, int start, int end) { copySpansFromSpanned(src, start, end, false); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void copySpans(SpannableStringInternal src, int start, int end) { copySpansFromInternal(src, start, end, false); } @@ -576,15 +577,15 @@ import java.lang.reflect.Array; @UnsupportedAppUsage private int mSpanCount; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ static final Object[] EMPTY = new Object[0]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int START = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int END = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int FLAGS = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int COLUMNS = 3; } diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 85e2d98e93c0..85911fffc1bf 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -1433,15 +1433,15 @@ public class StaticLayout extends Layout { // Unused, here because of gray list private API accesses. /*package*/ static class LineBreaks { private static final int INITIAL_SIZE = 16; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] breaks = new int[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] widths = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] ascents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float[] descents = new float[INITIAL_SIZE]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] flags = new int[INITIAL_SIZE]; // hasTab // breaks, widths, and flags should all have the same length } diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 6318c4757bce..1f11d10052fe 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -57,7 +57,7 @@ public class TextLine { private static final char TAB_CHAR = '\t'; private TextPaint mPaint; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CharSequence mText; private int mStart; private int mLen; @@ -83,13 +83,13 @@ public class TextLine { private final TextPaint mWorkPaint = new TextPaint(); private final TextPaint mActivePaint = new TextPaint(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mMetricAffectingSpanSpanSet = new SpanSet(MetricAffectingSpan.class); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mCharacterStyleSpanSet = new SpanSet(CharacterStyle.class); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpanSet mReplacementSpanSpanSet = new SpanSet(ReplacementSpan.class); diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java index c2e3a80a5c51..8e6c26ae9f93 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -460,7 +460,7 @@ public class DateFormat { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean hasDesignator(CharSequence inFormat, char designator) { if (inFormat == null) return false; diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index ff08269a93a4..511c9746c84c 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -25,6 +25,7 @@ import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; import android.icu.util.MeasureUnit; +import android.os.Build; import com.android.internal.R; @@ -395,7 +396,7 @@ public class DateUtils * the briefest form available (e.g. "2h"). * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CharSequence formatDuration(long millis, int abbrev) { final FormatWidth width; switch (abbrev) { diff --git a/core/java/android/text/method/WordIterator.java b/core/java/android/text/method/WordIterator.java index d766186c13b0..f427e1bd2b72 100644 --- a/core/java/android/text/method/WordIterator.java +++ b/core/java/android/text/method/WordIterator.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.icu.lang.UCharacter; import android.icu.lang.UProperty; import android.icu.text.BreakIterator; +import android.os.Build; import android.text.CharSequenceCharacterIterator; import android.text.Selection; @@ -71,7 +72,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int preceding(int offset) { checkOffsetIsValid(offset); while (true) { @@ -83,7 +84,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int following(int offset) { checkOffsetIsValid(offset); while (true) { @@ -95,7 +96,7 @@ public class WordIterator implements Selection.PositionIterator { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.isBoundary(offset); @@ -108,7 +109,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int nextBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.following(offset); @@ -121,7 +122,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the given start position to search from. * @return the position of the last boundary preceding the given offset. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int prevBoundary(int offset) { checkOffsetIsValid(offset); return mIterator.preceding(offset); @@ -180,7 +181,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPrevWordBeginningOnTwoWordsBoundary(int offset) { return getBeginning(offset, true); } @@ -199,7 +200,7 @@ public class WordIterator implements Selection.PositionIterator { * * @throws IllegalArgumentException is offset is not valid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNextWordEndOnTwoWordBoundary(int offset) { return getEnd(offset, true); } @@ -280,7 +281,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPunctuationBeginning(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationStartBoundary(offset)) { @@ -297,7 +298,7 @@ public class WordIterator implements Selection.PositionIterator { * * @param offset the offset to search from. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPunctuationEnd(int offset) { checkOffsetIsValid(offset); while (offset != BreakIterator.DONE && !isPunctuationEndBoundary(offset)) { @@ -314,7 +315,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is after a punctuation character. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isAfterPunctuation(int offset) { if (mStart < offset && offset <= mEnd) { final int codePoint = Character.codePointBefore(mCharSeq, offset); @@ -330,7 +331,7 @@ public class WordIterator implements Selection.PositionIterator { * @param offset the offset to check from. * @return Whether the offset is at a punctuation character. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOnPunctuation(int offset) { if (mStart <= offset && offset < mEnd) { final int codePoint = Character.codePointAt(mCharSeq, offset); diff --git a/core/java/android/text/style/EasyEditSpan.java b/core/java/android/text/style/EasyEditSpan.java index b23c2b7da6ac..ccccdcf88b69 100644 --- a/core/java/android/text/style/EasyEditSpan.java +++ b/core/java/android/text/style/EasyEditSpan.java @@ -19,6 +19,7 @@ package android.text.style; import android.annotation.NonNull; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.text.ParcelableSpan; import android.text.TextUtils; @@ -116,7 +117,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDeleteEnabled() { return mDeleteEnabled; } @@ -126,7 +127,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDeleteEnabled(boolean value) { mDeleteEnabled = value; } @@ -136,7 +137,7 @@ public class EasyEditSpan implements ParcelableSpan { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PendingIntent getPendingIntent() { return mPendingIntent; } diff --git a/core/java/android/text/style/SuggestionSpan.java b/core/java/android/text/style/SuggestionSpan.java index 9378636c24ca..1f15d462b9b1 100644 --- a/core/java/android/text/style/SuggestionSpan.java +++ b/core/java/android/text/style/SuggestionSpan.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -131,9 +132,9 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { private final String mLanguageTag; private final int mHashCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mEasyCorrectUnderlineThickness; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mEasyCorrectUnderlineColor; private float mMisspelledUnderlineThickness; @@ -434,7 +435,7 @@ public class SuggestionSpan extends CharacterStyle implements ParcelableSpan { * @deprecated this is deprecated in {@link android.os.Build.VERSION_CODES#Q}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public void notifySelection(Context context, String original, int index) { Log.w(TAG, "notifySelection() is deprecated. Does nothing."); diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index a7ddfa93a74e..6e25160de8ac 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.app.ActivityThread; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.Spannable; @@ -660,7 +661,7 @@ public class Linkify { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void gatherTelLinks(ArrayList links, Spannable s, @Nullable Context context) { PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index e5115846013f..a2046307302b 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; import android.graphics.Rect; +import android.os.Build; import android.util.ArrayMap; import android.util.AttributeSet; import android.util.Log; @@ -848,7 +849,7 @@ public abstract class Transition implements Cloneable { return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static ArrayMap getRunningAnimators() { ArrayMap runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { @@ -1913,7 +1914,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void end() { --mNumInstances; if (mNumInstances == 0) { @@ -1971,7 +1972,7 @@ public abstract class Transition implements Cloneable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void cancel() { int numAnimators = mCurrentAnimators.size(); for (int i = numAnimators - 1; i >= 0; i--) { diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 1b0612e87202..3d5b811f7d9c 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -19,6 +19,7 @@ package android.transition; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.ArrayMap; import android.util.Log; import android.view.View; @@ -215,7 +216,7 @@ public class TransitionManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static ArrayMap> getRunningTransitions() { WeakReference>> runningTransitions = sRunningTransitions.get(); diff --git a/core/java/android/util/EventLog.java b/core/java/android/util/EventLog.java index a7d20b56eca3..4654dbfa9531 100644 --- a/core/java/android/util/EventLog.java +++ b/core/java/android/util/EventLog.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.BufferedReader; import java.io.FileReader; @@ -85,7 +86,7 @@ public class EventLog { private static final byte FLOAT_TYPE = 4; /** @param data containing event, read from the system */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /*package*/ Event(byte[] data) { mBuffer = ByteBuffer.wrap(data); mBuffer.order(ByteOrder.nativeOrder()); diff --git a/core/java/android/util/IconDrawableFactory.java b/core/java/android/util/IconDrawableFactory.java index 5eeb12273661..b5e8dd7ed0af 100644 --- a/core/java/android/util/IconDrawableFactory.java +++ b/core/java/android/util/IconDrawableFactory.java @@ -23,6 +23,7 @@ import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.UserHandle; import android.os.UserManager; @@ -51,7 +52,7 @@ public class IconDrawableFactory { return appInfo.isInstantApp() || mUm.hasBadge(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Drawable getBadgedIcon(ApplicationInfo appInfo) { return getBadgedIcon(appInfo, UserHandle.getUserId(appInfo.uid)); } diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java index bf9a8384fe2c..8c4dcb3b28e2 100644 --- a/core/java/android/util/LocalLog.java +++ b/core/java/android/util/LocalLog.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.SystemClock; import java.io.FileDescriptor; @@ -112,7 +113,7 @@ public final class LocalLog { ReadOnlyLocalLog(LocalLog log) { mLog = log; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { mLog.dump(pw); } @@ -127,7 +128,7 @@ public final class LocalLog { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ReadOnlyLocalLog readOnlyLocalLog() { return new ReadOnlyLocalLog(this); } diff --git a/core/java/android/util/LogWriter.java b/core/java/android/util/LogWriter.java index a674ae166d63..21b366531eac 100644 --- a/core/java/android/util/LogWriter.java +++ b/core/java/android/util/LogWriter.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.Writer; @@ -39,7 +40,7 @@ public class LogWriter extends Writer { * {@link android.util.Log#ERROR Log.ERROR}. * @param tag A string tag to associate with each printed log statement. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LogWriter(int priority, String tag) { mPriority = priority; mTag = tag; diff --git a/core/java/android/util/LongArray.java b/core/java/android/util/LongArray.java index 93bcd6b8d4a1..53dddeb5ad0b 100644 --- a/core/java/android/util/LongArray.java +++ b/core/java/android/util/LongArray.java @@ -18,6 +18,7 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.ArrayUtils; import com.android.internal.util.Preconditions; @@ -45,7 +46,7 @@ public class LongArray implements Cloneable { /** * Creates an empty LongArray with the default initial capacity. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public LongArray() { this(10); } @@ -104,7 +105,7 @@ public class LongArray implements Cloneable { * * @throws IndexOutOfBoundsException when index < 0 || index > size() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void add(int index, long value) { ensureCapacity(1); int rightSegment = mSize - index; @@ -208,7 +209,7 @@ public class LongArray implements Cloneable { /** * Returns the number of values in this array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int size() { return mSize; } diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java index 0892c94d5bec..4ac3178ecb4c 100644 --- a/core/java/android/util/NtpTrustedTime.java +++ b/core/java/android/util/NtpTrustedTime.java @@ -26,6 +26,7 @@ import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkInfo; import android.net.SntpClient; +import android.os.Build; import android.os.SystemClock; import android.provider.Settings; import android.text.TextUtils; @@ -138,7 +139,7 @@ public class NtpTrustedTime implements TrustedTime { return sSingleton; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean forceRefresh() { synchronized (this) { NtpConnectionInfo connectionInfo = getNtpConnectionInfo(); @@ -181,7 +182,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasCache() { return mTimeResult != null; } @@ -208,7 +209,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long currentTimeMillis() { TimeResult timeResult = mTimeResult; if (timeResult == null) { @@ -227,7 +228,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedNtpTime() { if (LOGD) Log.d(TAG, "getCachedNtpTime() cache hit"); TimeResult timeResult = mTimeResult; @@ -240,7 +241,7 @@ public class NtpTrustedTime implements TrustedTime { * @deprecated Use {@link #getCachedTimeResult()} to obtain a {@link TimeResult} atomically. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedNtpTimeReference() { TimeResult timeResult = mTimeResult; return timeResult == null ? 0 : timeResult.getElapsedRealtimeMillis(); diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index 1e5ec0b1c5c3..9be17cf75ba7 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -16,6 +16,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Path; +import android.os.Build; import dalvik.annotation.optimization.FastNative; @@ -29,7 +30,7 @@ public class PathParser { * @param pathString The string representing a path, the same as "d" string in svg file. * @return the generated Path object. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Path createPathFromPathData(String pathString) { if (pathString == null) { throw new IllegalArgumentException("Path string can not be null."); diff --git a/core/java/android/util/Rational.java b/core/java/android/util/Rational.java index aade6204aff8..d7730f2b0b3f 100644 --- a/core/java/android/util/Rational.java +++ b/core/java/android/util/Rational.java @@ -19,6 +19,7 @@ import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.IOException; import java.io.InvalidObjectException; @@ -77,9 +78,9 @@ public final class Rational extends Number implements Comparable { * Do not change the order of these fields or add new instance fields to maintain the * Serializable compatibility across API revisions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mNumerator; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mDenominator; /** diff --git a/core/java/android/util/RecurrenceRule.java b/core/java/android/util/RecurrenceRule.java index 0f2d8bc9e375..39d1f2cbef19 100644 --- a/core/java/android/util/RecurrenceRule.java +++ b/core/java/android/util/RecurrenceRule.java @@ -18,6 +18,7 @@ package android.util; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -51,7 +52,7 @@ public class RecurrenceRule implements Parcelable { @VisibleForTesting public static Clock sClock = Clock.systemDefaultZone(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ZonedDateTime start; public final ZonedDateTime end; public final Period period; @@ -68,7 +69,7 @@ public class RecurrenceRule implements Parcelable { } @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static RecurrenceRule buildRecurringMonthly(int dayOfMonth, ZoneId zone) { // Assume we started last January, since it has all possible days final ZonedDateTime now = ZonedDateTime.now(sClock).withZoneSameInstant(zone); diff --git a/core/java/android/util/Slog.java b/core/java/android/util/Slog.java index 2c8bbbfcf8de..3880131324fc 100644 --- a/core/java/android/util/Slog.java +++ b/core/java/android/util/Slog.java @@ -89,7 +89,7 @@ public final class Slog { * will always be handled asynchronously. Primarily for use by coding running within * the system process. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int wtf(String tag, String msg) { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, null, false, true); } @@ -130,7 +130,7 @@ public final class Slog { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, tr, false, true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int println(int priority, String tag, String msg) { return Log.println_native(Log.LOG_ID_SYSTEM, priority, tag, msg); } diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index e0b8d52aa132..cd6585cd3fa1 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -363,7 +363,7 @@ public class TimeUtils { * @return String representation of the time. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String logTimeOfDay(long millis) { Calendar c = Calendar.getInstance(); if (millis >= 0) { diff --git a/core/java/android/util/TrustedTime.java b/core/java/android/util/TrustedTime.java index f41fe85fa8bb..f279bdb79420 100644 --- a/core/java/android/util/TrustedTime.java +++ b/core/java/android/util/TrustedTime.java @@ -17,6 +17,7 @@ package android.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Interface that provides trusted time information, possibly coming from an NTP @@ -52,7 +53,7 @@ public interface TrustedTime { * @deprecated Only kept for UnsupportedAppUsage. Do not use. See {@link NtpTrustedTime} */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCacheAge(); /** diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java index bee04f4d8036..c41b3cf9fb72 100644 --- a/core/java/android/view/AccessibilityIterators.java +++ b/core/java/android/view/AccessibilityIterators.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Configuration; +import android.os.Build; import java.text.BreakIterator; import java.util.Locale; @@ -46,11 +47,11 @@ public final class AccessibilityIterators { */ public static abstract class AbstractTextSegmentIterator implements TextSegmentIterator { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AbstractTextSegmentIterator() { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mText; private final int[] mSegment = new int[2]; diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index b5080cdb37aa..3da3184afae1 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -854,7 +854,7 @@ public final class Choreographer { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void scheduleVsyncLocked() { mDisplayEventReceiver.scheduleVsync(); } @@ -994,7 +994,7 @@ public final class Choreographer { public Object action; // Runnable or FrameCallback public Object token; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void run(long frameTimeNanos) { if (token == FRAME_CALLBACK_TOKEN) { ((FrameCallback)action).doFrame(frameTimeNanos); diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index ab76e4aea993..237ed729e0b8 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -298,7 +298,7 @@ public final class Display { * Display type: Physical display connected through an external port. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TestApi public static final int TYPE_EXTERNAL = 2; @@ -1409,7 +1409,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Mode(int modeId, int width, int height, float refreshRate) { mModeId = modeId; mWidth = width; @@ -1592,7 +1592,7 @@ public final class Display { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public HdrCapabilities(int[] supportedHdrTypes, float maxLuminance, float maxAverageLuminance, float minLuminance) { mSupportedHdrTypes = supportedHdrTypes; diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index 467d93ef3aaf..e8a4ed44b7c8 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.FrameInfo; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -228,7 +229,7 @@ public abstract class DisplayEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchHotplug(long timestampNanos, long physicalDisplayId, boolean connected) { onHotplug(timestampNanos, physicalDisplayId, connected); } diff --git a/core/java/android/view/DragEvent.java b/core/java/android/view/DragEvent.java index 9d8f7c3c083d..b6b029bdbb44 100644 --- a/core/java/android/view/DragEvent.java +++ b/core/java/android/view/DragEvent.java @@ -19,6 +19,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.content.ClipData; import android.content.ClipDescription; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -130,9 +131,9 @@ public class DragEvent implements Parcelable { int mAction; float mX, mY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ClipDescription mClipDescription; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ClipData mClipData; IDragAndDropPermissions mDragAndDropPermissions; @@ -337,7 +338,7 @@ public class DragEvent implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static DragEvent obtain(DragEvent source) { return obtain(source.mAction, source.mX, source.mY, source.mOffsetX, source.mOffsetY, source.mLocalState, source.mClipDescription, source.mClipData, source.mDragSurface, diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index 387787e3b0be..388096e09631 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -18,6 +18,7 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -258,7 +259,7 @@ public final class FrameMetrics { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final long[] mTimingData; /** diff --git a/core/java/android/view/IRecentsAnimationRunner.aidl b/core/java/android/view/IRecentsAnimationRunner.aidl index 925786f82e00..f054b869a9b9 100644 --- a/core/java/android/view/IRecentsAnimationRunner.aidl +++ b/core/java/android/view/IRecentsAnimationRunner.aidl @@ -42,7 +42,7 @@ oneway interface IRecentsAnimationRunner { * * @see {@link RecentsAnimationController#cleanupScreenshot} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationCanceled(in @nullable ActivityManager.TaskSnapshot taskSnapshot) = 1; /** @@ -52,7 +52,7 @@ oneway interface IRecentsAnimationRunner { * @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be * {@code null} if the device is not currently in split screen */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationStart(in IRecentsAnimationController controller, in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in Rect homeContentInsets, in Rect minimizedHomeBounds) = 2; diff --git a/core/java/android/view/IRemoteAnimationRunner.aidl b/core/java/android/view/IRemoteAnimationRunner.aidl index 7b35aa2d2b45..423e23d2bc08 100644 --- a/core/java/android/view/IRemoteAnimationRunner.aidl +++ b/core/java/android/view/IRemoteAnimationRunner.aidl @@ -33,7 +33,7 @@ oneway interface IRemoteAnimationRunner { * @param apps The list of apps to animate. * @param finishedCallback The callback to invoke when the animation is finished. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationStart(in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers, in IRemoteAnimationFinishedCallback finishedCallback); @@ -41,6 +41,6 @@ oneway interface IRemoteAnimationRunner { * Called when the animation was cancelled. From this point on, any updates onto the leashes * won't have any effect anymore. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onAnimationCancelled(); } diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index d226f6048471..11423e6de93e 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -184,7 +184,7 @@ interface IWindowManager * Used by system ui to report that recents has shown itself. * @deprecated to be removed once prebuilts are updated */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void endProlongedAnimations(); void startFreezingScreen(int exitAnim, int enterAnim); @@ -198,7 +198,7 @@ interface IWindowManager void exitKeyguardSecurely(IOnKeyguardExitResult callback); @UnsupportedAppUsage boolean isKeyguardLocked(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isKeyguardSecure(int userId); void dismissKeyguard(IKeyguardDismissCallback callback, CharSequence message); @@ -210,11 +210,11 @@ interface IWindowManager // These can only be called with the SET_ANIMATON_SCALE permission. @UnsupportedAppUsage float getAnimationScale(int which); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) float[] getAnimationScales(); @UnsupportedAppUsage void setAnimationScale(int which, float scale); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setAnimationScales(in float[] scales); float getCurrentAnimatorScale(); @@ -235,7 +235,7 @@ interface IWindowManager // should be enabled. The 'enabled' value is null or blank for // the system default (differs per build variant) or any valid // boolean string as parsed by SystemProperties.getBoolean(). - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStrictModeVisualIndicatorPreference(String enabled); /** @@ -411,7 +411,7 @@ interface IWindowManager /** * Lock the device immediately with the specified options (can be null). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void lockNow(in Bundle options); /** diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 9febc9f09ef3..0089a852a893 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -178,7 +178,7 @@ interface IWindowSession { * @param data Data transferred by drag and drop * @return Token of drag operation which will be passed to cancelDragAndDrop. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IBinder performDrag(IWindow window, int flags, in SurfaceControl surface, int touchSource, float touchX, float touchY, float thumbCenterX, float thumbCenterY, in ClipData data); diff --git a/core/java/android/view/InputChannel.java b/core/java/android/view/InputChannel.java index f2d3f5ad08bf..f76b1f89625b 100644 --- a/core/java/android/view/InputChannel.java +++ b/core/java/android/view/InputChannel.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -54,7 +55,7 @@ public final class InputChannel implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mPtr; // used by native code private static native long[] nativeOpenInputChannelPair(String name); diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 58e5b2dfaa37..22ac4dcd2cfe 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -424,7 +424,7 @@ public final class InputDevice implements Parcelable { }; // Called by native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private InputDevice(int id, int generation, int controllerNumber, String name, int vendorId, int productId, String descriptor, boolean isExternal, int sources, int keyboardType, KeyCharacterMap keyCharacterMap, boolean hasVibrator, boolean hasMicrophone, @@ -757,7 +757,7 @@ public final class InputDevice implements Parcelable { } // Called from native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void addMotionRange(int axis, int source, float min, float max, float flat, float fuzz, float resolution) { mMotionRanges.add(new MotionRange(axis, source, min, max, flat, fuzz, resolution)); diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java index a06a0c68e241..038dff654ba6 100644 --- a/core/java/android/view/InputEventReceiver.java +++ b/core/java/android/view/InputEventReceiver.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.IBinder; import android.os.Looper; import android.os.MessageQueue; @@ -124,7 +125,7 @@ public abstract class InputEventReceiver { * * @param event The input event that was received. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInputEvent(InputEvent event) { finishInputEvent(event, false); } @@ -216,7 +217,7 @@ public abstract class InputEventReceiver { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchInputEvent(int seq, InputEvent event) { mSeqMap.put(event.getSequenceNumber(), seq); onInputEvent(event); diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java index 86a309e3ed79..40eb438262a1 100644 --- a/core/java/android/view/InputEventSender.java +++ b/core/java/android/view/InputEventSender.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.Log; @@ -138,7 +139,7 @@ public abstract class InputEventSender { // Called from native code. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchInputEventFinished(int seq, boolean handled) { onInputEventFinished(seq, handled); } diff --git a/core/java/android/view/InputFilter.java b/core/java/android/view/InputFilter.java index 36d558630da9..b18c5cdb2aab 100644 --- a/core/java/android/view/InputFilter.java +++ b/core/java/android/view/InputFilter.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -118,7 +119,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * * @param looper The looper to run callbacks on. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InputFilter(Looper looper) { mH = new H(looper); } @@ -188,7 +189,7 @@ public abstract class InputFilter extends IInputFilter.Stub { * @param event The input event that was received. * @param policyFlags The input event policy flags. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInputEvent(InputEvent event, int policyFlags) { sendInputEvent(event, policyFlags); } diff --git a/core/java/android/view/InputQueue.java b/core/java/android/view/InputQueue.java index 74ce6ac02db3..7accb66aa3aa 100644 --- a/core/java/android/view/InputQueue.java +++ b/core/java/android/view/InputQueue.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Looper; import android.os.MessageQueue; import android.util.LongSparseArray; @@ -101,7 +102,7 @@ public final class InputQueue { mActiveEventArray.put(id, event); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void finishInputEvent(long id, boolean handled) { int index = mActiveEventArray.indexOfKey(id); if (index >= 0) { diff --git a/core/java/android/view/KeyCharacterMap.java b/core/java/android/view/KeyCharacterMap.java index 90e0f3f89a0f..02a97888cffd 100644 --- a/core/java/android/view/KeyCharacterMap.java +++ b/core/java/android/view/KeyCharacterMap.java @@ -18,6 +18,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.input.InputManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.method.MetaKeyKeyListener; @@ -308,7 +309,7 @@ public class KeyCharacterMap implements Parcelable { } // Called from native - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private KeyCharacterMap(long ptr) { mPtr = ptr; } @@ -750,9 +751,9 @@ public class KeyCharacterMap implements Parcelable { private FallbackAction next; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int keyCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int metaState; private FallbackAction() { diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 0ab1751fbf95..c87e51e35891 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -849,7 +849,7 @@ public class KeyEvent extends InputEvent implements Parcelable { // Symbolic names of all metakeys in bit order from least significant to most significant. // Accordingly there are exactly 32 values in this table. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final String[] META_SYMBOLIC_NAMES = new String[] { "META_SHIFT_ON", "META_ALT_ON", @@ -920,7 +920,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_CAP_LOCKED = 0x100; /** @@ -928,7 +928,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_ALT_LOCKED = 0x200; /** @@ -936,7 +936,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * Reserved for use by {@link MetaKeyKeyListener} for a published constant in its API. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_SYM_LOCKED = 0x400; /** @@ -945,7 +945,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * in its API that is currently being retained for legacy reasons. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int META_SELECTING = 0x800; /** @@ -1266,29 +1266,29 @@ public class KeyEvent extends InputEvent implements Parcelable { private KeyEvent mNext; private int mId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDeviceId; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSource; private int mDisplayId; private @Nullable byte[] mHmac; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMetaState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAction; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mKeyCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mScanCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mRepeatCount; @UnsupportedAppUsage private int mFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mDownTime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mEventTime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mCharacters; public interface Callback { @@ -1651,7 +1651,7 @@ public class KeyEvent extends InputEvent implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static KeyEvent obtain(long downTime, long eventTime, int action, int code, int repeat, int metaState, int deviceId, int scancode, int flags, int source, String characters) { @@ -2103,7 +2103,7 @@ public class KeyEvent extends InputEvent implements Parcelable { } // Mask of all modifier key meta states. Specifically excludes locked keys like caps lock. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_MODIFIER_MASK = META_SHIFT_ON | META_SHIFT_LEFT_ON | META_SHIFT_RIGHT_ON | META_ALT_ON | META_ALT_LEFT_ON | META_ALT_RIGHT_ON @@ -2112,23 +2112,23 @@ public class KeyEvent extends InputEvent implements Parcelable { | META_SYM_ON | META_FUNCTION_ON; // Mask of all lock key meta states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_LOCK_MASK = META_CAPS_LOCK_ON | META_NUM_LOCK_ON | META_SCROLL_LOCK_ON; // Mask of all valid meta states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_ALL_MASK = META_MODIFIER_MASK | META_LOCK_MASK; // Mask of all synthetic meta states that are reserved for API compatibility with // historical uses in MetaKeyKeyListener. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_SYNTHETIC_MASK = META_CAP_LOCKED | META_ALT_LOCKED | META_SYM_LOCKED | META_SELECTING; // Mask of all meta states that are not valid use in specifying a modifier key. // These bits are known to be used for purposes other than specifying modifiers. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int META_INVALID_MODIFIER_MASK = META_LOCK_MASK | META_SYNTHETIC_MASK; diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index b925b492c04b..66c514824e35 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -956,7 +956,7 @@ public abstract class LayoutInflater { * argument and should be used for everything except {@code >include>} * tag parsing. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private View createViewFromTag(View parent, String name, Context context, AttributeSet attrs) { return createViewFromTag(parent, name, context, attrs, false); } @@ -976,7 +976,7 @@ public abstract class LayoutInflater { * attribute (if set) for the view being inflated, * {@code false} otherwise */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) View createViewFromTag(View parent, String name, Context context, AttributeSet attrs, boolean ignoreThemeAttr) { if (name.equals("view")) { diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index abb82bc9e16b..a8d261553a8f 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1484,7 +1484,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { } // Private value for history pos that obtains the current sample. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int HISTORY_CURRENT = -0x80000000; // This is essentially the same as native AMOTION_EVENT_INVALID_CURSOR_POSITION as they're all diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 726176568605..2bd3d46d389a 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -25,6 +25,7 @@ import android.graphics.Canvas; import android.graphics.Outline; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.widget.RemoteViews; @@ -68,7 +69,7 @@ public class NotificationHeaderView extends ViewGroup { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NotificationHeaderView(Context context, @Nullable AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java index f60d98b2dc23..38ae03db3290 100644 --- a/core/java/android/view/PointerIcon.java +++ b/core/java/android/view/PointerIcon.java @@ -153,17 +153,17 @@ public final class PointerIcon implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mType; private int mSystemIconResourceId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Bitmap mBitmap; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mHotSpotX; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mHotSpotY; // The bitmaps for the additional frame of animated pointer icon. Note that the first frame // will be stored in mBitmap. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Bitmap mBitmapFrames[]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDurationPerFrame; /** diff --git a/core/java/android/view/RemoteAnimationAdapter.java b/core/java/android/view/RemoteAnimationAdapter.java index 166d3baa2fdf..a78036fba094 100644 --- a/core/java/android/view/RemoteAnimationAdapter.java +++ b/core/java/android/view/RemoteAnimationAdapter.java @@ -18,6 +18,7 @@ package android.view; import android.app.ActivityOptions; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -65,7 +66,7 @@ public class RemoteAnimationAdapter implements Parcelable { * @param statusBarTransitionDelay The desired delay for all visual animations in the * status bar caused by this app animation in millis. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RemoteAnimationAdapter(IRemoteAnimationRunner runner, long duration, long statusBarTransitionDelay, boolean changeNeedsSnapshot) { mRunner = runner; diff --git a/core/java/android/view/RemoteAnimationTarget.java b/core/java/android/view/RemoteAnimationTarget.java index e3129b639900..ac5d14e97c85 100644 --- a/core/java/android/view/RemoteAnimationTarget.java +++ b/core/java/android/view/RemoteAnimationTarget.java @@ -38,6 +38,7 @@ import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.proto.ProtoOutputStream; @@ -98,7 +99,7 @@ public class RemoteAnimationTarget implements Parcelable { * The {@link SurfaceControl} for the starting state of a target if this transition is * MODE_CHANGING, {@code null)} otherwise. This is relative to the app window. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final SurfaceControl startLeash; /** @@ -171,7 +172,7 @@ public class RemoteAnimationTarget implements Parcelable { * should be equivalent to the size of the starting thumbnail. Note that sourceContainerBounds * is the end bounds of a change transition. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Rect startBounds; /** diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 0847a179c553..5b79174a6cd8 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -34,6 +34,7 @@ import android.graphics.Rect; import android.graphics.RenderNode; import android.graphics.SurfaceTexture; import android.hardware.HardwareBuffer; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -74,7 +75,7 @@ public class Surface implements Parcelable { throws OutOfResourcesException; private static native void nativeUnlockCanvasAndPost(long nativeObject, Canvas canvas); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native void nativeRelease(long nativeObject); private static native boolean nativeIsValid(long nativeObject); private static native boolean nativeIsConsumerRunningBehind(long nativeObject); @@ -127,7 +128,7 @@ public class Surface implements Parcelable { private String mName; @UnsupportedAppUsage long mNativeObject; // package scope only for SurfaceControl access - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mLockedObject; private int mGenerationId; // incremented each time mNativeObject changes private final Canvas mCanvas = new CompatibleCanvas(); @@ -264,7 +265,7 @@ public class Surface implements Parcelable { } /* called from android_view_Surface_createFromIGraphicBufferProducer() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Surface(long nativeObject) { synchronized (mLock) { setNativeObjectLocked(nativeObject); diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 6d6fabb16b72..5a4584387dba 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -309,7 +309,7 @@ public final class SurfaceControl implements Parcelable { * Surface creation flag: Surface is created hidden * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int HIDDEN = 0x00000004; /** @@ -2898,7 +2898,7 @@ public final class SurfaceControl implements Parcelable { * @return Itself. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Transaction setCornerRadius(SurfaceControl sc, float cornerRadius) { checkPreconditions(sc); nativeSetCornerRadius(mNativeObject, sc.mNativeObject, cornerRadius); diff --git a/core/java/android/view/SurfaceSession.java b/core/java/android/view/SurfaceSession.java index 0f851c1881f5..cbc0479a4c07 100644 --- a/core/java/android/view/SurfaceSession.java +++ b/core/java/android/view/SurfaceSession.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An instance of this class represents a connection to the surface @@ -26,7 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; */ public final class SurfaceSession { // Note: This field is accessed by native code. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeClient; // SurfaceComposerClient* private static native long nativeCreate(); diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index a02070a21ac8..fc0ec4c560d4 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -29,6 +29,7 @@ import android.graphics.Rect; import android.graphics.SurfaceTexture; import android.graphics.TextureLayer; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.util.Log; @@ -117,7 +118,7 @@ public class TextureView extends View { private SurfaceTextureListener mListener; private boolean mHadSurface; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mOpaque = true; private final Matrix mMatrix = new Matrix(); @@ -125,7 +126,7 @@ public class TextureView extends View { private final Object[] mLock = new Object[0]; private boolean mUpdateLayer; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mUpdateSurface; private Canvas mCanvas; @@ -133,7 +134,7 @@ public class TextureView extends View { private final Object[] mNativeWindowLock = new Object[0]; // Set by native code, do not write! - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeWindow; /** @@ -227,7 +228,7 @@ public class TextureView extends View { /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDetachedFromWindowInternal() { destroyHardwareLayer(); releaseSurfaceTexture(); @@ -244,7 +245,7 @@ public class TextureView extends View { destroyHardwareLayer(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void destroyHardwareLayer() { if (mLayer != null) { mLayer.detachSurfaceTexture(); @@ -853,9 +854,9 @@ public class TextureView extends View { void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native void nCreateNativeWindow(SurfaceTexture surface); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private native void nDestroyNativeWindow(); private static native boolean nLockCanvas(long nativeWindow, Canvas canvas, Rect dirty); diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index 1f71924ca927..e1c4305e8747 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -18,6 +18,7 @@ package android.view; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.Pools.SynchronizedPool; @@ -436,25 +437,25 @@ public final class VelocityTracker { /** * Polynomial coefficients describing motion in X. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final float[] xCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial coefficients describing motion in Y. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final float[] yCoeff = new float[MAX_DEGREE + 1]; /** * Polynomial degree, or zero if only position information is available. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int degree; /** * Confidence (coefficient of determination), between 0 (no fit) and 1 (perfect fit). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public float confidence; /** diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index ac628e145eee..cefddd84ee32 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -811,7 +811,7 @@ import java.util.function.Predicate; @UiThread public class View implements Drawable.Callback, KeyEvent.Callback, AccessibilityEventSource { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = false; /** @hide */ @@ -2411,7 +2411,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private int mAutofillViewId = NO_ID; // ID for accessibility purposes. This ID must be unique for every window - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAccessibilityViewId = NO_ID; private int mAccessibilityCursorPosition = ACCESSIBILITY_CURSOR_POSITION_UNDEFINED; @@ -2423,7 +2423,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setTag(Object) * @see #getTag() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected Object mTag = null; /* @@ -3890,7 +3890,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Flag to make the status bar not expandable. Unless you also * set {@link #STATUS_BAR_DISABLE_NOTIFICATION_ICONS}, new notifications will continue to show. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int STATUS_BAR_DISABLE_EXPAND = 0x00010000; /** @@ -4553,7 +4553,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private LongSparseLongArray mMeasureCache; @ViewDebug.ExportedProperty(deepExport = true, prefix = "bg_") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Drawable mBackground; private TintInfo mBackgroundTint; @@ -4671,7 +4671,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * This field should be made private, so it is hidden from the SDK. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected OnCreateContextMenuListener mOnCreateContextMenuListener; @UnsupportedAppUsage @@ -4680,13 +4680,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @UnsupportedAppUsage private OnTouchListener mOnTouchListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnHoverListener mOnHoverListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnGenericMotionListener mOnGenericMotionListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnDragListener mOnDragListener; private OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener; @@ -5115,7 +5115,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean mCachingFailed; @UnsupportedAppUsage private Bitmap mDrawingCache; @@ -6854,7 +6854,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScrollabilityCache getScrollCache() { initScrollCache(); return mScrollCache; @@ -10414,7 +10414,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean isVisibleToUser(Rect boundInView) { if (mAttachInfo != null) { // Attached to invisible window means this view is not visible. @@ -10802,7 +10802,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide pending API council approval */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onFocusLost() { resetPressedState(); } @@ -11694,7 +11694,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean fitsSystemWindows() { return getFitsSystemWindows(); } @@ -13755,7 +13755,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void notifyViewAccessibilityStateChangedIfNeeded(int changeType) { if (!AccessibilityManager.getInstance(mContext).isEnabled() || mAttachInfo == null) { return; @@ -14175,7 +14175,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TextSegmentIterator getIteratorForGranularity(int granularity) { switch (granularity) { case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER: { @@ -14642,7 +14642,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return True if the event was handled by the view, false otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean dispatchPointerEvent(MotionEvent event) { if (event.isTouchEvent()) { return dispatchTouchEvent(event); @@ -15962,7 +15962,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isInScrollingContainer() { ViewParent p = getParent(); while (p != null && p instanceof ViewGroup) { @@ -16692,7 +16692,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return The inverse of the current matrix of this view. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Matrix getInverseMatrix() { ensureTransformationInfo(); if (mTransformationInfo.mInverseMatrix == null) { @@ -18734,7 +18734,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void invalidateParentIfNeeded() { if (isHardwareAccelerated() && mParent instanceof View) { ((View) mParent).invalidate(true); @@ -18841,7 +18841,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ThreadedRenderer getThreadedRenderer() { return mAttachInfo != null ? mAttachInfo.mThreadedRenderer : null; } @@ -19978,7 +19978,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #computeHorizontalScrollOffset() * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDrawHorizontalScrollBar(Canvas canvas, Drawable scrollBar, int l, int t, int r, int b) { scrollBar.setBounds(l, t, r, b); @@ -20161,7 +20161,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Return true if the application tag in the AndroidManifest has set "supportRtl" to true */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean hasRtlSupport() { return mContext.getApplicationInfo().hasRtlSupport(); } @@ -20319,7 +20319,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resolvePadding() { final int resolvedLayoutDirection = getLayoutDirection(); @@ -20417,7 +20417,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void onDetachedFromWindowInternal() { mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT; mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT; @@ -21134,7 +21134,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @CallSuper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void destroyHardwareResources() { if (mOverlay != null) { mOverlay.getOverlayView().destroyHardwareResources(); @@ -21270,7 +21270,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RenderNode updateDisplayListIfDirty() { final RenderNode renderNode = mRenderNode; if (!canHaveDisplayList()) { @@ -21341,7 +21341,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return renderNode; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void resetDisplayList() { mRenderNode.discardDisplayList(); if (mBackgroundRenderNode != null) { @@ -24795,7 +24795,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean toGlobalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -24817,7 +24817,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return false if the transformation could not be applied * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean toLocalMotionEvent(MotionEvent ev) { final AttachInfo info = mAttachInfo; if (info == null) { @@ -26239,7 +26239,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisabledSystemUiVisibility(int flags) { if (mAttachInfo != null) { if (mAttachInfo.mDisabledSystemUiVisibility != flags) { @@ -26288,7 +26288,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * */ public static class DragShadowBuilder { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final WeakReference mView; /** @@ -26756,7 +26756,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Drawable that are not transparent. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void applyDrawableToTransparentRegion(Drawable dr, Region region) { if (DBG) { Log.i("View", "Getting transparent region for: " + this); @@ -27324,7 +27324,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"), @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"), }) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRawTextDirection() { return (mPrivateFlags2 & PFLAG2_TEXT_DIRECTION_MASK) >> PFLAG2_TEXT_DIRECTION_MASK_SHIFT; } @@ -27581,7 +27581,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd") }) @TextAlignment - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRawTextAlignment() { return (mPrivateFlags2 & PFLAG2_TEXT_ALIGNMENT_MASK) >> PFLAG2_TEXT_ALIGNMENT_MASK_SHIFT; } @@ -28931,7 +28931,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * constants declared by {@link View} (there are more display states than * screen states). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mDisplayState = Display.STATE_UNKNOWN; /** @@ -29411,7 +29411,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * The current state of the scrollbars: ON, OFF, or FADING */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int state = OFF; private int mLastColor; @@ -29863,7 +29863,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AccessibilityNodeInfo createAccessibilityNodeInfo(View host) { return host.createAccessibilityNodeInfoInternal(); } @@ -30281,7 +30281,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return true; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void hideTooltip() { if (mTooltipInfo == null) { return; diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index abf76ece1f3d..16211fcecdf4 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -680,7 +680,7 @@ public class ViewConfiguration { * to a hover movement gesture. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getHoverTapSlop() { return HOVER_TAP_SLOP; } diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 100b4fdbf446..01cb0a67c1a2 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -29,6 +29,7 @@ import android.graphics.Picture; import android.graphics.RecordingCanvas; import android.graphics.Rect; import android.graphics.RenderNode; +import android.os.Build; import android.os.Debug; import android.os.Handler; import android.os.Looper; @@ -476,7 +477,7 @@ public class ViewDebug { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static long getViewRootImplCount() { return Debug.countInstancesOfClass(ViewRootImpl.class); } @@ -1152,7 +1153,7 @@ public class ViewDebug { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void dump(View root, boolean skipChildren, boolean includeProperties, OutputStream clientStream) throws IOException { BufferedWriter out = null; diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index eb6c49549100..37bea5821e42 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -131,7 +131,7 @@ import java.util.function.Predicate; public abstract class ViewGroup extends View implements ViewParent, ViewManager { private static final String TAG = "ViewGroup"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = false; /** @@ -3059,7 +3059,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void transformPointToViewLocal(float[] point, View child) { point[0] += mScrollX - child.mLeft; point[1] += mScrollY - child.mTop; @@ -3772,7 +3772,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfoInternal(info); if (getAccessibilityNodeProvider() != null) { @@ -3904,7 +3904,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void dispatchDetachedFromWindow() { // If we still have a touch target, we are still in the process of // dispatching motion events to a child; we need to get rid of that @@ -7769,7 +7769,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void resolvePadding() { super.resolvePadding(); int count = getChildCount(); @@ -9240,7 +9240,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) { super.encodeProperties(encoder); diff --git a/core/java/android/view/ViewOverlay.java b/core/java/android/view/ViewOverlay.java index 274f1eddee95..02f7e95ba742 100644 --- a/core/java/android/view/ViewOverlay.java +++ b/core/java/android/view/ViewOverlay.java @@ -22,6 +22,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import java.util.ArrayList; @@ -56,7 +57,7 @@ public class ViewOverlay { * of the overlay * @return */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ViewGroup getOverlayView() { return mOverlayViewGroup; } @@ -96,7 +97,7 @@ public class ViewOverlay { mOverlayViewGroup.clear(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean isEmpty() { return mOverlayViewGroup.isEmpty(); } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index f1005e91868e..14ba699933f0 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -272,7 +272,7 @@ public final class ViewRootImpl implements ViewParent, */ private static final int CONTENT_CAPTURE_ENABLED_FALSE = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final ThreadLocal sRunQueues = new ThreadLocal(); static final ArrayList sFirstDrawHandlers = new ArrayList<>(); @@ -417,11 +417,11 @@ public final class ViewRootImpl implements ViewParent, final Region mTransparentRegion; final Region mPreviousTransparentRegion; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mWidth; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mHeight; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) Rect mDirty; public boolean mIsAnimating; @@ -801,7 +801,7 @@ public final class ViewRootImpl implements ViewParent, } /** Add static config callback to be notified about global config changes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void addConfigCallback(ConfigChangedCallback callback) { synchronized (sConfigCallbacks) { sConfigCallbacks.add(callback); @@ -1175,7 +1175,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getWindowFlags() { return mWindowAttributes.flags; } @@ -1956,7 +1956,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void scheduleTraversals() { if (!mTraversalScheduled) { mTraversalScheduled = true; @@ -5205,7 +5205,7 @@ public final class ViewRootImpl implements ViewParent, * @param inTouchMode Whether we want to be in touch mode. * @return True if the touch mode changed and focus changed was changed as a result */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean ensureTouchMode(boolean inTouchMode) { if (DBG) Log.d("touchmode", "ensureTouchMode(" + inTouchMode + "), current " + "touch mode is " + mAttachInfo.mInTouchMode); @@ -7238,7 +7238,7 @@ public final class ViewRootImpl implements ViewParent, } /* drag/drop */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setLocalDragState(Object obj) { mLocalDragState = obj; } @@ -7864,7 +7864,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void dispatchResized(ClientWindowFrames frames, boolean reportDraw, MergedConfiguration mergedConfiguration, boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId) { @@ -8055,7 +8055,7 @@ public final class ViewRootImpl implements ViewParent, } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void enqueueInputEvent(InputEvent event) { enqueueInputEvent(event, null, 0, false); } @@ -8471,7 +8471,7 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.addViewRect(info); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void cancelInvalidate(View view) { mHandler.removeMessages(MSG_INVALIDATE, view); // fixme: might leak the AttachInfo.InvalidateInfo objects instead of returning @@ -8480,12 +8480,12 @@ public final class ViewRootImpl implements ViewParent, mInvalidateOnAnimationRunnable.removeView(view); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dispatchInputEvent(InputEvent event) { dispatchInputEvent(event, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dispatchInputEvent(InputEvent event, InputEventReceiver receiver) { SomeArgs args = SomeArgs.obtain(); args.arg1 = event; diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java index d9b55e4e729d..5a99ab2f5bdb 100644 --- a/core/java/android/view/ViewTreeObserver.java +++ b/core/java/android/view/ViewTreeObserver.java @@ -51,7 +51,7 @@ public final class ViewTreeObserver { // Non-recursive listeners use CopyOnWriteArray // Any listener invoked from ViewRootImpl.performTraversals() should not be recursive - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CopyOnWriteArray mOnGlobalLayoutListeners; @UnsupportedAppUsage private CopyOnWriteArray mOnComputeInternalInsetsListeners; @@ -242,7 +242,7 @@ public final class ViewTreeObserver { * Only used when {@link #setTouchableInsets(int)} is called with * the option {@link #TOUCHABLE_INSETS_REGION}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Region touchableRegion = new Region(); /** @@ -267,7 +267,7 @@ public final class ViewTreeObserver { * Option for {@link #setTouchableInsets(int)}: the area inside of * the provided touchable region in {@link #touchableRegion} can be touched. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TOUCHABLE_INSETS_REGION = 3; /** diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 5331a1b8d538..8dd4b667d357 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -162,7 +162,7 @@ public abstract class Window { * Max value used as a feature ID * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int FEATURE_MAX = FEATURE_ACTIVITY_TRANSITIONS; /** @@ -791,7 +791,7 @@ public abstract class Window { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final boolean isDestroyed() { return mDestroyed; } @@ -1137,7 +1137,7 @@ public abstract class Window { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addPrivateFlags(int flags) { setPrivateFlags(flags, flags); } diff --git a/core/java/android/view/WindowAnimationFrameStats.java b/core/java/android/view/WindowAnimationFrameStats.java index dfc4f0cd4dc6..251ae9bd58f2 100644 --- a/core/java/android/view/WindowAnimationFrameStats.java +++ b/core/java/android/view/WindowAnimationFrameStats.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -48,7 +49,7 @@ public final class WindowAnimationFrameStats extends FrameStats implements Parce * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void init(long refreshPeriodNano, long[] framesPresentedTimeNano) { mRefreshPeriodNano = refreshPeriodNano; mFramesPresentedTimeNano = framesPresentedTimeNano; diff --git a/core/java/android/view/WindowContentFrameStats.java b/core/java/android/view/WindowContentFrameStats.java index 217197c96793..c788346efdd8 100644 --- a/core/java/android/view/WindowContentFrameStats.java +++ b/core/java/android/view/WindowContentFrameStats.java @@ -17,6 +17,7 @@ package android.view; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public final class WindowContentFrameStats extends FrameStats implements Parcela * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void init(long refreshPeriodNano, long[] framesPostedTimeNano, long[] framesPresentedTimeNano, long[] framesReadyTimeNano) { mRefreshPeriodNano = refreshPeriodNano; diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index d6c53d0979a0..f85489871730 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -76,6 +76,7 @@ import android.graphics.PixelFormat; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; +import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -1078,7 +1079,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows only on the owning user's window. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15; /** @@ -1147,7 +1148,7 @@ public interface WindowManager extends ViewManager { * In multiuser systems shows on all users' windows. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int TYPE_DISPLAY_OVERLAY = FIRST_SYSTEM_WINDOW+26; /** @@ -2724,7 +2725,7 @@ public interface WindowManager extends ViewManager { * The ui visibility as requested by the views in this hierarchy. * the combined value should be systemUiVisibility | subtreeSystemUiVisibility. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int subtreeSystemUiVisibility; /** @@ -2900,7 +2901,7 @@ public interface WindowManager extends ViewManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int INPUT_FEATURE_DISABLE_USER_ACTIVITY = 0x00000004; /** diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index f01cbcc1430e..dd0ab6503a8a 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -259,7 +259,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getRootViews(IBinder token) { ArrayList views = new ArrayList<>(); synchronized (mLock) { @@ -438,7 +438,7 @@ public final class WindowManagerGlobal { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeView(View view, boolean immediate) { if (view == null) { throw new IllegalArgumentException("view must not be null"); diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index d803f8bfa6cc..f63749be6df2 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -126,7 +126,7 @@ public final class AccessibilityInteractionClient /** * @return The client for the current thread. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static AccessibilityInteractionClient getInstance() { final long threadId = Thread.currentThread().getId(); return getInstanceForThread(threadId); @@ -205,7 +205,7 @@ public final class AccessibilityInteractionClient * * @param message The message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSameThreadMessage(Message message) { synchronized (mInstanceLock) { mSameThreadMessage = message; @@ -729,7 +729,7 @@ public final class AccessibilityInteractionClient return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void clearCache() { sAccessibilityCache.clear(); } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index a9e8d5498a57..a8534faf43e5 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -111,7 +111,7 @@ public final class AccessibilityManager { public static final int DALTONIZER_DISABLED = -1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int DALTONIZER_SIMULATE_MONOCHROMACY = 0; /** @hide */ diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 303ba9e2a7d8..97ce92cd90aa 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -726,7 +726,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getAccessibilityViewId(long accessibilityNodeId) { return (int) accessibilityNodeId; } @@ -740,7 +740,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getVirtualDescendantId(long accessibilityNodeId) { return (int) ((accessibilityNodeId & VIRTUAL_DESCENDANT_ID_MASK) >> VIRTUAL_DESCENDANT_ID_SHIFT); @@ -768,7 +768,7 @@ public class AccessibilityNodeInfo implements Parcelable { private static final AccessibilityNodeInfo DEFAULT = new AccessibilityNodeInfo(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mSealed; // Data. @@ -988,7 +988,7 @@ public class AccessibilityNodeInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean refresh(Bundle arguments, boolean bypassCache) { enforceSealed(); if (!canPerformRequestOverConnection(mConnectionId, mWindowId, mSourceNodeId)) { diff --git a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl index f96f0acd6082..049bb31adbb1 100644 --- a/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl +++ b/core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl @@ -33,7 +33,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setFindAccessibilityNodeInfoResult(in AccessibilityNodeInfo info, int interactionId); /** @@ -42,7 +42,7 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param infos The result {@link AccessibilityNodeInfo}s. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setFindAccessibilityNodeInfosResult(in List infos, int interactionId); @@ -52,6 +52,6 @@ oneway interface IAccessibilityInteractionConnectionCallback { * @param Whether the action was performed. * @param interactionId The interaction id to match the result with the request. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setPerformAccessibilityActionResult(boolean succeeded, int interactionId); } diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl index 97036f3f3a1b..5d3c72015ee3 100644 --- a/core/java/android/view/accessibility/IAccessibilityManager.aidl +++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl @@ -44,7 +44,7 @@ interface IAccessibilityManager { List getInstalledAccessibilityServiceList(int userId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) List getEnabledAccessibilityServiceList(int feedbackType, int userId); int addAccessibilityInteractionConnection(IWindow windowToken, IBinder leashToken, diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 5785999e2672..1931174d4bb8 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2334,7 +2334,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isCursorAnchorInfoEnabled() { synchronized (mH) { final boolean isImmediate = (mRequestUpdateCursorAnchorInfoMonitorMode & @@ -2350,7 +2350,7 @@ public final class InputMethodManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUpdateCursorAnchorInfoMode(int flags) { synchronized (mH) { mRequestUpdateCursorAnchorInfoMonitorMode = flags; diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java index fa4f7d6d32da..b606340b77a7 100644 --- a/core/java/android/view/textclassifier/TextClassificationManager.java +++ b/core/java/android/view/textclassifier/TextClassificationManager.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.ServiceManager; import android.view.textclassifier.TextClassifier.TextClassifierType; @@ -104,7 +105,7 @@ public final class TextClassificationManager { * @see TextClassifier#DEFAULT_SYSTEM * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TextClassifier getTextClassifier(@TextClassifierType int type) { switch (type) { case TextClassifier.LOCAL: diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index afddaa2ff58a..35d84458bd35 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -18,6 +18,7 @@ package android.view.textservice; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -97,7 +98,7 @@ public class SpellCheckerSession { private final InternalListener mInternalListener; private final TextServicesManager mTextServicesManager; private final SpellCheckerInfo mSpellCheckerInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final SpellCheckerSessionListener mSpellCheckerSessionListener; private final SpellCheckerSessionListenerImpl mSpellCheckerSessionListenerImpl; diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index cd70a313db67..d34c8d58e789 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -22,6 +22,7 @@ import android.annotation.TestApi; import android.annotation.UserIdInt; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; @@ -217,7 +218,7 @@ public final class TextServicesManager { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SpellCheckerInfo[] getEnabledSpellCheckers() { try { final SpellCheckerInfo[] retval = mService.getEnabledSpellCheckers(mUserId); diff --git a/core/java/android/webkit/IWebViewUpdateService.aidl b/core/java/android/webkit/IWebViewUpdateService.aidl index 1da0500727ad..e17773159ec5 100644 --- a/core/java/android/webkit/IWebViewUpdateService.aidl +++ b/core/java/android/webkit/IWebViewUpdateService.aidl @@ -51,7 +51,7 @@ interface IWebViewUpdateService { * DevelopmentSettings uses this to get the current available WebView * providers (to display as choices to the user). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) WebViewProviderInfo[] getValidWebViewPackages(); /** @@ -62,7 +62,7 @@ interface IWebViewUpdateService { /** * Used by DevelopmentSetting to get the name of the WebView provider currently in use. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getCurrentWebViewPackageName(); /** diff --git a/core/java/android/webkit/PluginData.java b/core/java/android/webkit/PluginData.java index c9a196017a75..5d481b12a27c 100644 --- a/core/java/android/webkit/PluginData.java +++ b/core/java/android/webkit/PluginData.java @@ -17,6 +17,7 @@ package android.webkit; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.InputStream; import java.util.Map; @@ -93,7 +94,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public InputStream getInputStream() { return mStream; } @@ -108,7 +109,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getContentLength() { return mContentLength; } @@ -126,7 +127,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Map getHeaders() { return mHeaders; } @@ -141,7 +142,7 @@ public final class PluginData { * deprecated, so is this class. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getStatusCode() { return mStatusCode; } diff --git a/core/java/android/webkit/UrlInterceptRegistry.java b/core/java/android/webkit/UrlInterceptRegistry.java index c9dee00942c3..4fa6fdeecbee 100644 --- a/core/java/android/webkit/UrlInterceptRegistry.java +++ b/core/java/android/webkit/UrlInterceptRegistry.java @@ -18,6 +18,7 @@ package android.webkit; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.webkit.CacheManager.CacheResult; import java.util.Iterator; @@ -154,7 +155,7 @@ public final class UrlInterceptRegistry { */ @Deprecated @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static synchronized PluginData getPluginData( String url, Map headers) { if (urlInterceptDisabled()) { diff --git a/core/java/android/webkit/WebResourceResponse.java b/core/java/android/webkit/WebResourceResponse.java index 219523b15ab0..e4af9095265c 100644 --- a/core/java/android/webkit/WebResourceResponse.java +++ b/core/java/android/webkit/WebResourceResponse.java @@ -19,6 +19,7 @@ package android.webkit; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.InputStream; import java.io.StringBufferInputStream; @@ -34,7 +35,7 @@ public class WebResourceResponse { private boolean mImmutable; private String mMimeType; private String mEncoding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mStatusCode; private String mReasonPhrase; private Map mResponseHeaders; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8eb1371505bf..487d13e40bf3 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -112,7 +112,7 @@ public class WebView extends AbsoluteLayout // Throwing an exception for incorrect thread usage if the // build target is JB MR2 or newer. Defaults to false, and is // set in the WebView constructor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static volatile boolean sEnforceThreadChecking = false; /** @@ -407,7 +407,7 @@ public class WebView extends AbsoluteLayout * @hide */ @SuppressWarnings("deprecation") // for super() call into deprecated base class constructor. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected WebView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes, @Nullable Map javaScriptInterfaces, boolean privateBrowsing) { @@ -2587,7 +2587,7 @@ public class WebView extends AbsoluteLayout return WebViewFactory.getProvider(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Looper mWebViewThread = Looper.myLooper(); @UnsupportedAppUsage diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 5fc93443f4b8..dde9c3089370 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -26,6 +26,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; +import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; import android.os.Trace; @@ -390,7 +391,7 @@ public final class WebViewFactory { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static Class getProviderClass() { Context webViewContext = null; Application initialApplication = AppGlobals.getInitialApplication(); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 45b21c569cea..88c0809613ee 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -253,7 +253,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Controls CHOICE_MODE_MULTIPLE_MODAL. null when inactive. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ActionMode mChoiceActionMode; /** @@ -288,7 +288,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Should be used by subclasses to listen to changes in the dataset */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AdapterDataSetObserver mDataSetObserver; /** @@ -452,7 +452,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * Handles scrolling between positions within the list. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AbsPositionScroller mPositionScroller; /** @@ -1454,7 +1454,7 @@ public abstract class AbsListView extends AdapterView implements Te * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean isVerticalScrollBarHidden() { return isFastScrollEnabled(); } @@ -2249,7 +2249,7 @@ public abstract class AbsListView extends AdapterView implements Te } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean canScrollUp() { boolean canScrollUp; // 0th element is not visible @@ -2266,7 +2266,7 @@ public abstract class AbsListView extends AdapterView implements Te return canScrollUp; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean canScrollDown() { boolean canScrollDown; int count = getChildCount(); @@ -3275,7 +3275,7 @@ public abstract class AbsListView extends AdapterView implements Te CheckForLongPress.INVALID_COORD); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean performLongPress(final View child, final int longPressPosition, final long longPressId, float x, float y) { // CHOICE_MODE_MULTIPLE_MODAL takes over long press. @@ -6694,7 +6694,7 @@ public abstract class AbsListView extends AdapterView implements Te * scrap heap. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int scrappedFromPosition; /** diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java index 67ed30f2ec73..b9ff26b7d9ff 100644 --- a/core/java/android/widget/AbsSeekBar.java +++ b/core/java/android/widget/AbsSeekBar.java @@ -29,6 +29,7 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.util.AttributeSet; import android.view.KeyEvent; @@ -857,7 +858,7 @@ public abstract class AbsSeekBar extends ProgressBar { /** * Draw the thumb. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void drawThumb(Canvas canvas) { if (mThumb != null) { final int saveCount = canvas.save(); diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java index aa3590aaff0a..6d566baa23cd 100644 --- a/core/java/android/widget/ActionMenuPresenter.java +++ b/core/java/android/widget/ActionMenuPresenter.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -587,7 +588,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter * Dismiss all popup menus - overflow and submenus. * @return true if popups were dismissed, false otherwise. (This can be because none were open.) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean dismissPopupMenus() { boolean result = hideOverflowMenu(); result |= hideSubMenus(); @@ -610,7 +611,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter /** * @return true if the overflow menu is currently showing */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOverflowMenuShowing() { return mOverflowPopup != null && mOverflowPopup.isShowing(); } @@ -769,7 +770,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Parcelable onSaveInstanceState() { SavedState state = new SavedState(); state.openSubMenuId = mOpenSubMenuId; @@ -777,7 +778,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void onRestoreInstanceState(Parcelable state) { SavedState saved = (SavedState) state; if (saved.openSubMenuId > 0) { diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java index 3a743562110f..f83ff305cfdc 100644 --- a/core/java/android/widget/ActionMenuView.java +++ b/core/java/android/widget/ActionMenuView.java @@ -22,6 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.Gravity; @@ -719,7 +720,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo * @hide Private LinearLayout (superclass) API. Un-hide if LinearLayout API is made public. */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean hasDividerBeforeChildAt(int childIndex) { if (childIndex == 0) { return false; @@ -790,7 +791,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo /** @hide */ public interface ActionMenuChildView { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean needsDividerBefore(); public boolean needsDividerAfter(); } @@ -798,31 +799,31 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo public static class LayoutParams extends LinearLayout.LayoutParams { /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isOverflowButton; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int cellsUsed; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int extraPixels; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean expandable; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean preventEdgeOffset; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean expanded; public LayoutParams(Context c, AttributeSet attrs) { diff --git a/core/java/android/widget/ActivityChooserModel.java b/core/java/android/widget/ActivityChooserModel.java index 9da337ad97da..299760bfa91f 100644 --- a/core/java/android/widget/ActivityChooserModel.java +++ b/core/java/android/widget/ActivityChooserModel.java @@ -27,6 +27,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.DataSetObservable; import android.os.AsyncTask; +import android.os.Build; import android.text.TextUtils; import android.util.Log; import android.util.Xml; @@ -379,7 +380,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param intent The intent. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIntent(Intent intent) { synchronized (mInstanceLock) { if (mIntent == intent) { @@ -514,7 +515,7 @@ public class ActivityChooserModel extends DataSetObservable { * * @param listener The listener. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOnChooseActivityListener(OnChooseActivityListener listener) { synchronized (mInstanceLock) { mActivityChoserModelPolicy = listener; diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 00526d9f8a2c..ea906c68c69b 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -113,7 +113,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe private final PassThroughClickListener mPassThroughClickListener; private CharSequence mHintText; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TextView mHintView; private int mHintResource; @@ -615,7 +615,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide Pending API council approval */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDropDownDismissedOnCompletion(boolean dropDownDismissedOnCompletion) { mDropDownDismissedOnCompletion = dropDownDismissedOnCompletion; } @@ -1225,7 +1225,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * * @hide internal used only by SearchDialog */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void showDropDownAfterLayout() { mPopup.postShow(); } diff --git a/core/java/android/widget/DatePickerSpinnerDelegate.java b/core/java/android/widget/DatePickerSpinnerDelegate.java index fd89b2e09131..c6d456d8cb01 100644 --- a/core/java/android/widget/DatePickerSpinnerDelegate.java +++ b/core/java/android/widget/DatePickerSpinnerDelegate.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; import android.icu.util.Calendar; +import android.os.Build; import android.os.Parcelable; import android.text.InputType; import android.text.TextUtils; @@ -501,7 +502,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { || mCurrentDate.get(Calendar.DAY_OF_MONTH) != dayOfMonth); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDate(int year, int month, int dayOfMonth) { mCurrentDate.set(year, month, dayOfMonth); resetAutofilledValue(); @@ -512,7 +513,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateSpinners() { // set the spinner ranges respecting the min and max dates if (mCurrentDate.equals(mMinDate)) { @@ -565,7 +566,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Updates the calendar view with the current date. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateCalendarView() { mCalendarView.setDate(mCurrentDate.getTimeInMillis(), false, false); } @@ -574,7 +575,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { /** * Notifies the listener, if such, for a change in the selected date. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDateChanged() { mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); if (mOnDateChangedListener != null) { @@ -630,7 +631,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateInputState() { // Make sure that if the user changes the value and the IME is active // for one of the inputs if this widget, the IME is closed. If the user diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 20a53c03bed1..955552289c3a 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -30,6 +30,7 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.database.ContentObserver; +import android.os.Build; import android.os.Handler; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -81,7 +82,7 @@ public class DateTimeView extends TextView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public DateTimeView(Context context, AttributeSet attrs) { super(context, attrs); final TypedArray a = context.obtainStyledAttributes(attrs, diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 32f3acd387b0..c10ffbee686a 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -87,7 +87,7 @@ public class EdgeEffect { private static final float RADIUS_FACTOR = 0.6f; private float mGlowAlpha; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mGlowScaleY; private float mGlowAlphaStart; diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index f2955ac554fc..4099c8aa6710 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -323,7 +323,7 @@ public class Editor { private boolean mShowErrorAfterAttach; boolean mInBatchEditControllers; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mShowSoftInputOnFocus = true; private boolean mPreserveSelection; private boolean mRestartActionModeOnNextRefresh; @@ -355,7 +355,7 @@ public class Editor { Callback mCustomInsertionActionModeCallback; // Set when this TextView gained focus with some text selected. Will start selection mode. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mCreatedWithASelection; // The button state as of the last time #onTouchEvent is called. diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index 0c0b3491a854..7dbe7b234422 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -140,7 +140,7 @@ class FastScroller { @UnsupportedAppUsage private Drawable mThumbDrawable; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Drawable mTrackDrawable; private int mTextAppearance; private int mThumbPosition; diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index a6dce7f05f4a..50773b1c43b9 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -39,6 +39,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Insets; import android.graphics.Paint; +import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.util.LogPrinter; @@ -2815,7 +2816,7 @@ public class GridLayout extends ViewGroup { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static final Alignment UNDEFINED_ALIGNMENT = new Alignment() { @Override int getGravityOffset(View view, int cellDelta) { diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index 4a5e95e492e5..196d68bcd08a 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -979,7 +979,7 @@ public class GridView extends AbsListView { return sel; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean determineColumns(int availableSpace) { final int requestedHorizontalSpacing = mRequestedHorizontalSpacing; final int stretchMode = mStretchMode; diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 3bb39c135034..97dbb1542717 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -150,9 +150,9 @@ public class HorizontalScrollView extends FrameLayout { private int mMinimumVelocity; private int mMaximumVelocity; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mOverscrollDistance; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mOverflingDistance; private float mHorizontalScrollFactor; diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index c20773848759..e4de4001c3e2 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -127,7 +127,7 @@ public class ImageView extends View { @UnsupportedAppUsage private Drawable mDrawable = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private BitmapDrawable mRecycleableBitmapDrawable = null; private ColorStateList mDrawableTintList = null; private BlendMode mDrawableBlendMode = null; diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index a796ba545d8f..fa84407c5c4d 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -212,9 +212,9 @@ public class LinearLayout extends ViewGroup { private static final int VERTICAL_GRAVITY_COUNT = 4; private static final int INDEX_CENTER_VERTICAL = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int INDEX_TOP = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int INDEX_BOTTOM = 2; private static final int INDEX_FILL = 3; diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index 4311ffbe0e95..6232480f8620 100755 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -332,7 +332,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDropDownAlwaysVisible(boolean dropDownAlwaysVisible) { mDropDownAlwaysVisible = dropDownAlwaysVisible; } @@ -342,7 +342,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @hide Only used by AutoCompleteTextView under special conditions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDropDownAlwaysVisible() { return mDropDownAlwaysVisible; } @@ -933,7 +933,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @param max Max number of items that can be visible and still allow the list to expand. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void setListItemExpandMax(int max) { mListItemExpandMaximum = max; } @@ -1130,7 +1130,7 @@ public class ListPopupWindow implements ShowableListMenu { * * @return the content's height or -1 if content already exists */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int buildDropDown() { ViewGroup dropDownView; int otherHeights = 0; diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 3c3daa3c7001..cf0e0d1f1842 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -1979,7 +1979,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean trackMotionScroll(int deltaY, int incrementalDeltaY) { final boolean result = super.trackMotionScroll(deltaY, incrementalDeltaY); removeUnusedFixedViews(mHeaderViewInfos); @@ -4028,7 +4028,7 @@ public class ListView extends AbsListView { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int getHeightForPosition(int position) { final int height = super.getHeightForPosition(position); if (shouldAdjustHeightForDivider(position)) { diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 8dfb936ef7ee..7c20472df357 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -250,7 +250,7 @@ public class NumberPicker extends LinearLayout { /** * The min height of this widget. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMinHeight; /** @@ -261,7 +261,7 @@ public class NumberPicker extends LinearLayout { /** * The max width of this widget. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMinWidth; /** @@ -277,7 +277,7 @@ public class NumberPicker extends LinearLayout { /** * The height of the text. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mTextSize; /** @@ -298,7 +298,7 @@ public class NumberPicker extends LinearLayout { /** * Upper value of the range of numbers allowed for the NumberPicker */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMaxValue; /** @@ -309,7 +309,7 @@ public class NumberPicker extends LinearLayout { /** * Listener to be notified upon current value change. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private OnValueChangeListener mOnValueChangeListener; /** @@ -367,7 +367,7 @@ public class NumberPicker extends LinearLayout { /** * The {@link Scroller} responsible for flinging the selector. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Scroller mFlingScroller; /** @@ -429,7 +429,7 @@ public class NumberPicker extends LinearLayout { /** * @see ViewConfiguration#getScaledMaximumFlingVelocity() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMaximumFlingVelocity; /** diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 1c33d80fd4ca..27fcde25ad37 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -19,6 +19,7 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.hardware.SensorManager; +import android.os.Build; import android.util.Log; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; @@ -36,7 +37,7 @@ public class OverScroller { @UnsupportedAppUsage private final SplineOverScroller mScrollerY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Interpolator mInterpolator; private final boolean mFlywheel; diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java index 0ce964666a2b..2aa587539930 100644 --- a/core/java/android/widget/PopupMenu.java +++ b/core/java/android/widget/PopupMenu.java @@ -20,6 +20,7 @@ import android.annotation.MenuRes; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; @@ -40,7 +41,7 @@ import com.android.internal.view.menu.ShowableListMenu; * it. */ public class PopupMenu { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Context mContext; private final MenuBuilder mMenu; private final View mAnchor; diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index cc3d74477342..e7e148abb95a 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -183,7 +183,7 @@ public class PopupWindow { private boolean mClipToScreen; private boolean mAllowScrollingAnchorParent = true; private boolean mLayoutInsetDecor = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mNotTouchModal; private boolean mAttachedInDecor = true; private boolean mAttachedInDecorSet = false; diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 796654a4dc99..67216f5955f7 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -240,7 +240,7 @@ public class ProgressBar extends View { /** Value used to track progress animation, in the range [0...1]. */ private float mVisualProgress; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean mMirrorForRtl = false; private boolean mAggregatedIsVisible; @@ -1673,7 +1673,7 @@ public class ProgressBar extends View { // Stub method. } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private synchronized void refreshProgress(int id, int progress, boolean fromUser, boolean animate) { if (mUiThreadId == Thread.currentThread().getId()) { diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index dcfb3872bda0..4ba1ca8989b7 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -261,7 +261,7 @@ public class RemoteViews implements Parcelable, Filter { * RemoteViews. */ private RemoteViews mLandscape = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RemoteViews mPortrait = null; @ApplyFlags @@ -439,7 +439,7 @@ public class RemoteViews implements Parcelable, Filter { // Do nothing } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mergeBehavior() { return MERGE_REPLACE; } @@ -508,7 +508,7 @@ public class RemoteViews implements Parcelable, Filter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void mergeRemoteViews(RemoteViews newRv) { if (newRv == null) return; // We first copy the new RemoteViews, as the process of merging modifies the way the actions @@ -700,7 +700,7 @@ public class RemoteViews implements Parcelable, Filter { return SET_PENDING_INTENT_TEMPLATE_TAG; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) PendingIntent pendingIntentTemplate; } @@ -1148,7 +1148,7 @@ public class RemoteViews implements Parcelable, Filter { private static class BitmapCache { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ArrayList mBitmaps; int mBitmapMemory = -1; @@ -1564,7 +1564,7 @@ public class RemoteViews implements Parcelable, Filter { * ViewGroup methods that are related to adding Views. */ private class ViewGroupActionAdd extends Action { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RemoteViews mNestedViews; private int mIndex; @@ -2479,7 +2479,7 @@ public class RemoteViews implements Parcelable, Filter { * Returns an estimate of the bitmap heap memory usage for this RemoteViews. */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int estimateMemoryUsage() { return mBitmapCache.getBitmapMemory(); } @@ -3004,7 +3004,7 @@ public class RemoteViews implements Parcelable, Filter { * @hide * @deprecated this appears to have no users outside of UnsupportedAppUsage? */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public void setRemoteAdapter(int viewId, ArrayList list, int viewTypeCount) { addAction(new SetRemoteViewsAdapterList(viewId, list, viewTypeCount)); diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index b8849367b7b6..c98ed6a2f5d0 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -32,6 +32,7 @@ import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.res.Configuration; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -107,7 +108,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback private final Executor mAsyncViewLoadExecutor; private OnClickHandler mRemoteViewsOnClickHandler; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final FixedSizeRemoteViewsCache mCache; private int mVisibleWindowLowerBound; private int mVisibleWindowUpperBound; @@ -116,7 +117,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // loaded. private RemoteViewsFrameLayoutRefSet mRequestedViews; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final HandlerThread mWorkerThread; // items may be interrupted within the normally processed queues private final Handler mMainHandler; @@ -896,17 +897,17 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isDataReady() { return mDataReady; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRemoteViewsOnClickHandler(OnClickHandler handler) { mRemoteViewsOnClickHandler = handler; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void saveRemoteViewsCache() { final RemoteViewsCacheKey key = new RemoteViewsCacheKey( new Intent.FilterComparison(mIntent), mAppWidgetId); @@ -1051,7 +1052,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Intent getRemoteViewsServiceIntent() { return mIntent; } @@ -1098,7 +1099,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * views are currently being displayed. This allows for certain optimizations and preloading * which wouldn't otherwise be possible. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVisibleRangeHint(int lowerBound, int upperBound) { mVisibleWindowLowerBound = lowerBound; mVisibleWindowUpperBound = upperBound; diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index b44b8c222fac..f3de9828c4aa 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -188,7 +188,7 @@ public class ScrollView extends FrameLayout { * These are no-ops on user builds. */ private StrictMode.Span mScrollStrictSpan = null; // aka "drag" - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private StrictMode.Span mFlingStrictSpan = null; /** diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index b8a324931f86..2108f8ea350e 100755 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -1938,7 +1938,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mThreshold = getThreshold(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SearchAutoComplete(Context context, AttributeSet attrs) { super(context, attrs); mThreshold = getThreshold(); diff --git a/core/java/android/widget/SeekBar.java b/core/java/android/widget/SeekBar.java index 5676881cee76..201cab1c81e3 100644 --- a/core/java/android/widget/SeekBar.java +++ b/core/java/android/widget/SeekBar.java @@ -18,6 +18,7 @@ package android.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.view.accessibility.AccessibilityNodeInfo; @@ -90,7 +91,7 @@ public class SeekBar extends AbsSeekBar { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void onProgressRefresh(float scale, boolean fromUser, int progress) { super.onProgressRefresh(scale, fromUser, progress); diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 46fc09f4c3b3..ba6fa197f164 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -1082,7 +1082,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { /** * @return true if the popup is showing, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isShowing(); /** @@ -1113,7 +1113,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isShowing() { return mPopup != null ? mPopup.isShowing() : false; } diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 5bca56f14add..3295fd2ea1c3 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -35,6 +35,7 @@ import android.graphics.Rect; import android.graphics.Region.Op; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.text.Layout; import android.text.StaticLayout; @@ -110,7 +111,7 @@ public class Switch extends CompoundButton { private boolean mHasTrackTintMode = false; private int mThumbTextPadding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mSwitchMinWidth; private int mSwitchPadding; private boolean mSplitTrack; diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index 95c0e8658c57..b1485ef27de5 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -32,6 +32,7 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.icu.text.DateTimePatternGenerator; import android.net.Uri; +import android.os.Build; import android.os.Handler; import android.os.SystemClock; import android.os.UserHandle; @@ -494,7 +495,7 @@ public class TextClock extends TextView { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CharSequence getFormat() { return mFormat; } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5280a48596b4..3ac78bafdedc 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4364,7 +4364,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener shouldRequestLayout); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setRawTextSize(float size, boolean shouldRequestLayout) { if (size != mTextPaint.getTextSize()) { mTextPaint.setTextSize(size); @@ -7876,7 +7876,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return drawableState; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Path getUpdatedHighlightPath() { Path highlight = null; Paint highlightPaint = mHighlightPaint; @@ -12354,7 +12354,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * be {@code null} if no text is set */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private CharSequence getTextForAccessibility() { // If the text is empty, we must be showing the hint text. if (TextUtils.isEmpty(mText)) { @@ -12496,7 +12496,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CharSequence getTransformedText(int start, int end) { return removeSuggestionSpans(mTransformed.subSequence(start, end)); } @@ -12984,7 +12984,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return x; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int getLineAtCoordinate(float y) { y -= getTotalPaddingTop(); // Clamp the position to inside of the view. @@ -13173,7 +13173,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * Deletes the range of text [start, end[. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected void deleteText_internal(int start, int end) { ((Editable) mText).delete(start, end); } @@ -13225,7 +13225,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @hide */ @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CharSequence getIterableTextForAccessibility() { return mText; } diff --git a/core/java/android/widget/ViewAnimator.java b/core/java/android/widget/ViewAnimator.java index 90f61ca50d52..3f8325a8f547 100644 --- a/core/java/android/widget/ViewAnimator.java +++ b/core/java/android/widget/ViewAnimator.java @@ -21,6 +21,7 @@ import android.annotation.AnimRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -156,7 +157,7 @@ public class ViewAnimator extends FrameLayout { * @param animate Whether or not to use the in and out animations, defaults * to true. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void showOnly(int childIndex, boolean animate) { final int count = getChildCount(); for (int i = 0; i < count; i++) { diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 2df9a785450b..5abb6e1637e7 100644 --- a/core/java/android/widget/ViewFlipper.java +++ b/core/java/android/widget/ViewFlipper.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.TypedArray; +import android.os.Build; import android.os.Message; import android.util.AttributeSet; import android.util.Log; @@ -183,7 +184,7 @@ public class ViewFlipper extends ViewAnimator { * addition to queuing future flips. If omitted, defaults to * true. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateRunning(boolean flipNow) { boolean running = mVisible && mStarted && mUserPresent; if (running != mRunning) { diff --git a/core/java/com/android/ims/internal/uce/common/CapInfo.java b/core/java/com/android/ims/internal/uce/common/CapInfo.java index a7a90f6912c2..bca647a911d6 100644 --- a/core/java/com/android/ims/internal/uce/common/CapInfo.java +++ b/core/java/com/android/ims/internal/uce/common/CapInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -91,7 +92,7 @@ public class CapInfo implements Parcelable { /** * Constructor for the CapInfo class. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo() { }; @@ -99,7 +100,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IM is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isImSupported() { return mImSupported; } @@ -107,7 +108,7 @@ public class CapInfo implements Parcelable { /** * Sets IM as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setImSupported(boolean imSupported) { this.mImSupported = imSupported; } @@ -115,7 +116,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Thumbnail is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtThumbSupported() { return mFtThumbSupported; } @@ -123,7 +124,7 @@ public class CapInfo implements Parcelable { /** * Sets FT thumbnail as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtThumbSupported(boolean ftThumbSupported) { this.mFtThumbSupported = ftThumbSupported; } @@ -133,7 +134,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Store and Forward is supported */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtSnFSupported() { return mFtSnFSupported; } @@ -141,7 +142,7 @@ public class CapInfo implements Parcelable { /** * Sets FT Store and Forward as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtSnFSupported(boolean ftSnFSupported) { this.mFtSnFSupported = ftSnFSupported; } @@ -149,7 +150,7 @@ public class CapInfo implements Parcelable { /** * Checks whether File transfer HTTP is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtHttpSupported() { return mFtHttpSupported; } @@ -157,7 +158,7 @@ public class CapInfo implements Parcelable { /** * Sets File transfer HTTP as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtHttpSupported(boolean ftHttpSupported) { this.mFtHttpSupported = ftHttpSupported; } @@ -165,7 +166,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFtSupported() { return mFtSupported; } @@ -173,7 +174,7 @@ public class CapInfo implements Parcelable { /** * Sets FT as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFtSupported(boolean ftSupported) { this.mFtSupported = ftSupported; } @@ -181,7 +182,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IS is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIsSupported() { return mIsSupported; } @@ -189,7 +190,7 @@ public class CapInfo implements Parcelable { /** * Sets IS as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIsSupported(boolean isSupported) { this.mIsSupported = isSupported; } @@ -197,7 +198,7 @@ public class CapInfo implements Parcelable { /** * Checks whether video sharing is supported during a CS call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVsDuringCSSupported() { return mVsDuringCSSupported; } @@ -206,7 +207,7 @@ public class CapInfo implements Parcelable { * Sets video sharing as supported or not supported during a CS * call. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVsDuringCSSupported(boolean vsDuringCSSupported) { this.mVsDuringCSSupported = vsDuringCSSupported; } @@ -215,7 +216,7 @@ public class CapInfo implements Parcelable { * Checks whether video sharing outside a voice call is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isVsSupported() { return mVsSupported; } @@ -223,7 +224,7 @@ public class CapInfo implements Parcelable { /** * Sets video sharing as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVsSupported(boolean vsSupported) { this.mVsSupported = vsSupported; } @@ -231,7 +232,7 @@ public class CapInfo implements Parcelable { /** * Checks whether social presence is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSpSupported() { return mSpSupported; } @@ -239,7 +240,7 @@ public class CapInfo implements Parcelable { /** * Sets social presence as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSpSupported(boolean spSupported) { this.mSpSupported = spSupported; } @@ -248,7 +249,7 @@ public class CapInfo implements Parcelable { * Checks whether capability discovery via presence is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isCdViaPresenceSupported() { return mCdViaPresenceSupported; } @@ -257,7 +258,7 @@ public class CapInfo implements Parcelable { * Sets capability discovery via presence as supported or not * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) { this.mCdViaPresenceSupported = cdViaPresenceSupported; } @@ -265,7 +266,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP voice call is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIpVoiceSupported() { return mIpVoiceSupported; } @@ -273,7 +274,7 @@ public class CapInfo implements Parcelable { /** * Sets IP voice call as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIpVoiceSupported(boolean ipVoiceSupported) { this.mIpVoiceSupported = ipVoiceSupported; } @@ -281,7 +282,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP video call is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isIpVideoSupported() { return mIpVideoSupported; } @@ -289,7 +290,7 @@ public class CapInfo implements Parcelable { /** * Sets IP video call as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIpVideoSupported(boolean ipVideoSupported) { this.mIpVideoSupported = ipVideoSupported; } @@ -298,7 +299,7 @@ public class CapInfo implements Parcelable { * Checks whether Geo location Pull using File Transfer is * supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPullFtSupported() { return mGeoPullFtSupported; } @@ -307,7 +308,7 @@ public class CapInfo implements Parcelable { * Sets Geo location Pull using File Transfer as supported or * not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPullFtSupported(boolean geoPullFtSupported) { this.mGeoPullFtSupported = geoPullFtSupported; } @@ -315,7 +316,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Pull is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPullSupported() { return mGeoPullSupported; } @@ -323,7 +324,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Pull as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPullSupported(boolean geoPullSupported) { this.mGeoPullSupported = geoPullSupported; } @@ -331,7 +332,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Push is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isGeoPushSupported() { return mGeoPushSupported; } @@ -339,7 +340,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Push as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGeoPushSupported(boolean geoPushSupported) { this.mGeoPushSupported = geoPushSupported; } @@ -347,7 +348,7 @@ public class CapInfo implements Parcelable { /** * Checks whether short messaging is supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSmSupported() { return mSmSupported; } @@ -355,7 +356,7 @@ public class CapInfo implements Parcelable { /** * Sets short messaging as supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSmSupported(boolean smSupported) { this.mSmSupported = smSupported; } @@ -363,22 +364,22 @@ public class CapInfo implements Parcelable { /** * Checks whether store/forward and group chat are supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isFullSnFGroupChatSupported() { return mFullSnFGroupChatSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVoiceCallSupported() { return mRcsIpVoiceCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVideoCallSupported() { return mRcsIpVideoCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isRcsIpVideoOnlyCallSupported() { return mRcsIpVideoOnlyCallSupported; } @@ -386,20 +387,20 @@ public class CapInfo implements Parcelable { /** * Sets store/forward and group chat supported or not supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) { this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) { this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) { this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) { this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported; } @@ -536,20 +537,20 @@ public class CapInfo implements Parcelable { } /** Sets the list of supported extensions. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setExts(String[] exts) { this.mExts = exts; } /** Gets the time stamp for when to query again. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCapTimestamp() { return mCapTimestamp; } /** Sets the time stamp for when to query again. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapTimestamp(long capTimestamp) { this.mCapTimestamp = capTimestamp; } diff --git a/core/java/com/android/ims/internal/uce/common/StatusCode.java b/core/java/com/android/ims/internal/uce/common/StatusCode.java index 7f69493aa284..847792f4b50c 100644 --- a/core/java/com/android/ims/internal/uce/common/StatusCode.java +++ b/core/java/com/android/ims/internal/uce/common/StatusCode.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -75,14 +76,14 @@ public class StatusCode implements Parcelable { * Constructor for the StatusCode class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public StatusCode() {} /** * Gets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getStatusCode() { return mStatusCode; } @@ -91,7 +92,7 @@ public class StatusCode implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatusCode(int nStatusCode) { this.mStatusCode = nStatusCode; } diff --git a/core/java/com/android/ims/internal/uce/common/UceLong.java b/core/java/com/android/ims/internal/uce/common/UceLong.java index bf514471b506..d878c10c76b4 100644 --- a/core/java/com/android/ims/internal/uce/common/UceLong.java +++ b/core/java/com/android/ims/internal/uce/common/UceLong.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.common; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -32,7 +33,7 @@ public class UceLong implements Parcelable { * Constructor for the UceLong class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public UceLong() { }; @@ -40,7 +41,7 @@ public class UceLong implements Parcelable { * Gets the long value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getUceLong() { return mUceLong; } @@ -49,7 +50,7 @@ public class UceLong implements Parcelable { * Sets the long value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUceLong(long uceLong) { this.mUceLong = uceLong; } @@ -57,7 +58,7 @@ public class UceLong implements Parcelable { /** Get the client ID as integer value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getClientId() { return mClientId; } @@ -66,7 +67,7 @@ public class UceLong implements Parcelable { * Set the client ID as integer value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setClientId(int nClientId) { this.mClientId = nClientId; } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl index c69d5a94f760..62897c7fb1ae 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsListener.aidl @@ -29,7 +29,7 @@ interface IOptionsListener * @param version, version information of the service. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void getVersionCb(in String version ); /** @@ -38,7 +38,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service availability. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceAvailable(in StatusCode statusCode); /** @@ -47,7 +47,7 @@ interface IOptionsListener * @param statusCode, UCE_SUCCESS as service unavailability. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceUnavailable(in StatusCode statusCode); /** @@ -58,7 +58,7 @@ interface IOptionsListener * @param capInfo, capabilities of the remote entity received. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sipResponseReceived( String uri, in OptionsSipResponse sipResponse, in OptionsCapInfo capInfo); @@ -67,7 +67,7 @@ interface IOptionsListener * @param cmdStatus, command status of the request placed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cmdStatus(in OptionsCmdStatus cmdStatus); /** @@ -78,7 +78,7 @@ interface IOptionsListener * @param tID, transation of the request received from network. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void incomingOptions( String uri, in OptionsCapInfo capInfo, in int tID); } diff --git a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl index 2e49082988c3..a7487b804567 100644 --- a/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl +++ b/core/java/com/android/ims/internal/uce/options/IOptionsService.aidl @@ -33,7 +33,7 @@ interface IOptionsService * @return StatusCode, status of the request placed. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getVersion(int optionsServiceHandle); /** @@ -45,7 +45,7 @@ interface IOptionsService * The service will fill UceLong.mUceLong with optionsServiceListenerHdl * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode addListener(int optionsServiceHandle, IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); @@ -56,7 +56,7 @@ interface IOptionsService * @param optionsServiceListenerHdl provided in createOptionsService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode removeListener(int optionsServiceHandle, in UceLong optionsServiceListenerHdl); /** @@ -69,7 +69,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode setMyInfo(int optionsServiceHandle , in CapInfo capInfo, int reqUserData); @@ -82,7 +82,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getMyInfo(int optionsServiceHandle , int reqUserdata); /** @@ -95,7 +95,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactCap(int optionsServiceHandle , String remoteURI, int reqUserData); @@ -109,7 +109,7 @@ interface IOptionsService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactListCap(int optionsServiceHandle, in String[] remoteURIList, int reqUserData); @@ -126,7 +126,7 @@ interface IOptionsService * @param bContactInBL, true if the contact is blacklisted, else false. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode responseIncomingOptions(int optionsServiceHandle, int tId, int sipResponseCode, String reasonPhrase, in OptionsCapInfo capInfo, in boolean bContactInBL); diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java index 1da5a2439f02..6f83bf3224a8 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -31,12 +32,12 @@ public class OptionsCapInfo implements Parcelable { return new OptionsCapInfo(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getSdp() { return mSdp; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSdp(String sdp) { this.mSdp = sdp; } @@ -44,19 +45,19 @@ public class OptionsCapInfo implements Parcelable { /** * Constructor for the OptionsCapInfo class. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCapInfo() { mCapInfo = new CapInfo(); }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo getCapInfo() { return mCapInfo; } /** * Sets the CapInfo */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java index 401ca2fa24ea..82eb1b54a775 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdId.java @@ -18,6 +18,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -56,7 +57,7 @@ public class OptionsCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -65,7 +66,7 @@ public class OptionsCmdId implements Parcelable { * Constructor for the OptionsCDCmdId class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCmdId(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java index 70a7a84d3820..461f8bfb48c8 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +43,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -58,7 +59,7 @@ public class OptionsCmdStatus implements Parcelable { /** Sets the user data. @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUserData(int userData) { this.mUserData = userData; } @@ -75,7 +76,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatus(StatusCode status) { this.mStatus = status; } @@ -84,7 +85,7 @@ public class OptionsCmdStatus implements Parcelable { * Constructor for the OptionsCmdStatus class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsCmdStatus() { mStatus = new StatusCode(); mCapInfo = new CapInfo(); @@ -101,7 +102,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the CapInfo * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java index 5afddf0c42c0..acea0f03742f 100644 --- a/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java +++ b/core/java/com/android/ims/internal/uce/options/OptionsSipResponse.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.options; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -42,7 +43,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the Options command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -59,7 +60,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the request ID * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -76,7 +77,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -93,7 +94,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -110,7 +111,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -119,7 +120,7 @@ public class OptionsSipResponse implements Parcelable { * Constructor for the OptionsSipResponse class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OptionsSipResponse() { mCmdId = new OptionsCmdId(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl index 65e7fc9756bb..572a5f32ee93 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl @@ -36,7 +36,7 @@ interface IPresenceListener * Gets the version of the presence listener implementation. * @param version, version information. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void getVersionCb(in String version ); /** @@ -44,7 +44,7 @@ interface IPresenceListener * availability. * @param statusCode, UCE_SUCCESS as service availability. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceAvailable(in StatusCode statusCode); /** @@ -52,7 +52,7 @@ interface IPresenceListener * unavailability. * @param statusCode, UCE_SUCCESS as service unAvailability. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void serviceUnAvailable(in StatusCode statusCode); /** @@ -60,14 +60,14 @@ interface IPresenceListener * publish request. * @param publishTrigger, Publish trigger for the network being supported. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void publishTriggering(in PresPublishTriggerType publishTrigger); /** * Callback function to be invoked to inform the client of the status of an asynchronous call. * @param cmdStatus, command status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void cmdStatus( in PresCmdStatus cmdStatus); /** @@ -75,7 +75,7 @@ interface IPresenceListener * such as PUBLISH or SUBSCRIBE, has been received. * @param sipResponse, network response received for the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void sipResponseReceived(in PresSipResponse sipResponse); /** @@ -84,7 +84,7 @@ interface IPresenceListener * @param presentityURI, URI of the remote entity the request was placed. * @param tupleInfo, array of capability information remote entity supports. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void capInfoReceived(in String presentityURI, in PresTupleInfo [] tupleInfo); @@ -94,7 +94,7 @@ interface IPresenceListener * @param rlmiInfo, resource infomation received from network. * @param resInfo, array of capabilities received from network for the list of remore URI. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void listCapInfoReceived(in PresRlmiInfo rlmiInfo, in PresResInfo [] resInfo); @@ -102,7 +102,7 @@ interface IPresenceListener * Callback function to be invoked to inform the client when Unpublish message * is sent to network. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void unpublishMessageSent(); } \ No newline at end of file diff --git a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl index 26a3e83efcfa..de28dfa9f2d7 100644 --- a/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl +++ b/core/java/com/android/ims/internal/uce/presence/IPresenceService.aidl @@ -33,7 +33,7 @@ interface IPresenceService * @param presenceServiceHdl returned in createPresenceService(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getVersion(int presenceServiceHdl); /** @@ -46,7 +46,7 @@ interface IPresenceService * * @return StatusCode, status of the request placed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode addListener(int presenceServiceHdl, IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); @@ -56,7 +56,7 @@ interface IPresenceService * @param presenceServiceListenerHdl provided in createPresenceService() or Addlistener(). * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode removeListener(int presenceServiceHdl, in UceLong presenceServiceListenerHdl); /** @@ -72,7 +72,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode reenableService(int presenceServiceHdl, int userData); /** @@ -85,7 +85,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode publishMyCap(int presenceServiceHdl, in PresCapInfo myCapInfo , int userData); /** @@ -99,7 +99,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactCap(int presenceServiceHdl , String remoteUri, int userData); /** @@ -113,7 +113,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode getContactListCap(int presenceServiceHdl, in String[] remoteUriList, int userData); /** @@ -129,7 +129,7 @@ interface IPresenceService * with original request. * @return StatusCode, status of the request placed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) StatusCode setNewFeatureTag(int presenceServiceHdl, String featureTag, in PresServiceInfo serviceInfo, int userData); diff --git a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java index 1a3a028713f6..ec8b6bfa4ef3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCapInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -27,14 +28,14 @@ import com.android.ims.internal.uce.common.CapInfo; public class PresCapInfo implements Parcelable { private CapInfo mCapInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mContactUri = ""; /** * Gets the UCE capability information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CapInfo getCapInfo() { return mCapInfo; } @@ -51,7 +52,7 @@ public class PresCapInfo implements Parcelable { * Gets the contact URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getContactUri() { return mContactUri; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java index fba0c77e8dbf..9692b428c792 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdId.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdId.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -58,7 +59,7 @@ public class PresCmdId implements Parcelable { * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -68,7 +69,7 @@ public class PresCmdId implements Parcelable { * Constructor for the PresCmdId class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdId(){}; diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java index fbc64b83a360..7e22106f3be3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java +++ b/core/java/com/android/ims/internal/uce/presence/PresCmdStatus.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -43,7 +44,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -60,7 +61,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the user data. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUserData(int userData) { this.mUserData = userData; } @@ -76,7 +77,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the status code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setStatus(StatusCode status) { this.mStatus = status; } @@ -93,7 +94,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -102,7 +103,7 @@ public class PresCmdStatus implements Parcelable{ * Constructor for the PresCmdStatus class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdStatus() { mStatus = new StatusCode(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java index fdff86f9669f..04bbf6cd8e30 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java +++ b/core/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -70,7 +71,7 @@ public class PresPublishTriggerType implements Parcelable { * Sets the publish trigger type. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPublishTrigeerType(int nPublishTriggerType) { this.mPublishTriggerType = nPublishTriggerType; } @@ -80,7 +81,7 @@ public class PresPublishTriggerType implements Parcelable { * Constructor for the PresPublishTriggerType class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresPublishTriggerType(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java index af9b0568d29b..2f797b41b14f 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -39,7 +40,7 @@ public class PresResInfo implements Parcelable { * Sets the Presence service resource instance information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setInstanceInfo(PresResInstanceInfo instanceInfo) { this.mInstanceInfo = instanceInfo; } @@ -56,7 +57,7 @@ public class PresResInfo implements Parcelable { * Sets the resource URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResUri(String resUri) { this.mResUri = resUri; } @@ -73,7 +74,7 @@ public class PresResInfo implements Parcelable { * Sets the display name. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisplayName(String displayName) { this.mDisplayName = displayName; } @@ -83,7 +84,7 @@ public class PresResInfo implements Parcelable { * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresResInfo() { mInstanceInfo = new PresResInstanceInfo(); }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java index 9f3725133452..733c0afff367 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource instance state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResInstanceState(int nResInstanceState) { this.mResInstanceState = nResInstanceState; } @@ -78,7 +79,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setResId(String resourceId) { this.mId = resourceId; } @@ -97,7 +98,7 @@ public class PresResInstanceInfo implements Parcelable{ * code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReason(String reason) { this.mReason = reason; } @@ -114,7 +115,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the entity URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresentityUri(String presentityUri) { this.mPresentityUri = presentityUri; } @@ -131,7 +132,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the tuple information. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setTupleInfo(PresTupleInfo[] tupleInfo) { this.mTupleInfoArray = new PresTupleInfo[tupleInfo.length]; this.mTupleInfoArray = tupleInfo; @@ -142,7 +143,7 @@ public class PresResInstanceInfo implements Parcelable{ * Constructor for the PresResInstanceInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresResInstanceInfo(){ }; diff --git a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java index 65b9fdbbeb18..e33aa1303886 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -61,7 +62,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setUri(String uri) { this.mUri = uri; } @@ -78,7 +79,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the version. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVersion(int version) { this.mVersion = version; } @@ -95,7 +96,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFullState(boolean fullState) { this.mFullState = fullState; } @@ -112,7 +113,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI list name. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setListName(String listName) { this.mListName = listName; } @@ -129,7 +130,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the subscription request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -146,7 +147,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresSubscriptionState(PresSubscriptionState presSubscriptionState) { this.mPresSubscriptionState = presSubscriptionState; } @@ -163,7 +164,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription expiration time. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSubscriptionExpireTime(int subscriptionExpireTime) { this.mSubscriptionExpireTime = subscriptionExpireTime; } @@ -180,7 +181,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription terminated reason. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSubscriptionTerminatedReason(String subscriptionTerminatedReason) { this.mSubscriptionTerminatedReason = subscriptionTerminatedReason; } @@ -189,7 +190,7 @@ public class PresRlmiInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresRlmiInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java index 5eafa0fde8cc..aed673e63d94 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresServiceInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -46,7 +47,7 @@ public class PresServiceInfo implements Parcelable { * Gets the media type. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getMediaType() { return mMediaCap; } @@ -63,7 +64,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceId() { return mServiceID; } @@ -79,7 +80,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service description. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceDesc() { return mServiceDesc; } @@ -96,7 +97,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service version. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getServiceVer() { return mServiceVer; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java index 45b02f31eddc..9549152ce175 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSipResponse.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -33,7 +34,7 @@ public class PresSipResponse implements Parcelable { * Gets the Presence command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresCmdId getCmdId() { return mCmdId; } @@ -42,7 +43,7 @@ public class PresSipResponse implements Parcelable { * Sets the Presence command ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -51,7 +52,7 @@ public class PresSipResponse implements Parcelable { * Gets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRequestId() { return mRequestId; } @@ -60,7 +61,7 @@ public class PresSipResponse implements Parcelable { * Sets the request ID. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -69,7 +70,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSipResponseCode() { return mSipResponseCode; } @@ -78,7 +79,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -89,7 +90,7 @@ public class PresSipResponse implements Parcelable { * code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getReasonPhrase() { return mReasonPhrase; } @@ -98,7 +99,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -107,7 +108,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP retryAfter sec value. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRetryAfter() { return mRetryAfter; } @@ -116,7 +117,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -125,7 +126,7 @@ public class PresSipResponse implements Parcelable { * Constructor for the PresSipResponse class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresSipResponse(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java index ab1e17c48e75..85ec3967f8f3 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java +++ b/core/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -78,7 +79,7 @@ public class PresSubscriptionState implements Parcelable { * Constructor for the PresSubscriptionState class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresSubscriptionState() { }; /** @@ -94,7 +95,7 @@ public class PresSubscriptionState implements Parcelable { * Sets the Presence subscription state. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPresSubscriptionState(int nPresSubscriptionState) { this.mPresSubscriptionState = nPresSubscriptionState; } diff --git a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java index 3608eb6a5e8a..34a7b1e3de65 100644 --- a/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java +++ b/core/java/com/android/ims/internal/uce/presence/PresTupleInfo.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.presence; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -40,7 +41,7 @@ public class PresTupleInfo implements Parcelable { * Sets the feature tag. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setFeatureTag(String featureTag) { this.mFeatureTag = featureTag; } @@ -56,7 +57,7 @@ public class PresTupleInfo implements Parcelable { * Sets the contact URI. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setContactUri(String contactUri) { this.mContactUri = contactUri; } @@ -73,7 +74,7 @@ public class PresTupleInfo implements Parcelable { * Sets the timestamp. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setTimestamp(String timestamp) { this.mTimestamp = timestamp; } @@ -82,7 +83,7 @@ public class PresTupleInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PresTupleInfo(){}; /** @hide */ diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl index 41abf7d1a1f0..2341faed3e15 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl @@ -25,6 +25,6 @@ interface IUceListener * @param serviceStatusValue defined in ImsUceManager * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStatus(int serviceStatusValue); } diff --git a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl index ec45371689cf..156e9229e256 100644 --- a/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl +++ b/core/java/com/android/ims/internal/uce/uceservice/IUceService.aidl @@ -38,7 +38,7 @@ interface IUceService * Service status is returned in setStatus callback in IUceListener. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean startService(IUceListener uceListener); /** @@ -46,7 +46,7 @@ interface IUceService * @return boolean true if the service stop request is processed successfully, FALSE otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean stopService(); @@ -56,7 +56,7 @@ interface IUceService * @return boolean true if service started else false. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isServiceStarted(); /** @@ -74,7 +74,7 @@ interface IUceService * * @deprecated This is replaced with new API createOptionsServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int createOptionsService(IOptionsListener optionsListener, inout UceLong optionsServiceListenerHdl); /** @@ -101,7 +101,7 @@ interface IUceService * in IOptionsListener * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void destroyOptionsService(int optionsServiceHandle); /** @@ -119,7 +119,7 @@ interface IUceService * * @deprecated This is replaced with new API createPresenceServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int createPresenceService(IPresenceListener presenceServiceListener, inout UceLong presenceServiceListenerHdl); /** @@ -147,7 +147,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void destroyPresenceService(int presenceServiceHdl); @@ -159,7 +159,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean getServiceStatus(); /** @@ -171,7 +171,7 @@ interface IUceService * * @deprecated use API getPresenceServiceForSubscription() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IPresenceService getPresenceService(); /** @@ -194,7 +194,7 @@ interface IUceService * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) IOptionsService getOptionsService(); /** diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index be43e82c3f88..f690bd3477f0 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -26,6 +26,7 @@ import android.content.DialogInterface; import android.content.res.TypedArray; import android.database.Cursor; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.text.Layout; @@ -979,7 +980,7 @@ public class AlertController { boolean mRecycleOnMeasure = true; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RecycleListView(Context context) { this(context, null); } diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl index 04146bcad083..3a9f3b9c1128 100644 --- a/core/java/com/android/internal/app/IAppOpsService.aidl +++ b/core/java/com/android/internal/app/IAppOpsService.aidl @@ -89,7 +89,7 @@ interface IAppOpsService { void setUidMode(int code, int uid, int mode); @UnsupportedAppUsage void setMode(int code, int uid, String packageName, int mode); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void resetAllModes(int reqUserId, String reqPackageName); void setAudioRestriction(int code, int usage, int uid, int mode, in String[] exceptionPackages); diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index 6a0b443b7df8..e6a166140d89 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -55,7 +55,7 @@ interface IBatteryStats { ParcelFileDescriptor getStatisticsStream(); // Return true if we see the battery as currently charging. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isCharging(); // Return the computed amount of time remaining on battery, in milliseconds. @@ -64,7 +64,7 @@ interface IBatteryStats { // Return the computed amount of time remaining to fully charge, in milliseconds. // Returns -1 if nothing could be computed. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long computeChargeTimeRemaining(); void noteEvent(int code, String name, int uid); @@ -134,7 +134,7 @@ interface IBatteryStats { void noteDeviceIdleMode(int mode, String activeReason, int activeUid); void setBatteryState(int status, int health, int plugType, int level, int temp, int volt, int chargeUAh, int chargeFullUAh, long chargeTimeToFullSeconds); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long getAwakeTimeBattery(); long getAwakeTimePlugged(); diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index 49b4cd1e6a73..81c61aa0f250 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -61,7 +61,7 @@ interface IVoiceInteractionManagerService { * @param bcp47Locale The BCP47 language tag for the keyphrase's locale. * @RequiresPermission Manifest.permission.MANAGE_VOICE_KEYPHRASES */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) SoundTrigger.KeyphraseSoundModel getKeyphraseSoundModel(int keyphraseId, in String bcp47Locale); /** * Add/Update the given keyphrase sound model for the current user. diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 61a52bcc03f9..3e1fa1d5fe59 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -38,6 +38,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.metrics.LogMaker; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; @@ -64,7 +65,7 @@ import java.util.concurrent.Executors; * be passed in and out of a managed profile. */ public class IntentForwarderActivity extends Activity { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String TAG = "IntentForwarderActivity"; public static String FORWARD_INTENT_TO_PARENT diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 105e05a4a6c3..3c53d07b6180 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -27,6 +27,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; +import android.os.Build; import android.os.Bundle; import android.os.LocaleList; import android.os.RemoteException; @@ -78,7 +79,7 @@ public class LocalePicker extends ListFragment { return label; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Locale getLocale() { return locale; } diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index 0cd12022e17d..8cab91aab512 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -32,6 +32,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.TypedValue; import android.view.ActionMode; import android.view.ContextThemeWrapper; @@ -80,11 +81,11 @@ public class WindowDecorActionBar extends ActionBar implements private ActionBarOverlayLayout mOverlayLayout; private ActionBarContainer mContainerView; private DecorToolbar mDecorToolbar; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ActionBarContextView mContextView; private ActionBarContainer mSplitView; private View mContentView; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScrollingTabContainerView mTabScrollView; private ArrayList mTabs = new ArrayList(); @@ -1149,7 +1150,7 @@ public class WindowDecorActionBar extends ActionBar implements * @hide */ public class TabImpl extends ActionBar.Tab { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ActionBar.TabListener mCallback; private Object mTag; private Drawable mIcon; diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index 1186dfe92906..2d68cb472fa3 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -42,7 +42,7 @@ interface IAppWidgetService { void deleteAppWidgetId(String callingPackage, int appWidgetId); void deleteHost(String packageName, int hostId); void deleteAllHosts(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getAppWidgetViews(String callingPackage, int appWidgetId); int[] getAppWidgetIdsForHost(String callingPackage, int hostId); IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, @@ -64,10 +64,10 @@ interface IAppWidgetService { AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId); boolean hasBindAppWidgetPermission(in String packageName, int userId); void setBindAppWidgetPermission(in String packageName, int userId, in boolean permission); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean bindAppWidgetId(in String callingPackage, int appWidgetId, int providerProfileId, in ComponentName providerComponent, in Bundle options); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean bindRemoteViewsService(String callingPackage, int appWidgetId, in Intent intent, IApplicationThread caller, IBinder token, IServiceConnection connection, int flags); diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 140c410e8de6..7b6df6c7118a 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -63,7 +63,7 @@ public class MetricsLogger { public static final int LOGTAG = EventLogTags.SYSUI_MULTI_ACTION; /** Write an event log record, consisting of content.serialize(). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void write(LogMaker content) { if (content.getType() == MetricsEvent.TYPE_UNKNOWN) { content.setType(MetricsEvent.TYPE_ACTION); diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index b4727499d8ef..a17f5f5f8910 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -236,7 +236,7 @@ public final class VpnProfile implements Cloneable, Parcelable { * *

See {@link #encode()} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static VpnProfile decode(String key, byte[] value) { try { if (key == null) { diff --git a/core/java/com/android/internal/os/BaseCommand.java b/core/java/com/android/internal/os/BaseCommand.java index 32442f0472bb..c110b263e781 100644 --- a/core/java/com/android/internal/os/BaseCommand.java +++ b/core/java/com/android/internal/os/BaseCommand.java @@ -19,12 +19,13 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BasicShellCommandHandler; +import android.os.Build; import java.io.PrintStream; public abstract class BaseCommand { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final protected BasicShellCommandHandler mArgs = new BasicShellCommandHandler() { @Override public int onCommand(String cmd) { return 0; @@ -40,7 +41,7 @@ public abstract class BaseCommand { private String[] mRawArgs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public BaseCommand() { } diff --git a/core/java/com/android/internal/os/BatterySipper.java b/core/java/com/android/internal/os/BatterySipper.java index 2620ba0749a9..5337ac3cc27e 100644 --- a/core/java/com/android/internal/os/BatterySipper.java +++ b/core/java/com/android/internal/os/BatterySipper.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; import android.os.BatteryStats.Uid; +import android.os.Build; import java.util.List; @@ -120,7 +121,7 @@ public class BatterySipper implements Comparable { public double audioPowerMah; public double bluetoothPowerMah; public double cameraPowerMah; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public double cpuPowerMah; public double flashlightPowerMah; public double gpsPowerMah; diff --git a/core/java/com/android/internal/os/BatteryStatsHelper.java b/core/java/com/android/internal/os/BatteryStatsHelper.java index 3dfa3c3f6906..92dd4dda39df 100644 --- a/core/java/com/android/internal/os/BatteryStatsHelper.java +++ b/core/java/com/android/internal/os/BatteryStatsHelper.java @@ -26,6 +26,7 @@ import android.hardware.SensorManager; import android.net.ConnectivityManager; import android.os.BatteryStats; import android.os.BatteryStats.Uid; +import android.os.Build; import android.os.Bundle; import android.os.MemoryFile; import android.os.Parcel; @@ -272,7 +273,7 @@ public class BatteryStatsHelper { return mStats; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Intent getBatteryBroadcast() { if (mBatteryBroadcast == null && mCollectBatteryBroadcast) { load(); @@ -361,7 +362,7 @@ public class BatteryStatsHelper { /** * Refreshes the power usage list. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void refreshStats(int statsType, SparseArray asUsers) { refreshStats(statsType, asUsers, SystemClock.elapsedRealtime() * 1000, SystemClock.uptimeMillis() * 1000); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index b986463a62f7..e7e75a84643b 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -13558,7 +13558,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDischargeStartLevel() { synchronized(this) { return getDischargeStartLevelLocked(); @@ -13570,7 +13570,7 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDischargeCurrentLevel() { synchronized(this) { return getDischargeCurrentLevelLocked(); diff --git a/core/java/com/android/internal/os/ClassLoaderFactory.java b/core/java/com/android/internal/os/ClassLoaderFactory.java index f83c5bdc4e28..d347f2e21dd2 100644 --- a/core/java/com/android/internal/os/ClassLoaderFactory.java +++ b/core/java/com/android/internal/os/ClassLoaderFactory.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Trace; import dalvik.system.DelegateLastClassLoader; @@ -139,7 +140,7 @@ public class ClassLoaderFactory { return classLoader; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native String createClassloaderNamespace(ClassLoader classLoader, int targetSdkVersion, String librarySearchPath, diff --git a/core/java/com/android/internal/os/FuseAppLoop.java b/core/java/com/android/internal/os/FuseAppLoop.java index 2393036b5a38..1c6c6a73b44d 100644 --- a/core/java/com/android/internal/os/FuseAppLoop.java +++ b/core/java/com/android/internal/os/FuseAppLoop.java @@ -19,6 +19,7 @@ package com.android.internal.os; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.ParcelFileDescriptor; @@ -230,7 +231,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void onCommand(int command, long unique, long inode, long offset, int size, byte[] data) { synchronized (mLock) { @@ -259,7 +260,7 @@ public class FuseAppLoop implements Handler.Callback { // Called by JNI. @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private byte[] onOpen(long unique, long inode) { synchronized (mLock) { try { diff --git a/core/java/com/android/internal/os/ProcessCpuTracker.java b/core/java/com/android/internal/os/ProcessCpuTracker.java index 8e0546e6a86c..6d5cb67352b3 100644 --- a/core/java/com/android/internal/os/ProcessCpuTracker.java +++ b/core/java/com/android/internal/os/ProcessCpuTracker.java @@ -24,6 +24,7 @@ import static android.os.Process.PROC_PARENS; import static android.os.Process.PROC_SPACE_TERM; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.CpuUsageProto; import android.os.Process; import android.os.StrictMode; @@ -200,7 +201,7 @@ public class ProcessCpuTracker { public boolean interesting; public String baseName; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String name; public int nameWidth; @@ -216,7 +217,7 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long rel_uptime; /** @@ -232,13 +233,13 @@ public class ProcessCpuTracker { /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int rel_utime; /** * Time in milliseconds. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int rel_stime; public long base_minfaults; @@ -732,13 +733,13 @@ public class ProcessCpuTracker { return statses; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final public int countWorkingStats() { buildWorkingProcs(); return mWorkingProcs.size(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final public Stats getWorkingStats(int index) { return mWorkingProcs.get(index); } diff --git a/core/java/com/android/internal/os/SomeArgs.java b/core/java/com/android/internal/os/SomeArgs.java index 003f61079dcf..5ec882cee3c8 100644 --- a/core/java/com/android/internal/os/SomeArgs.java +++ b/core/java/com/android/internal/os/SomeArgs.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Helper class for passing more arguments though a message @@ -42,11 +43,11 @@ public final class SomeArgs { static final int WAIT_FINISHED = 2; int mWaitState = WAIT_NONE; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Object arg3; public Object arg4; public Object arg5; @@ -55,9 +56,9 @@ public final class SomeArgs { public Object arg8; public Object arg9; public int argi1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int argi2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int argi3; public int argi4; public int argi5; @@ -67,7 +68,7 @@ public final class SomeArgs { /* do nothing - reduce visibility */ } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SomeArgs obtain() { synchronized (sPoolLock) { if (sPoolSize > 0) { @@ -93,7 +94,7 @@ public final class SomeArgs { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void recycle() { if (mInPool) { throw new IllegalStateException("Already recycled."); diff --git a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 313bd42fe8c1..a28a66376497 100644 --- a/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/core/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -51,7 +51,7 @@ interface ITelephonyRegistry { boolean notifyNow); void listenForSubscriber(in int subId, String pkg, String featureId, IPhoneStateListener callback, long events, boolean notifyNow); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void notifyCallStateForAllSubs(int state, String incomingNumber); void notifyCallState(in int phoneId, in int subId, int state, String incomingNumber); void notifyServiceStateForPhoneId(in int phoneId, in int subId, in ServiceState state); diff --git a/core/java/com/android/internal/util/ArrayUtils.java b/core/java/com/android/internal/util/ArrayUtils.java index c6dea18d77d1..5571a58a8999 100644 --- a/core/java/com/android/internal/util/ArrayUtils.java +++ b/core/java/com/android/internal/util/ArrayUtils.java @@ -19,6 +19,7 @@ package com.android.internal.util; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.ArraySet; import dalvik.system.VMRuntime; @@ -56,7 +57,7 @@ public class ArrayUtils { return (char[])VMRuntime.getRuntime().newUnpaddedArray(char.class, minLen); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int[] newUnpaddedIntArray(int minLen) { return (int[])VMRuntime.getRuntime().newUnpaddedArray(int.class, minLen); } @@ -77,7 +78,7 @@ public class ArrayUtils { return (Object[])VMRuntime.getRuntime().newUnpaddedArray(Object.class, minLen); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static T[] newUnpaddedArray(Class clazz, int minLen) { return (T[])VMRuntime.getRuntime().newUnpaddedArray(clazz, minLen); @@ -386,7 +387,7 @@ public class ArrayUtils { * Adds value to given array if not already present, providing set-like * behavior. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static @NonNull T[] appendElement(Class kind, @Nullable T[] array, T element) { return appendElement(kind, array, element, false); @@ -416,7 +417,7 @@ public class ArrayUtils { /** * Removes value from given array if present, providing set-like behavior. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @SuppressWarnings("unchecked") public static @Nullable T[] removeElement(Class kind, @Nullable T[] array, T element) { if (array != null) { diff --git a/core/java/com/android/internal/util/AsyncChannel.java b/core/java/com/android/internal/util/AsyncChannel.java index 7e3c171abfa6..0e8c92991b66 100644 --- a/core/java/com/android/internal/util/AsyncChannel.java +++ b/core/java/com/android/internal/util/AsyncChannel.java @@ -401,7 +401,7 @@ public class AsyncChannel { * @param srcHandler * @param dstMessenger */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void connected(Context srcContext, Handler srcHandler, Messenger dstMessenger) { if (DBG) log("connected srcHandler to the dstMessenger E"); @@ -514,7 +514,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -606,7 +606,7 @@ public class AsyncChannel { * @param what * @param arg1 */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, int arg1) { Message msg = Message.obtain(); msg.what = what; @@ -639,7 +639,7 @@ public class AsyncChannel { * @param arg2 * @param obj */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, int arg1, int arg2, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -656,7 +656,7 @@ public class AsyncChannel { * @param what * @param obj */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void replyToMessage(Message srcMsg, int what, Object obj) { Message msg = Message.obtain(); msg.what = what; @@ -670,7 +670,7 @@ public class AsyncChannel { * @param msg to send * @return reply message or null if an error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Message sendMessageSynchronously(Message msg) { Message resultMsg = SyncMessenger.sendMessageSynchronously(mDstMessenger, msg); return resultMsg; @@ -712,7 +712,7 @@ public class AsyncChannel { * @param arg2 * @return reply message or null if an error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Message sendMessageSynchronously(int what, int arg1, int arg2) { Message msg = Message.obtain(); msg.what = what; diff --git a/core/java/com/android/internal/util/GrowingArrayUtils.java b/core/java/com/android/internal/util/GrowingArrayUtils.java index 597fe6b53d11..8c12e36a27d1 100644 --- a/core/java/com/android/internal/util/GrowingArrayUtils.java +++ b/core/java/com/android/internal/util/GrowingArrayUtils.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A helper class that aims to provide comparable growth performance to ArrayList, but on primitive @@ -39,7 +40,7 @@ public final class GrowingArrayUtils { * @return the array to which the element was appended. This may be different than the given * array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static T[] append(T[] array, int currentSize, T element) { assert currentSize <= array.length; @@ -57,7 +58,7 @@ public final class GrowingArrayUtils { /** * Primitive int version of {@link #append(Object[], int, Object)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int[] append(int[] array, int currentSize, int element) { assert currentSize <= array.length; diff --git a/core/java/com/android/internal/util/HexDump.java b/core/java/com/android/internal/util/HexDump.java index ad88dd6deec6..6468cafe85d4 100644 --- a/core/java/com/android/internal/util/HexDump.java +++ b/core/java/com/android/internal/util/HexDump.java @@ -107,7 +107,7 @@ public class HexDump return toHexString(array, 0, array.length, true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) public static String toHexString(byte[] array, boolean upperCase) { return toHexString(array, 0, array.length, upperCase); diff --git a/core/java/com/android/internal/util/IndentingPrintWriter.java b/core/java/com/android/internal/util/IndentingPrintWriter.java index 2435afb61083..520f5184260a 100644 --- a/core/java/com/android/internal/util/IndentingPrintWriter.java +++ b/core/java/com/android/internal/util/IndentingPrintWriter.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.Writer; @@ -26,7 +27,7 @@ import java.io.Writer; @Deprecated public class IndentingPrintWriter extends android.util.IndentingPrintWriter { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter(Writer writer, String singleIndent) { super(writer, singleIndent, -1); } @@ -49,13 +50,13 @@ public class IndentingPrintWriter extends android.util.IndentingPrintWriter { return this; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter increaseIndent() { super.increaseIndent(); return this; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IndentingPrintWriter decreaseIndent() { super.decreaseIndent(); return this; diff --git a/core/java/com/android/internal/util/MemInfoReader.java b/core/java/com/android/internal/util/MemInfoReader.java index 5de77d9b0545..0c5c8537e85a 100644 --- a/core/java/com/android/internal/util/MemInfoReader.java +++ b/core/java/com/android/internal/util/MemInfoReader.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Debug; import android.os.StrictMode; @@ -51,7 +52,7 @@ public final class MemInfoReader { /** * Amount of RAM that is not being used for anything. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getFreeSize() { return mInfos[Debug.MEMINFO_FREE] * 1024; } @@ -60,7 +61,7 @@ public final class MemInfoReader { * Amount of RAM that the kernel is being used for caches, not counting caches * that are mapped in to processes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getCachedSize() { return getCachedSizeKb() * 1024; } diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java index 4d441cd98a96..88e4e355000a 100644 --- a/core/java/com/android/internal/util/Preconditions.java +++ b/core/java/com/android/internal/util/Preconditions.java @@ -19,6 +19,7 @@ package com.android.internal.util; import android.annotation.IntRange; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.text.TextUtils; import java.util.Arrays; @@ -52,7 +53,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalArgumentException if {@code expression} is false */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void checkArgument(boolean expression, final Object errorMessage) { if (!expression) { throw new IllegalArgumentException(String.valueOf(errorMessage)); @@ -208,7 +209,7 @@ public class Preconditions { * be converted to a string using {@link String#valueOf(Object)} * @throws IllegalStateException if {@code expression} is false */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void checkState(final boolean expression, String errorMessage) { if (!expression) { throw new IllegalStateException(errorMessage); @@ -518,7 +519,7 @@ public class Preconditions { * * @throws IllegalArgumentException if {@code value} was not within the range */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int checkArgumentInRange(int value, int lower, int upper, String valueName) { if (value < lower) { diff --git a/core/java/com/android/internal/util/State.java b/core/java/com/android/internal/util/State.java index 636378e32091..4613dad8cc67 100644 --- a/core/java/com/android/internal/util/State.java +++ b/core/java/com/android/internal/util/State.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; /** @@ -44,7 +45,7 @@ public class State implements IState { /* (non-Javadoc) * @see com.android.internal.util.IState#exit() */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public void exit() { } diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java index 7a79cc9ef868..4cff785cd671 100644 --- a/core/java/com/android/internal/util/StateMachine.java +++ b/core/java/com/android/internal/util/StateMachine.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -1324,7 +1325,7 @@ public class StateMachine { * * @param name of the state machine */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected StateMachine(String name, Handler handler) { initStateMachine(name, handler.getLooper()); } @@ -1357,7 +1358,7 @@ public class StateMachine { * Add a new state to the state machine, parent will be null * @param state to add */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void addState(State state) { mSmHandler.addState(state, null); } @@ -1376,7 +1377,7 @@ public class StateMachine { * * @param initialState is the state which will receive the first message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void setInitialState(State initialState) { mSmHandler.setInitialState(initialState); } @@ -1415,7 +1416,7 @@ public class StateMachine { * * @param destState will be the state that receives the next message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final void transitionTo(IState destState) { mSmHandler.transitionTo(destState); } @@ -1700,7 +1701,7 @@ public class StateMachine { * @param obj is assigned to Message.obj * @return A Message object from the global pool */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final Message obtainMessage(int what, int arg1, int arg2, Object obj) { return Message.obtain(mSmHandler, what, arg1, arg2, obj); } @@ -1738,7 +1739,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -1765,7 +1766,7 @@ public class StateMachine { * * Message is ignored if state machine has quit. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendMessage(int what, int arg1, int arg2, Object obj) { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2066,7 +2067,7 @@ public class StateMachine { /** * Start the state machine. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void start() { // mSmHandler can be null if the state machine has quit. SmHandler smh = mSmHandler; @@ -2083,7 +2084,7 @@ public class StateMachine { * @param pw * @param args */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(getName() + ":"); pw.println(" total records=" + getLogRecCount()); diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index cd5502c9f270..33ebe43cb23a 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -82,7 +82,7 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { private Looper mMainLooper; private Handler mH; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Object mLock = new Object(); @GuardedBy("mLock") private boolean mFinished = false; diff --git a/core/java/com/android/internal/view/menu/ActionMenu.java b/core/java/com/android/internal/view/menu/ActionMenu.java index 648262965ab1..c699ca193f2b 100644 --- a/core/java/com/android/internal/view/menu/ActionMenu.java +++ b/core/java/com/android/internal/view/menu/ActionMenu.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.Build; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -40,7 +41,7 @@ public class ActionMenu implements Menu { private ArrayList mItems; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionMenu(Context context) { mContext = context; mItems = new ArrayList(); diff --git a/core/java/com/android/internal/view/menu/ActionMenuItem.java b/core/java/com/android/internal/view/menu/ActionMenuItem.java index bd8bcb9cf81e..acb233e39cc8 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItem.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItem.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.os.Build; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; @@ -70,7 +71,7 @@ public class ActionMenuItem implements MenuItem { private static final int HIDDEN = 0x00000008; private static final int ENABLED = 0x00000010; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionMenuItem(Context context, int group, int id, int categoryOrder, int ordering, CharSequence title) { mContext = context; diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java index 7622b939b6eb..61536e8960e2 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java +++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcelable; import android.text.TextUtils; import android.util.AttributeSet; @@ -225,7 +226,7 @@ public class ActionMenuItemView extends TextView updateTextButtonVisibility(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasText() { return !TextUtils.isEmpty(getText()); } diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java index b31ae38b4566..0b490b20df0e 100644 --- a/core/java/com/android/internal/view/menu/MenuBuilder.java +++ b/core/java/com/android/internal/view/menu/MenuBuilder.java @@ -27,6 +27,7 @@ import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.util.SparseArray; @@ -210,7 +211,7 @@ public class MenuBuilder implements Menu { setShortcutsVisibleInner(true); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuBuilder setDefaultShowAsAction(int defaultShowAsAction) { mDefaultShowAsAction = defaultShowAsAction; return this; @@ -223,7 +224,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to add */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addMenuPresenter(MenuPresenter presenter) { addMenuPresenter(presenter, mContext); } @@ -250,7 +251,7 @@ public class MenuBuilder implements Menu { * * @param presenter The presenter to remove */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void removeMenuPresenter(MenuPresenter presenter) { for (WeakReference ref : mPresenters) { final MenuPresenter item = ref.get(); @@ -1015,7 +1016,7 @@ public class MenuBuilder implements Menu { * {@link #startDispatchingItemsChanged()} is called. Useful when * many menu operations are going to be performed as a batch. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void stopDispatchingItemsChanged() { if (!mPreventDispatchingItemsChanged) { mPreventDispatchingItemsChanged = true; @@ -1023,7 +1024,7 @@ public class MenuBuilder implements Menu { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startDispatchingItemsChanged() { mPreventDispatchingItemsChanged = false; @@ -1145,7 +1146,7 @@ public class MenuBuilder implements Menu { return mActionItems; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ArrayList getNonActionItems() { flagActionItems(); return mNonActionItems; diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 218f5185ec47..2452398a5348 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -25,6 +25,7 @@ import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.os.Build; import android.util.Log; import android.view.ActionProvider; import android.view.ContextMenu.ContextMenuInfo; @@ -662,17 +663,17 @@ public final class MenuItemImpl implements MenuItem { return mMenu.getOptionalIconsVisible(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isActionButton() { return (mFlags & IS_ACTION) == IS_ACTION; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean requestsActionButton() { return (mShowAsAction & SHOW_AS_ACTION_IF_ROOM) == SHOW_AS_ACTION_IF_ROOM; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean requiresActionButton() { return (mShowAsAction & SHOW_AS_ACTION_ALWAYS) == SHOW_AS_ACTION_ALWAYS; } diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index 980943ebea5a..c266d0218b31 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -23,6 +23,7 @@ import android.annotation.StyleRes; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.view.Gravity; import android.view.View; import android.view.WindowManager; @@ -47,14 +48,14 @@ public class MenuPopupHelper implements MenuHelper { // Mutable cached popup menu properties. private View mAnchorView; private int mDropDownGravity = Gravity.START; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mForceShowIcon; private Callback mPresenterCallback; private MenuPopup mPopup; private OnDismissListener mOnDismissListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu) { this(context, menu, null, false, com.android.internal.R.attr.popupMenuStyle, 0); } @@ -93,7 +94,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param anchor the view to which the popup window should be anchored */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAnchorView(@NonNull View anchor) { mAnchorView = anchor; } @@ -125,7 +126,7 @@ public class MenuPopupHelper implements MenuHelper { * * @param gravity alignment of the popup relative to the anchor */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setGravity(int gravity) { mDropDownGravity = gravity; } @@ -151,7 +152,7 @@ public class MenuPopupHelper implements MenuHelper { } @NonNull - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MenuPopup getPopup() { if (mPopup == null) { mPopup = createPopup(); @@ -165,7 +166,7 @@ public class MenuPopupHelper implements MenuHelper { * @return {@code true} if the popup was shown or was already showing prior to calling this * method, {@code false} otherwise */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean tryShow() { if (isShowing()) { return true; diff --git a/core/java/com/android/internal/view/menu/MenuPresenter.java b/core/java/com/android/internal/view/menu/MenuPresenter.java index 35b8fefe75ab..37155b9ff7fe 100644 --- a/core/java/com/android/internal/view/menu/MenuPresenter.java +++ b/core/java/com/android/internal/view/menu/MenuPresenter.java @@ -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.Parcelable; import android.view.ViewGroup; @@ -48,7 +49,7 @@ public interface MenuPresenter { * @return true if the Callback will handle presenting the submenu, false if * the presenter should attempt to do so. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean onOpenSubMenu(MenuBuilder subMenu); } diff --git a/core/java/com/android/internal/widget/AbsActionBarView.java b/core/java/com/android/internal/widget/AbsActionBarView.java index 0f0c1a3de3a2..914de6102fef 100644 --- a/core/java/com/android/internal/widget/AbsActionBarView.java +++ b/core/java/com/android/internal/widget/AbsActionBarView.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.ContextThemeWrapper; @@ -294,7 +295,7 @@ public abstract class AbsActionBarView extends ViewGroup { return isOverflowReserved() && getVisibility() == VISIBLE; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void dismissPopupMenus() { if (mActionMenuPresenter != null) { mActionMenuPresenter.dismissPopupMenus(); diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java index 051526ef2da7..80fc218839d5 100644 --- a/core/java/com/android/internal/widget/ActionBarContextView.java +++ b/core/java/com/android/internal/widget/ActionBarContextView.java @@ -19,6 +19,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ActionMode; @@ -58,7 +59,7 @@ public class ActionBarContextView extends AbsActionBarView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionBarContextView(Context context, AttributeSet attrs) { this(context, attrs, com.android.internal.R.attr.actionModeStyle); } diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index aca0b713686f..adbf645de74e 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -170,7 +170,7 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar init(context); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ActionBarOverlayLayout(Context context, AttributeSet attrs) { super(context, attrs); init(context); diff --git a/core/java/com/android/internal/widget/CachingIconView.java b/core/java/com/android/internal/widget/CachingIconView.java index 0bf323f8f493..4a70f7416075 100644 --- a/core/java/com/android/internal/widget/CachingIconView.java +++ b/core/java/com/android/internal/widget/CachingIconView.java @@ -28,6 +28,7 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.view.RemotableViewMethod; @@ -54,7 +55,7 @@ public class CachingIconView extends ImageView { private int mBackgroundColor; private boolean mWillBeForceHidden; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CachingIconView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); } diff --git a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl index d6efca5d36eb..c06dab9f75d6 100644 --- a/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl +++ b/core/java/com/android/internal/widget/IRemoteViewsFactory.aidl @@ -21,23 +21,23 @@ import android.widget.RemoteViews; /** {@hide} */ interface IRemoteViewsFactory { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onDataSetChanged(); oneway void onDataSetChangedAsync(); oneway void onDestroy(in Intent intent); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCount(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getViewAt(int position); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) RemoteViews getLoadingView(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getViewTypeCount(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) long getItemId(int position); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean hasStableIds(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isCreated(); } diff --git a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java index 9ef9f697c46c..f230ddb8b5ea 100644 --- a/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java +++ b/core/java/com/android/internal/widget/LinearLayoutWithDefaultTouchRecepient.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -46,7 +47,7 @@ public class LinearLayoutWithDefaultTouchRecepient extends LinearLayout { super(context, attrs); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDefaultTouchRecepient(View defaultTouchRecepient) { mDefaultTouchRecepient = defaultTouchRecepient; } diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index c0c7f100ef21..b562ef838633 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -35,6 +35,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.UserInfo; import android.os.AsyncTask; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -729,13 +730,13 @@ public class LockPatternUtils { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOwnerInfo(String info, int userId) { setString(LOCK_SCREEN_OWNER_INFO, info, userId); updateCryptoUserInfo(userId); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOwnerInfoEnabled(boolean enabled, int userId) { setBoolean(LOCK_SCREEN_OWNER_INFO_ENABLED, enabled, userId); updateCryptoUserInfo(userId); @@ -1113,7 +1114,7 @@ public class LockPatternUtils { return type != CREDENTIAL_TYPE_NONE; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isLockPasswordEnabled(int userId) { int type = getCredentialTypeForUser(userId); return type == CREDENTIAL_TYPE_PASSWORD || type == CREDENTIAL_TYPE_PIN; diff --git a/core/java/com/android/internal/widget/NumericTextView.java b/core/java/com/android/internal/widget/NumericTextView.java index c8f901133be6..e6cb24de9f94 100644 --- a/core/java/com/android/internal/widget/NumericTextView.java +++ b/core/java/com/android/internal/widget/NumericTextView.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; import android.view.KeyEvent; @@ -54,7 +55,7 @@ public class NumericTextView extends TextView { private OnValueChangedListener mListener; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NumericTextView(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/core/java/com/android/internal/widget/PreferenceImageView.java b/core/java/com/android/internal/widget/PreferenceImageView.java index 43b6b5a169c5..0ca98cfbdfb8 100644 --- a/core/java/com/android/internal/widget/PreferenceImageView.java +++ b/core/java/com/android/internal/widget/PreferenceImageView.java @@ -18,6 +18,7 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.widget.ImageView; @@ -30,7 +31,7 @@ public class PreferenceImageView extends ImageView { this(context, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PreferenceImageView(Context context, AttributeSet attrs) { this(context, attrs, 0); } diff --git a/core/java/com/android/internal/widget/RecyclerView.java b/core/java/com/android/internal/widget/RecyclerView.java index d7a01c4762f1..fd9e43081d10 100644 --- a/core/java/com/android/internal/widget/RecyclerView.java +++ b/core/java/com/android/internal/widget/RecyclerView.java @@ -4968,7 +4968,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro * constructed by {@link GapWorker} prefetch from being bound to a lower priority prefetch. */ static class ScrapData { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ArrayList mScrapHeap = new ArrayList<>(); int mMaxScrap = DEFAULT_MAX_SCRAP; long mCreateRunningAverageNs = 0; diff --git a/core/java/com/android/internal/widget/ScrollBarUtils.java b/core/java/com/android/internal/widget/ScrollBarUtils.java index 3e9d697a0ace..0108bd4a27cf 100644 --- a/core/java/com/android/internal/widget/ScrollBarUtils.java +++ b/core/java/com/android/internal/widget/ScrollBarUtils.java @@ -17,10 +17,11 @@ package com.android.internal.widget; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class ScrollBarUtils { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getThumbLength(int size, int thickness, int extent, int range) { // Avoid the tiny thumb. final int minLength = thickness * 2; diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index aa0b0bbd4c19..d3029676cbb2 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.TextUtils; import android.text.TextUtils.TruncateAt; import android.view.Gravity; @@ -224,7 +225,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView mStackedTabMaxWidth = abp.getStackedTabMaxWidth(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void animateToVisibility(int visibility) { if (mVisibilityAnim != null) { mVisibilityAnim.cancel(); @@ -249,7 +250,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void animateToTab(final int position) { final View tabView = mTabLayout.getChildAt(position); if (mTabSelector != null) { @@ -331,7 +332,7 @@ public class ScrollingTabContainerView extends HorizontalScrollView } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void updateTab(int position) { ((TabView) mTabLayout.getChildAt(position)).update(); if (mTabSpinner != null) { diff --git a/core/java/com/android/server/net/NetlinkTracker.java b/core/java/com/android/server/net/NetlinkTracker.java index b57397f46a7e..197984fc7dcd 100644 --- a/core/java/com/android/server/net/NetlinkTracker.java +++ b/core/java/com/android/server/net/NetlinkTracker.java @@ -20,6 +20,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.RouteInfo; +import android.os.Build; import android.util.Log; import java.net.InetAddress; @@ -80,7 +81,7 @@ public class NetlinkTracker extends BaseNetworkObserver { private static final boolean DBG = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public NetlinkTracker(String iface, Callback callback) { TAG = "NetlinkTracker/" + iface; mInterfaceName = iface; @@ -189,12 +190,12 @@ public class NetlinkTracker extends BaseNetworkObserver { /** * Returns a copy of this object's LinkProperties. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public synchronized LinkProperties getLinkProperties() { return new LinkProperties(mLinkProperties); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public synchronized void clearLinkProperties() { // Clear the repository before clearing mLinkProperties. That way, if a clear() happens // while interfaceDnsServerInfo() is being called, we'll end up with no DNS servers in diff --git a/core/java/com/google/android/collect/Sets.java b/core/java/com/google/android/collect/Sets.java index c67a88a19080..e2429157d529 100644 --- a/core/java/com/google/android/collect/Sets.java +++ b/core/java/com/google/android/collect/Sets.java @@ -17,6 +17,7 @@ package com.google.android.collect; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.ArraySet; import java.util.Collections; @@ -107,7 +108,7 @@ public class Sets { /** * Creates a {@code ArraySet} instance containing the given elements. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ArraySet newArraySet(E... elements) { int capacity = elements.length * 4 / 3 + 1; ArraySet set = new ArraySet(capacity); diff --git a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java index e1fe1bdbdd5f..25091263b2b0 100644 --- a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -182,7 +182,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { private final SSLContext sslcontext; @UnsupportedAppUsage private final javax.net.ssl.SSLSocketFactory socketfactory; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final HostNameResolver nameResolver; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; @@ -262,7 +262,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { this.nameResolver = null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static KeyManager[] createKeyManagers(final KeyStore keystore, final String password) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException { if (keystore == null) { @@ -274,7 +274,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { return kmfactory.getKeyManagers(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static TrustManager[] createTrustManagers(final KeyStore keystore) throws KeyStoreException, NoSuchAlgorithmException { if (keystore == null) { diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 4f95a53e0ec8..055e5ad17def 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -80,7 +80,7 @@ public final class Bitmap implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123769491) private byte[] mNinePatchChunk; // may be null - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NinePatch.InsetStruct mNinePatchInsets; // may be null @UnsupportedAppUsage private int mWidth; @@ -176,7 +176,7 @@ public final class Bitmap implements Parcelable { * width/height values */ @SuppressWarnings("unused") // called from JNI - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void reinit(int width, int height, boolean requestPremultiplied) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index bad487b47682..ef1e7bfc6651 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Trace; import android.util.DisplayMetrics; import android.util.Log; @@ -875,7 +876,7 @@ public class BitmapFactory { @UnsupportedAppUsage private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); @UnsupportedAppUsage diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 829d0f4be513..42e6ab9c830c 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1355,7 +1355,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1379,7 +1379,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index 4263772c1c2c..e949584b0659 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -17,6 +17,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.VirtualRefBasePtr; @@ -28,12 +29,12 @@ public final class CanvasProperty { private VirtualRefBasePtr mProperty; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createFloat(float initialValue) { return new CanvasProperty(nCreateFloat(initialValue)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createPaint(Paint initialValue) { return new CanvasProperty(nCreatePaint(initialValue.getNativeInstance())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index a8b18a9fcb1f..90ff1899f34d 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that transforms colors through a 4x5 color matrix. This filter @@ -107,7 +108,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMatrixArray(@Nullable float[] array) { // called '...Array' so that passing null isn't ambiguous discardNativeInstance(); diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index c146bbd4441b..0782f8dfd9d3 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; +import android.os.Build; import android.text.FontConfig; import android.util.Xml; @@ -38,7 +39,7 @@ import java.util.regex.Pattern; public class FontListParser { /* Parse fallback list (no names) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static FontConfig parse(InputStream in) throws XmlPullParserException, IOException { return parse(in, "/system/fonts"); } diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index 2c25f4546771..f9113a21405c 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.HardwareBuffer; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +56,7 @@ public class GraphicBuffer implements Parcelable { private final int mFormat; private final int mUsage; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final long mNativeObject; // These two fields are only used by lock/unlockCanvas() @@ -87,7 +88,7 @@ public class GraphicBuffer implements Parcelable { /** * Private use only. See {@link #create(int, int, int, int)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index 221dfa192795..df91c5d492bd 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -23,6 +23,7 @@ package android.graphics; import android.annotation.ColorInt; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to simulate simple lighting effects. @@ -73,7 +74,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMultiply(@ColorInt int mul) { if (mMul != mul) { mMul = mul; @@ -99,7 +100,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorAdd(@ColorInt int add) { if (mAdd != add) { mAdd = add; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index ebe34cad0654..4eedbf563865 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -21,20 +21,21 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class LinearGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. @@ -44,7 +45,7 @@ public class LinearGradient extends Shader { @UnsupportedAppUsage @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index 4b3924f0d55f..9c9535d16aab 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -28,7 +28,7 @@ import java.io.InputStream; */ @Deprecated public class Movie { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeMovie; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index a191fe56b31d..4b6e4d124b48 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -53,7 +53,7 @@ import java.util.Locale; */ public class Paint { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 7811671b80d6..e5ef10d1d555 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -48,12 +49,12 @@ public class Path { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSimplePath = true; /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 50ecb62e7fcc..0700f217ecf0 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to tint the source pixels using a single @@ -64,7 +65,7 @@ public class PorterDuffColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PorterDuff.Mode getMode() { return mMode; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index 864331a9674e..dd1be1570d79 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -22,17 +22,18 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class RadialGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mRadius; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; private final float mFocalX; @@ -40,13 +41,13 @@ public class RadialGradient extends Shader { private final float mFocalRadius; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mCenterColor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mEdgeColor; diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index 43373ffbd3f4..29708738d2db 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Pools.SynchronizedPool; @@ -32,7 +33,7 @@ public class Region implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long mNativeRegion; // the native values for these must match up with the enum in SkRegion.h @@ -337,7 +338,7 @@ public class Region implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void recycle() { setEmpty(); sPool.release(this); @@ -411,7 +412,7 @@ public class Region implements Parcelable { /* Add an unused parameter so constructor can be called from jni without triggering 'not cloneable' exception */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Region(long ni, int unused) { this(ni); } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 228d03a1dd10..7a2e5843ffc7 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -69,17 +70,17 @@ import java.lang.ref.WeakReference; */ public class SurfaceTexture { private final Looper mCreatorLooper; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Handler mOnFrameAvailableHandler; /** * These fields are used by native code, do not access or modify. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mSurfaceTexture; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mProducer; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mFrameAvailableListener; private boolean mIsSingleBuffered; @@ -390,7 +391,7 @@ public class SurfaceTexture { * This method is invoked from native code only. */ @SuppressWarnings({"UnusedDeclaration"}) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(WeakReference weakSelf) { SurfaceTexture st = weakSelf.get(); if (st != null) { diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index f1ca1986bfa0..22807805e7fa 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -21,23 +21,24 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class SweepGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCx; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCy; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index ecb0ff43a9e2..b143be7b4d6a 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -1217,7 +1217,7 @@ public class Typeface { long native_instance, List axes); @UnsupportedAppUsage private static native long nativeCreateWeightAlias(long native_instance, int weight); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index e79fb76d806e..81769e2e21bf 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -22,6 +22,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Xfermode is the base class for objects that are called to implement custom @@ -32,6 +33,6 @@ import android.compat.annotation.UnsupportedAppUsage; */ public class Xfermode { static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int porterDuffMode = DEFAULT; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 06159d8a0558..33a6d38b698d 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -561,9 +561,9 @@ public class AnimatedStateListDrawable extends StateListDrawable { int[] mAnimThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) LongSparseLongArray mTransitions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SparseIntArray mStateIds; AnimatedStateListState(@Nullable AnimatedStateListState orig, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 73dbe65bd25b..33b09b8831ce 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -315,7 +315,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -1773,7 +1773,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } // onFinished: should be called from native - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void callOnFinished(VectorDrawableAnimatorRT set, int id) { set.mHandler.post(() -> set.onAnimationEnd(id)); } diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 2457ab85144f..f8dc61526ce6 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.view.ViewDebug; @@ -53,7 +54,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index ed210ab40b7a..28b3b04b827d 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -45,6 +45,7 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Region; import android.graphics.Xfermode; +import android.os.Build; import android.os.Trace; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -1715,7 +1716,7 @@ public abstract class Drawable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static BlendMode parseBlendMode(int value, BlendMode defaultMode) { switch (value) { case 3: return BlendMode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index 3408b64e7536..66752a2536d3 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.Theme; +import android.os.Build; import android.util.AttributeSet; import android.view.InflateException; @@ -50,7 +51,7 @@ public final class DrawableInflater { new HashMap<>(); private final Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ClassLoader mClassLoader; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index 98c38214adab..ebde75775e84 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -32,6 +32,7 @@ import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; @@ -47,7 +48,7 @@ import java.io.IOException; * Drawable container with only one child element. */ public abstract class DrawableWrapper extends Drawable implements Drawable.Callback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DrawableWrapperState mState; private Drawable mDrawable; private boolean mMutated; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index abf0e8a1fe89..32b310353b6c 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -170,7 +170,7 @@ public final class Icon implements Parcelable { * @return The length of the compressed bitmap byte array held by this {@link #TYPE_DATA} Icon. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDataLength() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataLength() on " + this); @@ -599,7 +599,7 @@ public final class Icon implements Parcelable { * Version of createWithResource that takes Resources. Do not use. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Icon createWithResource(Resources res, @DrawableRes int resId) { if (res == null) { throw new IllegalArgumentException("Resource must not be null."); @@ -771,7 +771,7 @@ public final class Icon implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasTint() { return (mTintList != null) || (mBlendMode != DEFAULT_BLEND_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 005a4d175fd5..87c0a061c9f2 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -27,6 +27,7 @@ import android.graphics.Insets; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -58,7 +59,7 @@ public class InsetDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); private final Rect mTmpInsetRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private InsetState mState; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 19f29aed203f..a03f8b566ddd 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -30,6 +30,7 @@ import android.graphics.ColorFilter; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.LayoutDirection; @@ -434,7 +435,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param layer The layer to add. * @return The index of the layer. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int addLayer(@NonNull ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 16ffd132a41b..8677fb1b7c1e 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -36,6 +36,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.util.AttributeSet; import com.android.internal.R; @@ -121,7 +122,7 @@ public class RippleDrawable extends LayerDrawable { private final Rect mDirtyBounds = new Rect(); /** Mirrors mLayerState with some extra information. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RippleState mState; /** The masking layer, e.g. the layer with id R.id.mask. */ @@ -159,7 +160,7 @@ public class RippleDrawable extends LayerDrawable { private Paint mRipplePaint; /** Target density of the display into which ripples are drawn. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDensity; /** Whether bounds are being overridden. */ @@ -979,7 +980,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index af7eed4b3897..7e246e552bec 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -25,6 +25,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; @@ -67,7 +68,7 @@ public class ScaleDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScaleState mState; ScaleDrawable() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index 88cd4625394b..af69029da9d7 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -22,6 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; @@ -130,7 +131,7 @@ public class StateListDrawable extends DrawableContainer { /** * Updates the constant state from the values in the typed array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateStateFromTypedArray(TypedArray a) { final StateListState state = mStateListState; @@ -208,7 +209,7 @@ public class StateListDrawable extends DrawableContainer { * @param attrs The attribute set. * @return An array of state_ attributes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int[] extractStateSet(AttributeSet attrs) { int j = 0; final int numAttrs = attrs.getAttributeCount(); diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index a1ccc7b7b5e4..6dcc251c2ddc 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.os.Trace; import android.util.ArrayMap; import android.util.AttributeSet; @@ -324,7 +325,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PorterDuffColorFilter mTintFilter; private BlendModeColorFilter mBlendModeColorFilter; diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 4e6580ea5f53..7bd581723d18 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -33,7 +33,7 @@ public final class FontVariationAxis { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mTag; private final String mTagString; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float mStyleValue; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 43de4699381f..4666963b5dd4 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -25,6 +25,7 @@ import android.graphics.Bitmap.Config; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.ErrnoException; import android.system.Os; @@ -121,7 +122,7 @@ public final class PdfRenderer implements AutoCloseable { private ParcelFileDescriptor mInput; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Page mCurrentPage; /** @hide */ @@ -246,7 +247,7 @@ public final class PdfRenderer implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void doClose() { if (mCurrentPage != null) { mCurrentPage.close(); diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index f53a7dc922f0..8f5982cd4528 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -17,6 +17,7 @@ package android.security; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.org.bouncycastle.util.io.pem.PemReader; @@ -137,7 +138,7 @@ public class Credentials { * Convert objects to a PEM format which is used for * CA_CERTIFICATE and USER_CERTIFICATE entries. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static byte[] convertToPem(Certificate... objects) throws IOException, CertificateEncodingException { ByteArrayOutputStream bao = new ByteArrayOutputStream(); diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 88b614dc7eef..c70c986fcd6b 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -71,7 +71,7 @@ public class KeyStore { private static final String TAG = "KeyStore"; // ResponseCodes - see system/security/keystore/include/keystore/keystore.h - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NO_ERROR = 1; public static final int LOCKED = 2; public static final int UNINITIALIZED = 3; @@ -191,7 +191,7 @@ public class KeyStore { return mToken; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public State state(int userId) { final int ret; try { @@ -222,7 +222,7 @@ public class KeyStore { return get(key, uid, false); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] get(String key) { return get(key, UID_SELF); } @@ -282,7 +282,7 @@ public class KeyStore { return ret == NO_ERROR || ret == KEY_NOT_FOUND; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean delete(String key) { return delete(key, UID_SELF); } @@ -319,7 +319,7 @@ public class KeyStore { * List uids of all keys that are auth bound to the current user. * Only system is allowed to call this method. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int[] listUidsOfAuthBoundKeys() { // uids are returned as a list of strings because list of integers // as an output parameter is not supported by aidl-cpp. @@ -386,7 +386,7 @@ public class KeyStore { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean unlock(String password) { return unlock(UserHandle.getUserId(Process.myUid()), password); } @@ -1262,7 +1262,7 @@ public class KeyStore { * Returns a {@link KeyStoreException} corresponding to the provided keystore/keymaster error * code. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static KeyStoreException getKeyStoreException(int errorCode) { if (errorCode > 0) { // KeyStore layer error diff --git a/location/java/android/location/IGeofenceProvider.aidl b/location/java/android/location/IGeofenceProvider.aidl index 426ebef86b96..b1ef672024ac 100644 --- a/location/java/android/location/IGeofenceProvider.aidl +++ b/location/java/android/location/IGeofenceProvider.aidl @@ -24,6 +24,6 @@ import android.hardware.location.IGeofenceHardware; * {@hide} */ oneway interface IGeofenceProvider { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setGeofenceHardware(in IGeofenceHardware proxy); } diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 62b4bc173bb9..20175d70e735 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -129,7 +129,7 @@ public class Location implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mProvider; private long mTime = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mElapsedRealtimeNanos = 0; // Estimate of the relative precision of the alignment of this SystemClock // timestamp, with the reported measurements in nanoseconds (68% confidence). diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 158482a6a833..717074cba26f 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -502,7 +502,7 @@ public final class AudioAttributes implements Parcelable { @Retention(RetentionPolicy.SOURCE) public @interface CapturePolicy {} - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mUsage = USAGE_UNKNOWN; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mContentType = CONTENT_TYPE_UNKNOWN; @@ -511,7 +511,7 @@ public final class AudioAttributes implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mFlags = 0x0; private HashSet mTags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mFormattedTags; private Bundle mBundle; // lazy-initialized, may be null diff --git a/media/java/android/media/AudioDevicePort.java b/media/java/android/media/AudioDevicePort.java index f6b04540c5c7..0f79675862c7 100644 --- a/media/java/android/media/AudioDevicePort.java +++ b/media/java/android/media/AudioDevicePort.java @@ -18,6 +18,7 @@ package android.media; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Arrays; @@ -41,7 +42,7 @@ public class AudioDevicePort extends AudioPort { private final int[] mEncapsulationModes; private final int[] mEncapsulationMetadataTypes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioDevicePort(AudioHandle handle, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains, int type, String address, int[] encapsulationModes, diff --git a/media/java/android/media/AudioDevicePortConfig.java b/media/java/android/media/AudioDevicePortConfig.java index 51b8037b82f8..69fd82be179b 100644 --- a/media/java/android/media/AudioDevicePortConfig.java +++ b/media/java/android/media/AudioDevicePortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioDevicePortConfig describes a possible configuration of an output or input device @@ -28,7 +29,7 @@ import android.compat.annotation.UnsupportedAppUsage; */ public class AudioDevicePortConfig extends AudioPortConfig { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioDevicePortConfig(AudioDevicePort devicePort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)devicePort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 8a60bdebbf09..1d06e2837841 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -21,6 +21,7 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -685,7 +686,7 @@ public final class AudioFormat implements Parcelable { */ // Update sound trigger JNI in core/jni/android_hardware_SoundTrigger.cpp when modifying this // constructor - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioFormat(int encoding, int sampleRate, int channelMask, int channelIndexMask) { this( AUDIO_FORMAT_HAS_PROPERTY_ENCODING @@ -744,11 +745,11 @@ public final class AudioFormat implements Parcelable { // This is an immutable class, all member variables are final. // Essential values. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mEncoding; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mSampleRate; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mChannelMask; private final int mChannelIndexMask; private final int mPropertySetMask; diff --git a/media/java/android/media/AudioGain.java b/media/java/android/media/AudioGain.java index cae1b59d46a7..98dc06a6a996 100644 --- a/media/java/android/media/AudioGain.java +++ b/media/java/android/media/AudioGain.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioGain describes a gain controller. Gain controllers are exposed by @@ -71,7 +72,7 @@ public class AudioGain { // The channel mask passed to the constructor is as specified in AudioFormat // (e.g. AudioFormat.CHANNEL_OUT_STEREO) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioGain(int index, int mode, int channelMask, int minValue, int maxValue, int defaultValue, int stepValue, int rampDurationMinMs, int rampDurationMaxMs) { diff --git a/media/java/android/media/AudioHandle.java b/media/java/android/media/AudioHandle.java index 8fc834f8d0a9..ce51b5a33a9a 100644 --- a/media/java/android/media/AudioHandle.java +++ b/media/java/android/media/AudioHandle.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioHandle is used by the audio framework implementation to @@ -28,7 +29,7 @@ class AudioHandle { @UnsupportedAppUsage private final int mId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioHandle(int id) { mId = id; } diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8b28cc45fda2..29477366379b 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -709,7 +709,7 @@ public class AudioManager { * @hide * For test purposes only, will throw NPE with some methods that require a Context. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public AudioManager() { } @@ -959,7 +959,7 @@ public class AudioManager { * @see #setRingerMode(int) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isValidRingerMode(int ringerMode) { if (ringerMode < 0 || ringerMode > RINGER_MODE_MAX) { return false; @@ -2478,7 +2478,7 @@ public class AudioManager { * @see #stopBluetoothSco() * @see #ACTION_SCO_AUDIO_STATE_UPDATED */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startBluetoothScoVirtualCall() { final IAudioService service = getService(); try { @@ -2630,7 +2630,7 @@ public class AudioManager { * @param on set true to mute the microphone; * false to turn mute off */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setMicrophoneMuteFromSwitch(boolean on) { final IAudioService service = getService(); try { @@ -2890,7 +2890,7 @@ public class AudioManager { * display). Note that BT audio sinks are not considered remote devices. * @return true if {@link AudioManager#STREAM_MUSIC} is active on a remote device */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isMusicActiveRemotely() { return AudioSystem.isStreamActiveRemotely(STREAM_MUSIC, 0); } @@ -3041,7 +3041,7 @@ public class AudioManager { /** * @hide Number of sound effects */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NUM_SOUND_EFFECTS = 10; /** @@ -3875,7 +3875,7 @@ public class AudioManager { * @param durationHint the type of focus request. AUDIOFOCUS_GAIN_TRANSIENT is recommended so * media applications resume after a call */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void requestAudioFocusForCall(int streamType, int durationHint) { final IAudioService service = getService(); try { @@ -3979,7 +3979,7 @@ public class AudioManager { * when ringing ends and the call is rejected or not answered. * Should match one or more calls to {@link #requestAudioFocusForCall(int, int)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void abandonAudioFocusForCall() { final IAudioService service = getService(); try { @@ -4715,7 +4715,7 @@ public class AudioManager { * agent when audio settings are restored and causes the AudioService * to read and apply restored settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void reloadAudioSettings() { final IAudioService service = getService(); try { diff --git a/media/java/android/media/AudioMixPort.java b/media/java/android/media/AudioMixPort.java index 33d603f0b9da..0e286b0f1f89 100644 --- a/media/java/android/media/AudioMixPort.java +++ b/media/java/android/media/AudioMixPort.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * The AudioMixPort is a specialized type of AudioPort @@ -32,7 +33,7 @@ public class AudioMixPort extends AudioPort { private final int mIoHandle; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioMixPort(AudioHandle handle, int ioHandle, int role, String deviceName, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -53,7 +54,7 @@ public class AudioMixPort extends AudioPort { /** * Get the device type (e.g AudioManager.DEVICE_OUT_SPEAKER) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int ioHandle() { return mIoHandle; } diff --git a/media/java/android/media/AudioMixPortConfig.java b/media/java/android/media/AudioMixPortConfig.java index 9d8120624a45..483524a8c168 100644 --- a/media/java/android/media/AudioMixPortConfig.java +++ b/media/java/android/media/AudioMixPortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioMixPortConfig describes a possible configuration of an output or input mixer. @@ -28,7 +29,7 @@ import android.compat.annotation.UnsupportedAppUsage; public class AudioMixPortConfig extends AudioPortConfig { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioMixPortConfig(AudioMixPort mixPort, int samplingRate, int channelMask, int format, AudioGainConfig gain) { super((AudioPort)mixPort, samplingRate, channelMask, format, gain); diff --git a/media/java/android/media/AudioPatch.java b/media/java/android/media/AudioPatch.java index e5107d4e3309..99663bf3aab8 100644 --- a/media/java/android/media/AudioPatch.java +++ b/media/java/android/media/AudioPatch.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** @@ -36,7 +37,7 @@ public class AudioPatch { private final AudioPortConfig[] mSources; private final AudioPortConfig[] mSinks; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioPatch(AudioHandle patchHandle, AudioPortConfig[] sources, AudioPortConfig[] sinks) { mHandle = patchHandle; mSources = sources; diff --git a/media/java/android/media/AudioPort.java b/media/java/android/media/AudioPort.java index 7c3ca24e1c9a..e6dc622a11c1 100644 --- a/media/java/android/media/AudioPort.java +++ b/media/java/android/media/AudioPort.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An audio port is a node of the audio framework or hardware that can be connected to or @@ -82,7 +83,7 @@ public class AudioPort { @UnsupportedAppUsage private AudioPortConfig mActiveConfig; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) AudioPort(AudioHandle handle, int role, String name, int[] samplingRates, int[] channelMasks, int[] channelIndexMasks, int[] formats, AudioGain[] gains) { @@ -113,7 +114,7 @@ public class AudioPort { /** * Get the audio port role */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int role() { return mRole; } diff --git a/media/java/android/media/AudioPortConfig.java b/media/java/android/media/AudioPortConfig.java index 16fb5b80eb3e..4dd3cb699a7d 100644 --- a/media/java/android/media/AudioPortConfig.java +++ b/media/java/android/media/AudioPortConfig.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * An AudioPortConfig contains a possible configuration of an audio port chosen @@ -50,7 +51,7 @@ public class AudioPortConfig { static final int CHANNEL_MASK = 0x2; static final int FORMAT = 0x4; static final int GAIN = 0x8; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mConfigMask; @UnsupportedAppUsage diff --git a/media/java/android/media/AudioPortEventHandler.java b/media/java/android/media/AudioPortEventHandler.java index 8e8dfaf24b9a..763eb2944d19 100644 --- a/media/java/android/media/AudioPortEventHandler.java +++ b/media/java/android/media/AudioPortEventHandler.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -54,7 +55,7 @@ class AudioPortEventHandler { * Accessed by native methods: JNI Callback context. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mJniCallback; void init() { @@ -178,7 +179,7 @@ class AudioPortEventHandler { } @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object module_ref, int what, int arg1, int arg2, Object obj) { AudioPortEventHandler eventHandler = diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index c9cdbb0ed277..07c8ee514e07 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -30,6 +30,7 @@ import android.media.audiopolicy.AudioMix; import android.media.audiopolicy.AudioPolicy; import android.media.projection.MediaProjection; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -174,14 +175,14 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, * Accessed by native methods: provides access to the callback data. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeCallbackCookie; /** * Accessed by native methods: provides access to the JNIDeviceCallback instance. */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeDeviceCallback; @@ -261,7 +262,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, /** * AudioAttributes */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioAttributes mAudioAttributes; private boolean mIsSubmixFullVolume = false; @@ -1965,7 +1966,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object audiorecord_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/AudioRecordingConfiguration.java b/media/java/android/media/AudioRecordingConfiguration.java index 42841d178401..6febabe0aefc 100644 --- a/media/java/android/media/AudioRecordingConfiguration.java +++ b/media/java/android/media/AudioRecordingConfiguration.java @@ -23,6 +23,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.audiofx.AudioEffect; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -222,7 +223,7 @@ public final class AudioRecordingConfiguration implements Parcelable { *
When called without the permission, the result is an empty string. * @return the package name */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getClientPackageName() { return mClientPackageName; } /** diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 279ba0a55be0..39bdf9557595 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.media.audiofx.AudioEffect; import android.media.audiopolicy.AudioMix; +import android.os.Build; import android.telephony.TelephonyManager; import android.util.Log; import android.util.Pair; @@ -83,7 +84,7 @@ public class AudioSystem public static final int STREAM_BLUETOOTH_SCO = 6; /** @hide Used to identify the volume of audio streams for enforced system sounds in certain * countries (e.g camera in Japan) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int STREAM_SYSTEM_ENFORCED = 7; /** @hide Used to identify the volume of audio streams for DTMF tones */ public static final int STREAM_DTMF = 8; @@ -596,7 +597,7 @@ public class AudioSystem } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void dynamicPolicyCallbackFromNative(int event, String regId, int val) { DynamicPolicyCallback cb; @@ -673,7 +674,7 @@ public class AudioSystem * @param effects * @param activeSource */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void recordingCallbackFromNative(int event, int riid, int uid, int session, int source, int portId, boolean silenced, int[] recordingFormat, AudioEffect.Descriptor[] clientEffects, AudioEffect.Descriptor[] effects, @@ -1498,7 +1499,7 @@ public class AudioSystem @UnsupportedAppUsage public static native int setMasterMute(boolean mute); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native boolean getMasterMute(); /** @hide */ @UnsupportedAppUsage diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index fa6a4ff5af67..b2c2c4b1bbb4 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -27,6 +27,7 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -579,7 +580,7 @@ public class AudioTrack extends PlayerBase * the native AudioTrack object, but not stored in it). */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mJniData; @@ -875,7 +876,7 @@ public class AudioTrack extends PlayerBase /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ void deferred_connect(long nativeTrackInJavaObj) { if (mState != STATE_INITIALIZED) { // Note that for this native_setup, we are providing an already created/initialized @@ -4012,7 +4013,7 @@ public class AudioTrack extends PlayerBase // Java methods called from the native side //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object audiotrack_ref, int what, int arg1, int arg2, Object obj) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index 45f1ca044afb..06bf5f70d9ec 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -565,7 +565,7 @@ public class CamcorderProfile // Methods implemented by JNI @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native final void native_init(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native final CamcorderProfile native_get_camcorder_profile( int cameraId, int quality); private static native final boolean native_has_camcorder_profile( diff --git a/media/java/android/media/EncoderCapabilities.java b/media/java/android/media/EncoderCapabilities.java index 67ce0f7cc0b9..768b6431f1a9 100644 --- a/media/java/android/media/EncoderCapabilities.java +++ b/media/java/android/media/EncoderCapabilities.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.ArrayList; import java.util.List; @@ -44,19 +45,19 @@ public class EncoderCapabilities */ static public class VideoEncoderCap { // These are not modifiable externally, thus are public accessible - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mCodec; // @see android.media.MediaRecorder.VideoEncoder public final int mMinBitRate; // min bit rate (bps) public final int mMaxBitRate; // max bit rate (bps) public final int mMinFrameRate; // min frame rate (fps) public final int mMaxFrameRate; // max frame rate (fps) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMinFrameWidth; // min frame width (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMaxFrameWidth; // max frame width (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMinFrameHeight; // min frame height (pixel) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int mMaxFrameHeight; // max frame height (pixel) // Private constructor called by JNI @@ -134,7 +135,7 @@ public class EncoderCapabilities * Returns the capabilities of the supported video encoders. * @see android.media.EncoderCapabilities.VideoEncoderCap */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static List getVideoEncoders() { int nEncoders = native_get_num_video_encoders(); if (nEncoders == 0) return null; diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 47e60000cd04..5c012bef9a68 100755 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -79,7 +79,7 @@ interface IAudioService { void adjustStreamVolume(int streamType, int direction, int flags, String callingPackage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setStreamVolume(int streamType, int index, int flags, String callingPackage); oneway void handleVolumeKey(in KeyEvent event, boolean isOnTv, diff --git a/media/java/android/media/IRemoteDisplayCallback.aidl b/media/java/android/media/IRemoteDisplayCallback.aidl index 584417d65121..75813c9ba593 100644 --- a/media/java/android/media/IRemoteDisplayCallback.aidl +++ b/media/java/android/media/IRemoteDisplayCallback.aidl @@ -22,6 +22,6 @@ import android.media.RemoteDisplayState; * {@hide} */ oneway interface IRemoteDisplayCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onStateChanged(in RemoteDisplayState state); } diff --git a/media/java/android/media/JetPlayer.java b/media/java/android/media/JetPlayer.java index 84ee09b35b81..875c6f52d9b2 100644 --- a/media/java/android/media/JetPlayer.java +++ b/media/java/android/media/JetPlayer.java @@ -19,6 +19,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetFileDescriptor; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -130,7 +131,7 @@ public class JetPlayer * Accessed by native methods: provides access to C++ JetPlayer object */ @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativePlayerInJavaObj; @@ -564,7 +565,7 @@ public class JetPlayer // Called exclusively by native code //-------------------- @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(Object jetplayer_ref, int what, int arg1, int arg2) { //logd("Event posted from the native side: event="+ what + " args="+ arg1+" "+arg2); diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java index 78eeca1ccc05..9976fa11d177 100644 --- a/media/java/android/media/MediaMetadata.java +++ b/media/java/android/media/MediaMetadata.java @@ -26,6 +26,7 @@ import android.media.browse.MediaBrowser; import android.media.session.MediaController; import android.media.session.MediaSession; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -650,7 +651,7 @@ public final class MediaMetadata implements Parcelable { * @return The key used by this class or null if no mapping exists * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getKeyFromMetadataEditorKey(int editorKey) { return EDITOR_KEY_MAPPING.get(editorKey, null); } diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index 54675d018038..ac19c21ae085 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.media.MediaCodec.BufferInfo; +import android.os.Build; import dalvik.system.CloseGuard; @@ -286,10 +287,10 @@ final public class MediaMuxer { public @interface Format {} // All the native functions are listed here. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native long nativeSetup(@NonNull FileDescriptor fd, int format) throws IllegalArgumentException, IOException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native void nativeRelease(long nativeObject); private static native void nativeStart(long nativeObject); private static native void nativeStop(long nativeObject); @@ -303,22 +304,22 @@ final public class MediaMuxer { int offset, int size, long presentationTimeUs, @MediaCodec.BufferFlag int flags); // Muxer internal states. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_UNINITIALIZED = -1; private static final int MUXER_STATE_INITIALIZED = 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_STARTED = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int MUXER_STATE_STOPPED = 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mState = MUXER_STATE_UNINITIALIZED; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final CloseGuard mCloseGuard = CloseGuard.get(); private int mLastTrackIndex = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeObject; private String convertMuxerStateCodeToString(int aState) { diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 47d276a50034..42e39101de13 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -31,6 +31,7 @@ import android.graphics.SurfaceTexture; import android.media.SubtitleController.Anchor; import android.media.SubtitleTrack.RenderingWidget; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.FileUtils; import android.os.Handler; @@ -1152,7 +1153,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, headers, null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDataSource(String path, Map headers, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -1173,7 +1174,7 @@ public class MediaPlayer extends PlayerBase setDataSource(path, keys, values, cookies); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void setDataSource(String path, String[] keys, String[] values, List cookies) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { @@ -4410,7 +4411,7 @@ public class MediaPlayer extends PlayerBase * JAVA framework to avoid triggering track scanning. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_INFO_EXTERNAL_METADATA_UPDATE = 803; /** Informs that audio is not playing. Note that playback of the video @@ -4430,7 +4431,7 @@ public class MediaPlayer extends PlayerBase * * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int MEDIA_INFO_TIMED_TEXT_ERROR = 900; /** Subtitle track was not supported by the media framework. diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 1db02beaea1a..c61a2eb02921 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -108,7 +108,7 @@ public class MediaRecorder implements AudioRouting, private long mNativeContext; @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Surface mSurface; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 4d87fb3fa81f..4940c7647dbc 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -846,7 +846,7 @@ public class MediaRouter { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RouteInfo getSelectedRoute() { return getSelectedRoute(ROUTE_TYPE_ANY); } @@ -1776,7 +1776,7 @@ public class MediaRouter { return getName(context.getResources()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) CharSequence getName(Resources res) { if (mNameResId != 0) { return res.getText(mNameResId); diff --git a/media/java/android/media/MicrophoneInfo.java b/media/java/android/media/MicrophoneInfo.java index acd284f3fad9..9e2e25fa1a7f 100644 --- a/media/java/android/media/MicrophoneInfo.java +++ b/media/java/android/media/MicrophoneInfo.java @@ -19,6 +19,7 @@ package android.media; import android.annotation.IntDef; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Pair; import java.lang.annotation.Retention; @@ -164,7 +165,7 @@ public final class MicrophoneInfo { private int mType; private int mDirectionality; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) MicrophoneInfo(String deviceId, int type, String address, int location, int group, int indexInTheGroup, Coordinate3F position, Coordinate3F orientation, List> frequencyResponse, diff --git a/media/java/android/media/PlaybackParams.java b/media/java/android/media/PlaybackParams.java index f24f831d0333..080b9a4513ee 100644 --- a/media/java/android/media/PlaybackParams.java +++ b/media/java/android/media/PlaybackParams.java @@ -87,23 +87,23 @@ public final class PlaybackParams implements Parcelable { public static final int AUDIO_STRETCH_MODE_VOICE = 1; // flags to indicate which params are actually set - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_SPEED = 1 << 0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_PITCH = 1 << 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_AUDIO_FALLBACK_MODE = 1 << 2; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final int SET_AUDIO_STRETCH_MODE = 1 << 3; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSet = 0; // params - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAudioFallbackMode = AUDIO_FALLBACK_MODE_DEFAULT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mAudioStretchMode = AUDIO_STRETCH_MODE_DEFAULT; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mPitch = 1.0f; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private float mSpeed = 1.0f; diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index c5fd3c30236d..60a00529cb5d 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -24,6 +24,7 @@ import android.graphics.Bitmap; import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.PlaybackState; +import android.os.Build; import android.os.Bundle; import android.os.Looper; import android.os.SystemClock; @@ -816,7 +817,7 @@ import android.util.Log; * position updates. The playback position being "readable" is considered from the application's * point of view. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int MEDIA_POSITION_READABLE = 1 << 0; /** * @hide @@ -824,7 +825,7 @@ import android.util.Log; * playback position updates. The playback position being "writable" * is considered from the application's point of view. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int MEDIA_POSITION_WRITABLE = 1 << 1; /** @hide */ diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java index 35cfaca8562a..00fc2757a702 100644 --- a/media/java/android/media/RemoteController.java +++ b/media/java/android/media/RemoteController.java @@ -26,6 +26,7 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionLegacyHelper; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -78,7 +79,7 @@ import java.util.List; private int mArtworkHeight = -1; private boolean mEnabled = true; // synchronized on mInfoLock, for USE_SESSION apis. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private MediaController mCurrentSession; /** diff --git a/media/java/android/media/RemoteDisplay.java b/media/java/android/media/RemoteDisplay.java index e529af9da935..2a0e54d1b767 100644 --- a/media/java/android/media/RemoteDisplay.java +++ b/media/java/android/media/RemoteDisplay.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.view.Surface; @@ -127,7 +128,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayConnected(final Surface surface, final int width, final int height, final int flags, final int session) { mHandler.post(new Runnable() { @@ -139,7 +140,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayDisconnected() { mHandler.post(new Runnable() { @Override @@ -150,7 +151,7 @@ public final class RemoteDisplay { } // Called from native. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void notifyDisplayError(final int error) { mHandler.post(new Runnable() { @Override diff --git a/media/java/android/media/RemoteDisplayState.java b/media/java/android/media/RemoteDisplayState.java index fed361a960e6..370f5b1326f8 100644 --- a/media/java/android/media/RemoteDisplayState.java +++ b/media/java/android/media/RemoteDisplayState.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -41,10 +42,10 @@ public final class RemoteDisplayState implements Parcelable { /** * A list of all remote displays. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final ArrayList displays; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RemoteDisplayState() { displays = new ArrayList(); } diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index d02b49697821..bd783ce9f6b2 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -26,6 +26,7 @@ import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.RemoteException; import android.provider.MediaStore; import android.provider.MediaStore.MediaColumns; @@ -73,7 +74,7 @@ public class Ringtone { private final IRingtonePlayer mRemotePlayer; private final Binder mRemoteToken; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private MediaPlayer mLocalPlayer; private final MyOnCompletionListener mCompletionListener = new MyOnCompletionListener(); diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 9deeb8fbab16..e2e13b048cf7 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -36,6 +36,7 @@ import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.database.StaleDataException; import android.net.Uri; +import android.os.Build; import android.os.Environment; import android.os.FileUtils; import android.os.IBinder; @@ -585,7 +586,7 @@ public class RingtoneManager { return new ExternalRingtonesCursorWrapper(res, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Cursor getMediaRingtones(Context context) { // MediaStore now returns ringtones on other storage devices, even when // we don't have storage or audio permissions @@ -728,7 +729,7 @@ public class RingtoneManager { * @param volumeShaperConfig config for volume shaper of the ringtone if applied. * @see #getRingtone(Context, Uri) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static Ringtone getRingtone( final Context context, Uri ringtoneUri, int streamType, @Nullable VolumeShaper.Configuration volumeShaperConfig) { diff --git a/media/java/android/media/TimedText.java b/media/java/android/media/TimedText.java index 120642a8e7cb..fd615472903d 100644 --- a/media/java/android/media/TimedText.java +++ b/media/java/android/media/TimedText.java @@ -18,6 +18,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.Rect; +import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -736,7 +737,7 @@ public final class TimedText * List of CharPos, Karaoke, Font, Style, and HyperText, or 3) an instance of * Justification. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Object getObject(final int key) { if (containsKey(key)) { return mKeyObjectMap.get(key); diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java index cc114a9092e1..140e70d32c78 100644 --- a/media/java/android/media/ToneGenerator.java +++ b/media/java/android/media/ToneGenerator.java @@ -17,6 +17,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; @@ -895,6 +896,6 @@ public class ToneGenerator protected void finalize() { native_finalize(); } @SuppressWarnings("unused") - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeContext; // accessed by native methods } diff --git a/media/java/android/media/TtmlRenderer.java b/media/java/android/media/TtmlRenderer.java index e5782642f4eb..3a6c3909bbaf 100644 --- a/media/java/android/media/TtmlRenderer.java +++ b/media/java/android/media/TtmlRenderer.java @@ -18,6 +18,7 @@ package android.media; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; @@ -49,7 +50,7 @@ public class TtmlRenderer extends SubtitleController.Renderer { private TtmlRenderingWidget mRenderingWidget; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TtmlRenderer(Context context) { mContext = context; } diff --git a/media/java/android/media/VolumeShaper.java b/media/java/android/media/VolumeShaper.java index 99dfe1e8e32f..df8d08e8e846 100644 --- a/media/java/android/media/VolumeShaper.java +++ b/media/java/android/media/VolumeShaper.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -413,23 +414,23 @@ public final class VolumeShaper implements AutoCloseable { */ // type of VolumeShaper - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mType; // valid when mType is TYPE_ID - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mId; // valid when mType is TYPE_SCALE - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mOptionFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final double mDurationMs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mInterpolatorType; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float[] mTimes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float[] mVolumes; @Override @@ -572,7 +573,7 @@ public final class VolumeShaper implements AutoCloseable { * Direct constructor for VolumeShaper. * Use the Builder instead. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Configuration(@Type int type, int id, @OptionFlag int optionFlags, @@ -1132,11 +1133,11 @@ public final class VolumeShaper implements AutoCloseable { private static final int FLAG_PUBLIC_ALL = FLAG_REVERSE | FLAG_TERMINATE; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mReplaceId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float mXOffset; @Override @@ -1198,7 +1199,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Operation(@Flag int flags, int replaceId, float xOffset) { mFlags = flags; mReplaceId = replaceId; @@ -1358,9 +1359,9 @@ public final class VolumeShaper implements AutoCloseable { * Not for public use. */ public static final class State implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mVolume; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mXOffset; @Override @@ -1411,7 +1412,7 @@ public final class VolumeShaper implements AutoCloseable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) /* package */ State(float volume, float xOffset) { mVolume = volume; mXOffset = xOffset; diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index f4fd1fca2ff9..67a4a4b1f851 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -914,7 +914,7 @@ public class AudioEffect { * In case of success, the returns the number of meaningful integers in value array. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getParameter(int[] param, int[] value) throws IllegalStateException { if (param.length > 2 || value.length > 2) { @@ -983,7 +983,7 @@ public class AudioEffect { * @see #getParameter(byte[], byte[]) * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getParameter(int[] param, byte[] value) throws IllegalStateException { if (param.length > 2) { diff --git a/media/java/android/media/audiopolicy/AudioMix.java b/media/java/android/media/audiopolicy/AudioMix.java index 4e451c6e42b1..221147dcad8f 100644 --- a/media/java/android/media/audiopolicy/AudioMix.java +++ b/media/java/android/media/audiopolicy/AudioMix.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioSystem; +import android.os.Build; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -34,24 +35,24 @@ import java.util.Objects; @SystemApi public class AudioMix { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioMixingRule mRule; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AudioFormat mFormat; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mRouteFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMixType = MIX_TYPE_INVALID; // written by AudioPolicy int mMixState = MIX_STATE_DISABLED; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCallbackFlags; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) String mDeviceAddress; // initialized in constructor, read by AudioPolicyConfig - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mDeviceSystemType; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_* /** diff --git a/media/java/android/media/audiopolicy/AudioMixingRule.java b/media/java/android/media/audiopolicy/AudioMixingRule.java index f6f982a4ebe2..de153135eeb9 100644 --- a/media/java/android/media/audiopolicy/AudioMixingRule.java +++ b/media/java/android/media/audiopolicy/AudioMixingRule.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.media.AudioAttributes; +import android.os.Build; import android.os.Parcel; import android.util.Log; @@ -109,11 +110,11 @@ public class AudioMixingRule { /** @hide */ public static final class AudioMixMatchCriterion { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final AudioAttributes mAttr; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mIntProp; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) final int mRule; /** input parameters must be valid */ @@ -199,13 +200,13 @@ public class AudioMixingRule { private final int mTargetMixType; int getTargetMixType() { return mTargetMixType; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ArrayList mCriteria; /** @hide */ public ArrayList getCriteria() { return mCriteria; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mAllowPrivilegedPlaybackCapture = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private boolean mVoiceCommunicationCaptureAllowed = false; /** @hide */ diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index f582d2addf17..14b236890e4a 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -33,6 +33,7 @@ import android.media.VolumeProvider; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.net.Uri; import android.os.BadParcelableException; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -1390,7 +1391,7 @@ public final class MediaSession { public static final int UNKNOWN_ID = -1; private final MediaDescription mDescription; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final long mId; /** diff --git a/media/java/android/media/soundtrigger/SoundTriggerDetector.java b/media/java/android/media/soundtrigger/SoundTriggerDetector.java index 16a517b72119..0a1eefae59d6 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerDetector.java +++ b/media/java/android/media/soundtrigger/SoundTriggerDetector.java @@ -28,6 +28,7 @@ import android.hardware.soundtrigger.SoundTrigger; import android.hardware.soundtrigger.SoundTrigger.ModuleProperties; import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; import android.media.AudioFormat; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -192,7 +193,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public byte[] getData() { if (!mTriggerAvailable) { return mData; @@ -220,7 +221,7 @@ public final class SoundTriggerDetector { * @hide */ @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Integer getCaptureSession() { if (mCaptureAvailable) { return mCaptureSession; diff --git a/media/java/android/media/soundtrigger/SoundTriggerManager.java b/media/java/android/media/soundtrigger/SoundTriggerManager.java index 0ff8d9e96220..00e3bcebd0f3 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerManager.java +++ b/media/java/android/media/soundtrigger/SoundTriggerManager.java @@ -38,6 +38,7 @@ import android.media.permission.ClearCallingIdentityContext; import android.media.permission.Identity; import android.media.permission.SafeCloseable; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.ParcelUuid; @@ -382,7 +383,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int stopRecognition(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; @@ -399,7 +400,7 @@ public final class SoundTriggerManager { * @hide */ @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int unloadSoundModel(UUID soundModelId) { if (soundModelId == null) { return STATUS_ERROR; diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 377b2bc19c6b..195ad5bc10f9 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -38,6 +38,7 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiUtils; import android.hardware.hdmi.HdmiUtils.HdmiAddressRelativePosition; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -326,7 +327,7 @@ public final class TvInputInfo implements Parcelable { * Returns the component of the service that implements this TV input. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ComponentName getComponent() { return new ComponentName(mService.serviceInfo.packageName, mService.serviceInfo.name); } diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 95c4f2a025d7..945fb3bff936 100755 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -34,6 +34,7 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.media.PlaybackParams; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -406,7 +407,7 @@ public abstract class TvInputService extends Service { private OverlayViewCleanUpTask mOverlayViewCleanUpTask; private boolean mOverlayViewEnabled; private IBinder mWindowToken; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Rect mOverlayFrame; private long mStartPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; private long mCurrentPositionMs = TvInputManager.TIME_SHIFT_INVALID_TIME; diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index 1386cba5f9ca..ee70714ce763 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -32,6 +32,7 @@ import android.media.session.MediaSession; import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager.RemoteUserInfo; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -87,7 +88,7 @@ public abstract class MediaBrowserService extends Service { * A key for passing the MediaItem to the ResultReceiver in getItem. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String KEY_MEDIA_ITEM = "media_item"; private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 1 << 0; diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index 90b46fd5901a..80e64e01559a 100644 --- a/opengl/java/android/opengl/EGL14.java +++ b/opengl/java/android/opengl/EGL14.java @@ -20,6 +20,7 @@ package android.opengl; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.SurfaceTexture; +import android.os.Build; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -164,7 +165,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static native EGLDisplay eglGetDisplay( long display_id ); diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index ea571c7311a1..abdbd11828db 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -17,6 +17,7 @@ package javax.microedition.khronos.egl; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public interface EGL10 extends EGL { int EGL_SUCCESS = 0x3000; @@ -116,7 +117,7 @@ public interface EGL10 extends EGL { String eglQueryString(EGLDisplay display, int name); boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); /** @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) boolean eglReleaseThread(); boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface); boolean eglTerminate(EGLDisplay display); diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index df9d8019f28d..e47ec4b31700 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -19,6 +19,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Environment; import java.io.File; @@ -237,7 +238,7 @@ public class Font extends BaseObj { * * Returns default font if no match could be found. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) { String fileName = getFontFileName(familyName, fontStyle); String fontPath = Environment.getRootDirectory().getAbsolutePath(); diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 826225a70d86..1a4d1fd5afbb 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -17,6 +17,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Vector; @@ -606,7 +607,7 @@ public class Mesh extends BaseObj { * channels are present in the mesh * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder(RenderScript rs, int vtxSize, int flags) { mRS = rs; mVtxCount = 0; @@ -663,7 +664,7 @@ public class Mesh extends BaseObj { * @return this * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder addVertex(float x, float y) { if (mVtxSize != 2) { throw new IllegalStateException("add mistmatch with declared components."); @@ -769,7 +770,7 @@ public class Mesh extends BaseObj { * * @return this **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public TriangleMeshBuilder addTriangle(int idx1, int idx2, int idx3) { if((idx1 >= mMaxIndex) || (idx1 < 0) || (idx2 >= mMaxIndex) || (idx2 < 0) || @@ -802,7 +803,7 @@ public class Mesh extends BaseObj { * accessible memory * **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Mesh create(boolean uploadToBufferObject) { Element.Builder b = new Element.Builder(mRS); b.add(Element.createVector(mRS, diff --git a/rs/java/android/renderscript/ProgramStore.java b/rs/java/android/renderscript/ProgramStore.java index 7e61347ee218..1952b8860033 100644 --- a/rs/java/android/renderscript/ProgramStore.java +++ b/rs/java/android/renderscript/ProgramStore.java @@ -17,6 +17,7 @@ package android.renderscript; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** @@ -308,7 +309,7 @@ public class ProgramStore extends BaseObj { * * @param rs Context to which the program will belong. **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ProgramStore BLEND_ALPHA_DEPTH_NONE(RenderScript rs) { if(rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH == null) { ProgramStore.Builder builder = new ProgramStore.Builder(rs); diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java index aff2f0183a3b..2983e6339d4b 100644 --- a/telecomm/java/android/telecom/CallerInfo.java +++ b/telecomm/java/android/telecom/CallerInfo.java @@ -27,6 +27,7 @@ import android.graphics.drawable.Drawable; import android.location.Country; import android.location.CountryDetector; import android.net.Uri; +import android.os.Build; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; @@ -186,7 +187,7 @@ public class CallerInfo { private boolean mIsVoiceMail; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CallerInfo() { // TODO: Move all the basic initialization here? mIsEmergency = false; @@ -347,7 +348,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, Uri contactRef) { CallerInfo info = null; ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context); @@ -374,7 +375,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, String number) { if (VDBG) Log.v(TAG, "getCallerInfo() based on number..."); @@ -395,7 +396,7 @@ public class CallerInfo { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CallerInfo getCallerInfo(Context context, String number, int subId) { if (TextUtils.isEmpty(number)) { diff --git a/telecomm/java/android/telecom/Log.java b/telecomm/java/android/telecom/Log.java index a90d0532b721..2a4fdcb1475d 100644 --- a/telecomm/java/android/telecom/Log.java +++ b/telecomm/java/android/telecom/Log.java @@ -102,7 +102,7 @@ public class Log { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void i(String prefix, String format, Object... args) { if (INFO) { android.util.Slog.i(TAG, buildMessage(prefix, format, args)); @@ -133,7 +133,7 @@ public class Log { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void w(String prefix, String format, Object... args) { if (WARN) { android.util.Slog.w(TAG, buildMessage(prefix, format, args)); diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index e636b93deace..6dc096daf4ea 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -196,7 +196,7 @@ interface ITelecomService { /** * @see TelecomServiceImpl#getCallState */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int getCallState(); /** diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index c3cd01738b96..96996a1ae8ac 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -35,6 +35,7 @@ import android.content.pm.ServiceInfo; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; +import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.provider.Telephony; @@ -89,7 +90,7 @@ public final class SmsApplication { /** * Name of this SMS app for display. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mApplicationName; /** @@ -580,7 +581,7 @@ public final class SmsApplication { * Sets the specified package as the default SMS/MMS application. The caller of this method * needs to have permission to set AppOps and write to secure settings. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void setDefaultApplication(String packageName, Context context) { setDefaultApplicationAsUser(packageName, context, getIncomingUserId(context)); } @@ -849,7 +850,7 @@ public final class SmsApplication { sSmsPackageMonitor.register(context, context.getMainLooper(), UserHandle.ALL); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void configurePreferredActivity(PackageManager packageManager, ComponentName componentName) { // Add the four activity preferences we want to direct to this app. @@ -887,7 +888,7 @@ public final class SmsApplication { * Returns SmsApplicationData for this package if this package is capable of being set as the * default SMS application. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SmsApplicationData getSmsApplicationData(String packageName, Context context) { Collection applications = getApplicationCollection(context); return getApplicationForPackage(applications, packageName); @@ -959,7 +960,7 @@ public final class SmsApplication { * @param updateIfNeeded update the default app if there is no valid default app configured. * @return component name of the app and class to direct Respond Via Message intent to */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ComponentName getDefaultRespondViaMessageApplication(Context context, boolean updateIfNeeded) { int userId = getIncomingUserId(context); @@ -1060,7 +1061,7 @@ public final class SmsApplication { *

* Caller must pass in the correct user context if calling from a singleton service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean shouldWriteMessageForPackage(String packageName, Context context) { return !isDefaultSmsApplication(context, packageName); } diff --git a/telephony/common/com/google/android/mms/ContentType.java b/telephony/common/com/google/android/mms/ContentType.java index 4a971dd34c8f..2aec86fe67e4 100644 --- a/telephony/common/com/google/android/mms/ContentType.java +++ b/telephony/common/com/google/android/mms/ContentType.java @@ -18,6 +18,7 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.ArrayList; @@ -176,17 +177,17 @@ public class ContentType { return (null != contentType) && sSupportedContentTypes.contains(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedImageType(String contentType) { return isImageType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedAudioType(String contentType) { return isAudioType(contentType) && isSupportedType(contentType); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isSupportedVideoType(String contentType) { return isVideoType(contentType) && isSupportedType(contentType); } diff --git a/telephony/common/com/google/android/mms/MmsException.java b/telephony/common/com/google/android/mms/MmsException.java index 24bceb37f590..db6d1d1e3d8a 100644 --- a/telephony/common/com/google/android/mms/MmsException.java +++ b/telephony/common/com/google/android/mms/MmsException.java @@ -18,6 +18,7 @@ package com.google.android.mms; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A generic exception that is thrown by the Mms client. @@ -59,7 +60,7 @@ public class MmsException extends Exception { * @param message the detail message. * @param cause the cause. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MmsException(String message, Throwable cause) { super(message, cause); } diff --git a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java index 8693385bb032..3eda60bfbf1f 100644 --- a/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java +++ b/telephony/common/com/google/android/mms/pdu/AcknowledgeInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -68,7 +69,7 @@ public class AcknowledgeInd extends GenericPdu { * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java index 8fb6a7545abf..ca1f2ebeb044 100644 --- a/telephony/common/com/google/android/mms/pdu/DeliveryInd.java +++ b/telephony/common/com/google/android/mms/pdu/DeliveryInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -53,7 +54,7 @@ public class DeliveryInd extends GenericPdu { * * @return the value */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long getDate() { return mPduHeaders.getLongInteger(PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java index 8c0380f77cdd..8b01cb3c4405 100644 --- a/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java +++ b/telephony/common/com/google/android/mms/pdu/EncodedStringValue.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import java.io.ByteArrayOutputStream; @@ -237,7 +238,7 @@ public class EncodedStringValue implements Cloneable { /** * Extract an EncodedStringValue[] from a given String. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static EncodedStringValue[] extract(String src) { String[] values = src.split(";"); diff --git a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java index 42a89c69e873..45ba4819aa24 100644 --- a/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java +++ b/telephony/common/com/google/android/mms/pdu/MultimediaMessagePdu.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -116,7 +117,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void addTo(EncodedStringValue value) { mPduHeaders.appendEncodedStringValue(value, PduHeaders.TO); } @@ -137,7 +138,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * @param value the value * @throws InvalidHeaderValueException if the value is invalid. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setPriority(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.PRIORITY); } @@ -157,7 +158,7 @@ public class MultimediaMessagePdu extends GenericPdu{ * * @param value the value */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDate(long value) { mPduHeaders.setLongInteger(value, PduHeaders.DATE); } diff --git a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java index ebd81afc0173..16d83953e723 100644 --- a/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java +++ b/telephony/common/com/google/android/mms/pdu/NotifyRespInd.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.google.android.mms.InvalidHeaderValueException; @@ -72,7 +73,7 @@ public class NotifyRespInd extends GenericPdu { * @throws InvalidHeaderValueException if the value is invalid. * RuntimeException if an undeclared error occurs. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setReportAllowed(int value) throws InvalidHeaderValueException { mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED); } diff --git a/telephony/common/com/google/android/mms/pdu/PduBody.java b/telephony/common/com/google/android/mms/pdu/PduBody.java index f7f285f653b9..e76738b5a42f 100644 --- a/telephony/common/com/google/android/mms/pdu/PduBody.java +++ b/telephony/common/com/google/android/mms/pdu/PduBody.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -113,7 +114,7 @@ public class PduBody { * @param index index of the part to return * @return part at the specified index */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PduPart removePart(int index) { return mParts.remove(index); } @@ -142,7 +143,7 @@ public class PduBody { * @param part the part object * @return index the index of the first occurrence of the part in this body */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPartIndex(PduPart part) { return mParts.indexOf(part); } diff --git a/telephony/common/com/google/android/mms/pdu/PduPart.java b/telephony/common/com/google/android/mms/pdu/PduPart.java index 8dd976b2569f..aead141634e8 100644 --- a/telephony/common/com/google/android/mms/pdu/PduPart.java +++ b/telephony/common/com/google/android/mms/pdu/PduPart.java @@ -19,6 +19,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; +import android.os.Build; import java.util.HashMap; import java.util.Map; @@ -164,7 +165,7 @@ public class PduPart { /** * @return The length of the data, if this object have data, else 0. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDataLength() { if(mPartData != null){ return mPartData.length; diff --git a/telephony/common/com/google/android/mms/pdu/SendReq.java b/telephony/common/com/google/android/mms/pdu/SendReq.java index 6e2f2da01791..8b5a61701377 100644 --- a/telephony/common/com/google/android/mms/pdu/SendReq.java +++ b/telephony/common/com/google/android/mms/pdu/SendReq.java @@ -18,6 +18,7 @@ package com.google.android.mms.pdu; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import com.google.android.mms.InvalidHeaderValueException; @@ -150,7 +151,7 @@ public class SendReq extends MultimediaMessagePdu { * @param value the value * @throws NullPointerException if the value is null. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCc(EncodedStringValue[] value) { mPduHeaders.setEncodedStringValues(value, PduHeaders.CC); } diff --git a/telephony/common/com/google/android/mms/util/AbstractCache.java b/telephony/common/com/google/android/mms/util/AbstractCache.java index 25862e73581e..8b9ee43b0981 100644 --- a/telephony/common/com/google/android/mms/util/AbstractCache.java +++ b/telephony/common/com/google/android/mms/util/AbstractCache.java @@ -18,6 +18,7 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.Log; import java.util.HashMap; @@ -64,7 +65,7 @@ public abstract class AbstractCache { return false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public V get(K key) { if (LOCAL_LOGV) { Log.v(TAG, "Trying to get " + key + " from cache."); diff --git a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java index 0f9390daa725..d0e33984e094 100644 --- a/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java +++ b/telephony/common/com/google/android/mms/util/DownloadDrmHelper.java @@ -20,6 +20,7 @@ package com.google.android.mms.util; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.drm.DrmManagerClient; +import android.os.Build; import android.util.Log; public class DownloadDrmHelper { @@ -73,7 +74,7 @@ public class DownloadDrmHelper { * Modifies the file extension for a DRM Forward Lock file NOTE: This * function shouldn't be called if the file shouldn't be DRM converted */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String modifyDrmFwLockFileExtension(String filename) { if (filename != null) { int extensionIndex; diff --git a/telephony/common/com/google/android/mms/util/SqliteWrapper.java b/telephony/common/com/google/android/mms/util/SqliteWrapper.java index 31fe4d7683d6..e2d62f868d52 100644 --- a/telephony/common/com/google/android/mms/util/SqliteWrapper.java +++ b/telephony/common/com/google/android/mms/util/SqliteWrapper.java @@ -25,6 +25,7 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; +import android.os.Build; import android.util.Log; import android.widget.Toast; @@ -79,7 +80,7 @@ public final class SqliteWrapper { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean requery(Context context, Cursor cursor) { try { return cursor.requery(); diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 92e419707970..8ec500b4d49d 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.service.carrier.CarrierIdentifier; @@ -146,7 +147,7 @@ public final class EuiccProfileInfo implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public EuiccProfileInfo(String iccid, @Nullable UiccAccessRule[] accessRules, @Nullable String nickname) { if (!TextUtils.isDigitsOnly(iccid)) { diff --git a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java index 2382f657c9ee..58e1d08a2009 100644 --- a/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java +++ b/telephony/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java @@ -18,6 +18,7 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -50,7 +51,7 @@ public final class GetDefaultDownloadableSubscriptionListResult implements Parce * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java index d0fb51180c1d..6417c0dfcf05 100644 --- a/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java +++ b/telephony/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java @@ -18,6 +18,7 @@ package android.service.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.euicc.DownloadableSubscription; @@ -47,7 +48,7 @@ public final class GetDownloadableSubscriptionMetadataResult implements Parcelab * @deprecated - Do no use. Use getResult() instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final int result; @Nullable diff --git a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl index aff8f1b7b346..a55f019bec23 100644 --- a/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/IDeleteSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IDeleteSubscriptionCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl index 34b53cc71dfb..da26045be3ac 100644 --- a/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl +++ b/telephony/java/android/service/euicc/IEraseSubscriptionsCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IEraseSubscriptionsCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl index ad69ef132428..db73f8e0f0f4 100644 --- a/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDefaultDownloadableSubscriptionListResult; /** @hide */ oneway interface IGetDefaultDownloadableSubscriptionListCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetDefaultDownloadableSubscriptionListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl index 01f187ed11e2..102ee3096c34 100644 --- a/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl +++ b/telephony/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetDownloadableSubscriptionMetadataResult; /** @hide */ oneway interface IGetDownloadableSubscriptionMetadataCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetDownloadableSubscriptionMetadataResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEidCallback.aidl b/telephony/java/android/service/euicc/IGetEidCallback.aidl index e405a981c85a..c47cf13f75c6 100644 --- a/telephony/java/android/service/euicc/IGetEidCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEidCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IGetEidCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSuccess(String eid); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl index c0611825ff0f..291c058dfd2e 100644 --- a/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccInfoCallback.aidl @@ -20,6 +20,6 @@ import android.telephony.euicc.EuiccInfo; /** @hide */ oneway interface IGetEuiccInfoCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSuccess(in EuiccInfo euiccInfo); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl index 0485f7be29d3..eadddb1193e8 100644 --- a/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl +++ b/telephony/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl @@ -20,6 +20,6 @@ import android.service.euicc.GetEuiccProfileInfoListResult; /** @hide */ oneway interface IGetEuiccProfileInfoListCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(in GetEuiccProfileInfoListResult result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl index 340401fe89cb..ade1ccdb6b06 100644 --- a/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl +++ b/telephony/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IRetainSubscriptionsForFactoryResetCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl index b8f984d1c28b..1b4b658f6211 100644 --- a/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl +++ b/telephony/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface ISwitchToSubscriptionCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl index 0aa66978bb91..fda73497674c 100644 --- a/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl +++ b/telephony/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl @@ -18,6 +18,6 @@ package android.service.euicc; /** @hide */ oneway interface IUpdateSubscriptionNicknameCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onComplete(int result); } \ No newline at end of file diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 157609130c1b..b806313e32f8 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -26,6 +26,7 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; +import android.os.Build; import android.os.PersistableBundle; import android.os.RemoteException; import android.service.carrier.CarrierService; @@ -2723,7 +2724,7 @@ public class CarrierConfigManager { * Key identifying if voice call barring notification is required to be shown to the user. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL = "disable_voice_barring_notification_bool"; diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index cfb9099a1c42..a3bec339794b 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -21,6 +21,7 @@ import static android.text.TextUtils.formatSimple; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; @@ -58,7 +59,7 @@ public final class CellIdentityGsm extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellIdentityGsm() { super(TAG, CellInfo.TYPE_GSM, null, null, null, null); mLac = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index bbfab433be39..bd92d00a0321 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -67,7 +67,7 @@ public final class CellIdentityLte extends CellIdentity { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellIdentityLte() { super(TAG, CellInfo.TYPE_LTE, null, null, null, null); mCi = CellInfo.UNAVAILABLE; diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 1bef681619ed..3ce99facfdb1 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -36,7 +36,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { private CellSignalStrengthCdma mCellSignalStrengthCdma; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoCdma() { super(); mCellIdentityCdma = new CellIdentityCdma(); diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index c19521fdfa99..e296e613362a 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +36,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { private CellSignalStrengthGsm mCellSignalStrengthGsm; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoGsm() { super(); mCellIdentityGsm = new CellIdentityGsm(); diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 320925ea63ae..6f812341756b 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -39,7 +39,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { private CellConfigLte mCellConfig; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellInfoLte() { super(); mCellIdentityLte = new CellIdentityLte(); diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index 9d55f109f751..3ff859b55bdd 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java @@ -53,7 +53,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private int mLevel; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellSignalStrengthGsm() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index c26936e4bdd0..47a8f72a2337 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/telephony/java/android/telephony/CellSignalStrengthLte.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.IntRange; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; @@ -107,7 +108,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P private int mParametersUseForLevel; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public CellSignalStrengthLte() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java index d4ed860cdafd..24dfbd028d03 100644 --- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java +++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java @@ -17,6 +17,7 @@ package android.telephony; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.text.Editable; import android.text.Selection; import android.text.TextWatcher; @@ -50,7 +51,7 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher { */ private boolean mStopFormatting; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AsYouTypeFormatter mFormatter; /** diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 58e368bcc444..ed09d538a3b1 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -27,6 +27,7 @@ import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import android.os.PersistableBundle; import android.provider.Contacts; import android.provider.ContactsContract; @@ -1832,7 +1833,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static boolean isPotentialEmergencyNumber(int subId, String number) { // Check against the emergency numbers listed by the RIL / SIM, @@ -2108,7 +2109,7 @@ public class PhoneNumberUtils { * @hide */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isPotentialLocalEmergencyNumber(Context context, String number) { return isPotentialLocalEmergencyNumber(context, getDefaultVoiceSubId(), number); } @@ -2138,7 +2139,7 @@ public class PhoneNumberUtils { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Deprecated public static boolean isPotentialLocalEmergencyNumber(Context context, int subId, String number) { diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index fd9f46011c7e..9ea624b60988 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -73,7 +73,7 @@ public final class PreciseDataConnectionState implements Parcelable { */ @TestApi @Deprecated - @UnsupportedAppUsage // (maxTargetSdk = Build.VERSION_CODES.Q) + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) // (maxTargetSdk = Build.VERSION_CODES.Q) // FIXME: figure out how to remove the UnsupportedAppUsage and delete this constructor public PreciseDataConnectionState(@DataState int state, @NetworkType int networkType, diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 90ddf2cd4730..f1e90118a559 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -92,7 +92,7 @@ public class RadioAccessFamily implements Parcelable { * {@link TelephonyManager.NetworkTypeBitMask}. It's a bit mask value to represent the support * type. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public RadioAccessFamily(int phoneId, int radioAccessFamily) { mPhoneId = phoneId; mRadioAccessFamily = radioAccessFamily; @@ -103,7 +103,7 @@ public class RadioAccessFamily implements Parcelable { * * @return phone ID */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPhoneId() { return mPhoneId; } @@ -113,7 +113,7 @@ public class RadioAccessFamily implements Parcelable { * * @return radio access family */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @TelephonyManager.NetworkTypeBitMask int getRadioAccessFamily() { return mRadioAccessFamily; } @@ -168,7 +168,7 @@ public class RadioAccessFamily implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @TelephonyManager.NetworkTypeBitMask public static int getRafFromNetworkType(@PrefNetworkMode int type) { switch (type) { diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 3e7464739f9f..41b3ee672f46 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -956,7 +956,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String rilRadioTechnologyToString(int rt) { String rtString; @@ -1167,7 +1167,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVoiceRegState(int state) { mVoiceRegState = state; if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setVoiceRegState=" + mVoiceRegState); @@ -1198,7 +1198,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setVoiceRoaming(boolean roaming) { setVoiceRoamingType(roaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1219,7 +1219,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataRoaming(boolean dataRoaming) { setDataRoamingType(dataRoaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } @@ -1291,7 +1291,7 @@ public class ServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setOperatorAlphaLong(@Nullable String longName) { mOperatorAlphaLong = longName; } @@ -1476,7 +1476,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRilVoiceRadioTechnology() { NetworkRegistrationInfo wwanRegInfo = getNetworkRegistrationInfo( NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); @@ -1486,7 +1486,7 @@ public class ServiceState implements Parcelable { return RIL_RADIO_TECHNOLOGY_UNKNOWN; } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getRilDataRadioTechnology() { return networkTypeToRilRadioTechnology(getDataNetworkType()); } @@ -1763,7 +1763,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean bitmaskHasTech(int bearerBitmask, int radioTech) { if (bearerBitmask == 0) { return true; @@ -1849,7 +1849,7 @@ public class ServiceState implements Parcelable { * voice SS. The voice SS is only used if it is IN_SERVICE (otherwise the base SS is returned). * @hide * */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static ServiceState mergeServiceStates(ServiceState baseSs, ServiceState voiceSs) { if (voiceSs.mVoiceRegState != STATE_IN_SERVICE) { return baseSs; diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 2b17de64dae9..964cf76d17f6 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -591,7 +591,7 @@ public final class SmsManager { * @throws IllegalArgumentException if destinationAddress or text are empty * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void sendTextMessage( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 717a9b155cbf..cfb29f124b43 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -29,6 +29,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Binder; +import android.os.Build; import android.text.TextUtils; import com.android.internal.telephony.GsmAlphabet; @@ -133,7 +134,7 @@ public class SmsMessage { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mSubId = 0; /** set Subscription information @@ -1054,7 +1055,7 @@ public class SmsMessage { * * @return true if Cdma format should be used for MO SMS, false otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static boolean useCdmaFormatForMoSms(int subId) { SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId); if (!smsManager.isImsSmsSupported()) { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 2547392d2c1f..6441565d731b 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -32,6 +32,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Typeface; +import android.os.Build; import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; @@ -356,7 +357,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the name displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDisplayName(CharSequence name) { this.mDisplayName = name; } @@ -381,7 +382,7 @@ public class SubscriptionInfo implements Parcelable { * NAME_SOURCE_USER_INPUT. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNameSource() { return this.mNameSource; } @@ -448,7 +449,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the color displayed to the user that identifies this subscription * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setIconTint(int iconTint) { this.mIconTint = iconTint; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 2e51ef16baf1..7f87019dbbe2 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -127,7 +127,7 @@ public class SubscriptionManager { public static final int MAX_SUBSCRIPTION_ID_VALUE = DEFAULT_SUBSCRIPTION_ID - 1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Uri CONTENT_URI = SimInfo.CONTENT_URI; /** @hide */ @@ -1826,7 +1826,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int setDisplayNumber(String number, int subId) { if (number == null) { logd("[setDisplayNumber]- fail"); @@ -1844,7 +1844,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int setDataRoaming(int roaming, int subId) { if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId); return setSubscriptionPropertyHelper(subId, "setDataRoaming", @@ -1989,13 +1989,13 @@ public class SubscriptionManager { * @return the SubscriptionInfo for the default voice subscription. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SubscriptionInfo getDefaultVoiceSubscriptionInfo() { return getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId()); } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getDefaultVoicePhoneId() { return getPhoneId(getDefaultVoiceSubscriptionId()); } @@ -2047,7 +2047,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDefaultSmsPhoneId() { return getPhoneId(getDefaultSmsSubscriptionId()); } @@ -2181,7 +2181,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean isValidPhoneId(int phoneId) { return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount(); } @@ -2200,7 +2200,7 @@ public class SubscriptionManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(EXTRA_SLOT_INDEX, phoneId); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fd9e8f0e7bb0..556e0b2b4096 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2807,7 +2807,7 @@ public class TelephonyManager { /** Current network is IWLAN */ public static final int NETWORK_TYPE_IWLAN = TelephonyProtoEnums.NETWORK_TYPE_IWLAN; // = 18. /** Current network is LTE_CA {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int NETWORK_TYPE_LTE_CA = TelephonyProtoEnums.NETWORK_TYPE_LTE_CA; // = 19. /** * Current network is NR (New Radio) 5G. @@ -6772,7 +6772,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean nvResetConfig(int resetType) { try { ITelephony telephony = getITelephony(); @@ -7041,7 +7041,7 @@ public class TelephonyManager { * @return The value at the given index of settings. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int getIntAtIndex(android.content.ContentResolver cr, String name, int index) throws android.provider.Settings.SettingNotFoundException { @@ -7074,7 +7074,7 @@ public class TelephonyManager { * @return true if the value was set, false on database errors * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static boolean putIntAtIndex(android.content.ContentResolver cr, String name, int index, int value) { String data = ""; @@ -7146,7 +7146,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static String getTelephonyProperty(String property, String defaultVal) { String propVal = SystemProperties.get(property); return TextUtils.isEmpty(propVal) ? defaultVal : propVal; @@ -7445,7 +7445,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable IImsRegistration getImsRegistration(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7465,7 +7465,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @Nullable IImsConfig getImsConfig(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -7484,7 +7484,7 @@ public class TelephonyManager { * @param Registration state * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setImsRegistrationState(boolean registered) { try { ITelephony telephony = getITelephony(); @@ -8151,7 +8151,7 @@ public class TelephonyManager { * @deprecated Use {@link #setPreferredNetworkTypeBitmask} instead. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setPreferredNetworkType(int subId, @PrefNetworkMode int networkType) { try { ITelephony telephony = getITelephony(); @@ -8525,7 +8525,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean setRoamingOverride(List gsmRoamingList, List gsmNonRoamingList, List cdmaRoamingList, List cdmaNonRoamingList) { @@ -9815,7 +9815,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setSimOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10187,7 +10187,7 @@ public class TelephonyManager { * @param name the alphabetic name of current registered operator. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkOperatorNameForPhone(int phoneId, String name) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10212,7 +10212,7 @@ public class TelephonyManager { * @param operator the numeric name (MCC+MNC) of current registered operator * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkOperatorNumericForPhone(int phoneId, String numeric) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10237,7 +10237,7 @@ public class TelephonyManager { * @param isRoaming is network in romaing state or not * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setNetworkRoamingForPhone(int phoneId, boolean isRoaming) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( @@ -10266,7 +10266,7 @@ public class TelephonyManager { * @param type the network type currently in use on the device for data transmission * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setDataNetworkTypeForPhone(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { List newList = updateTelephonyProperty( diff --git a/telephony/java/android/telephony/euicc/DownloadableSubscription.java b/telephony/java/android/telephony/euicc/DownloadableSubscription.java index 23d46ba09599..52b31d7f9611 100644 --- a/telephony/java/android/telephony/euicc/DownloadableSubscription.java +++ b/telephony/java/android/telephony/euicc/DownloadableSubscription.java @@ -19,6 +19,7 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.UiccAccessRule; @@ -61,7 +62,7 @@ public final class DownloadableSubscription implements Parcelable { */ @Nullable @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final String encodedActivationCode; @Nullable private String confirmationCode; @@ -191,7 +192,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setCarrierName(String carrierName) { this.carrierName = carrierName; } @@ -238,7 +239,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setAccessRules(UiccAccessRule[] accessRules) { this.accessRules = Arrays.asList(accessRules); } diff --git a/telephony/java/android/telephony/euicc/EuiccInfo.java b/telephony/java/android/telephony/euicc/EuiccInfo.java index 467d2689cd3c..08de2051975e 100644 --- a/telephony/java/android/telephony/euicc/EuiccInfo.java +++ b/telephony/java/android/telephony/euicc/EuiccInfo.java @@ -17,6 +17,7 @@ package android.telephony.euicc; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -44,7 +45,7 @@ public final class EuiccInfo implements Parcelable { }; @Nullable - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final String osVersion; /** diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index 3f9c8d26ca91..1c2cac27eb37 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -128,26 +129,26 @@ public final class ImsCallForwardInfo implements Parcelable { public @interface TypeOfAddress{} /**@hide*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallForwardReasons int mCondition; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallForwardStatus int mStatus; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @TypeOfAddress int mToA; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @ImsSsData.ServiceClassFlags int mServiceClass; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String mNumber; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mTimeSeconds; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsCallForwardInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 47a0ab61f970..5b54719afbfb 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -356,10 +357,10 @@ public final class ImsCallProfile implements Parcelable { /** @hide */ public int mServiceType; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mCallType; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public @CallRestrictCause int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; /** @@ -467,10 +468,10 @@ public final class ImsCallProfile implements Parcelable { * a {@link android.os.Binder}. */ /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Bundle mCallExtras; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsStreamMediaProfile mMediaProfile; /** @hide */ @@ -823,7 +824,7 @@ public final class ImsCallProfile implements Parcelable { * See {@link #presentationToOir(int)}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int presentationToOIR(int presentation) { switch (presentation) { case PhoneConstants.PRESENTATION_RESTRICTED: diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index 30389a290368..184477af0b46 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -1353,7 +1353,7 @@ public final class ImsReasonInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsReasonInfo(int code, int extraCode) { mCode = code; mExtraCode = extraCode; diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index 27b56b8c5b47..bc53b628131e 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -155,10 +156,10 @@ public final class ImsSsInfo implements Parcelable { // 0: disabled, 1: enabled /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mStatus; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String mIcbNum; /** @hide */ public int mProvisionStatus = SERVICE_PROVISIONING_UNKNOWN; @@ -166,7 +167,7 @@ public final class ImsSsInfo implements Parcelable { private int mClirOutgoingState = CLIR_OUTGOING_DEFAULT; /**@hide*/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsSsInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index 131cb1a505fb..2792f790e13b 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -19,6 +19,7 @@ package android.telephony.ims; import android.annotation.NonNull; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -84,16 +85,16 @@ public final class ImsStreamMediaProfile implements Parcelable { // Audio related information /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mAudioQuality; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mAudioDirection; // Video related information /** @hide */ public int mVideoQuality; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mVideoDirection; // Rtt related information /** @hide */ @@ -164,7 +165,7 @@ public final class ImsStreamMediaProfile implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsStreamMediaProfile() { mAudioQuality = AUDIO_QUALITY_NONE; mAudioDirection = DIRECTION_SEND_RECEIVE; diff --git a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java index 2fca4096f447..64bdcbba265a 100644 --- a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java +++ b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java @@ -19,6 +19,7 @@ package android.telephony.ims; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.Uri; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -179,7 +180,7 @@ public abstract class ImsVideoCallProvider { * Returns binder object which can be used across IPC methods. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public final IImsVideoCallProvider getInterface() { return mBinder; } diff --git a/telephony/java/android/telephony/ims/compat/ImsService.java b/telephony/java/android/telephony/ims/compat/ImsService.java index 41d1d726b3f4..303ba183c12e 100644 --- a/telephony/java/android/telephony/ims/compat/ImsService.java +++ b/telephony/java/android/telephony/ims/compat/ImsService.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.app.Service; import android.compat.annotation.UnsupportedAppUsage; import android.content.Intent; +import android.os.Build; import android.os.IBinder; import android.telephony.CarrierConfigManager; import android.telephony.ims.compat.feature.ImsFeature; @@ -86,7 +87,7 @@ public class ImsService extends Service { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected final IBinder mImsServiceController = new IImsServiceController.Stub() { @Override @@ -122,7 +123,7 @@ public class ImsService extends Service { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsService() { } diff --git a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java index 5a9e8e2dafc4..6038a18a28b1 100644 --- a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.feature; import android.annotation.IntDef; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.IInterface; import android.os.RemoteException; import android.telephony.SubscriptionManager; @@ -78,12 +79,12 @@ public abstract class ImsFeature { mSlotId = slotId; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getFeatureState() { return mState; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected final void setFeatureState(@ImsState int state) { if (mState != state) { mState = state; diff --git a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java index b52c37106049..d32e9b7f5122 100644 --- a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java @@ -18,6 +18,7 @@ package android.telephony.ims.compat.feature; import android.app.PendingIntent; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.ims.ImsCallProfile; @@ -48,7 +49,7 @@ public class MMTelFeature extends ImsFeature { // Lock for feature synchronization private final Object mLock = new Object(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public MMTelFeature() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java index 06aa6428b1b2..4b8f39817f88 100755 --- a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.stub; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Message; import android.os.RemoteException; import android.telephony.CallQuality; @@ -45,7 +46,7 @@ import com.android.ims.internal.IImsVideoCallProvider; public class ImsCallSessionImplBase extends IImsCallSession.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsCallSessionImplBase() { } diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java index 0c7264697cd3..a8278ae0d734 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.RemoteException; import android.util.Log; @@ -59,7 +60,7 @@ public class ImsConfigImplBase { ImsConfigStub mImsConfigStub; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsConfigImplBase(Context context) { mImsConfigStub = new ImsConfigStub(this, context); } @@ -164,7 +165,7 @@ public class ImsConfigImplBase { public void setVideoQuality(int quality, ImsConfigListener listener) throws RemoteException { } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public IImsConfig getIImsConfig() { return mImsConfigStub; } /** diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java index ce291d4d14c6..c689460a5cec 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java @@ -17,6 +17,7 @@ package android.telephony.ims.compat.stub; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.telephony.ims.ImsCallForwardInfo; @@ -40,7 +41,7 @@ import com.android.ims.internal.IImsUtListener; public class ImsUtListenerImplBase extends IImsUtListener.Stub { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public ImsUtListenerImplBase() { } diff --git a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl index c140127237d4..a4abfac74177 100755 --- a/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl +++ b/telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl @@ -26,17 +26,17 @@ import android.telephony.mbms.StreamingServiceInfo; */ interface IMbmsStreamingService { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int initialize(IMbmsStreamingSessionCallback callback, int subId); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int requestUpdateStreamingServices(int subId, in List serviceClasses); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) int startStreaming(int subId, String serviceId, IStreamingServiceCallback callback); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Uri getPlaybackUri(int subId, String serviceId); void stopStreaming(int subId, String serviceId); diff --git a/telephony/java/com/android/ims/ImsConfigListener.aidl b/telephony/java/com/android/ims/ImsConfigListener.aidl index 4f229df252a6..df8144c15d77 100644 --- a/telephony/java/com/android/ims/ImsConfigListener.aidl +++ b/telephony/java/com/android/ims/ImsConfigListener.aidl @@ -47,7 +47,7 @@ oneway interface ImsConfigListener { * * @return void. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void onSetFeatureResponse(int feature, int network, int value, int status); /** diff --git a/telephony/java/com/android/ims/ImsUtInterface.java b/telephony/java/com/android/ims/ImsUtInterface.java index 4a5380e4551b..5dfbce3dd65f 100644 --- a/telephony/java/com/android/ims/ImsUtInterface.java +++ b/telephony/java/com/android/ims/ImsUtInterface.java @@ -17,6 +17,7 @@ package com.android.ims; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.telephony.ims.ImsCallForwardInfo; @@ -124,7 +125,7 @@ public interface ImsUtInterface { * Retrieves the configuration of the call forward. * The return value of ((AsyncResult)result.obj) is an array of {@link ImsCallForwardInfo}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void queryCallForward(int condition, String number, Message result); /** diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 1c62cc48093c..8afd85633322 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -34,47 +34,47 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the basic session operation (setup / terminate). */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionProgressing(in IImsCallSession session, in ImsStreamMediaProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionStarted(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionStartFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionTerminated(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of the call hold/resume operation. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHeld(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHoldFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHoldReceived(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumed(in IImsCallSession session, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile); /** * Notifies the result of call merge operation. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeStarted(in IImsCallSession session, in IImsCallSession newSession, in ImsCallProfile profile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeComplete(in IImsCallSession session); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMergeFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); /** * Notifies the result of call upgrade / downgrade or any other call updates. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionUpdated(in IImsCallSession session, in ImsCallProfile profile); void callSessionUpdateFailed(in IImsCallSession session, @@ -95,9 +95,9 @@ oneway interface IImsCallSessionListener { /** * Notifies the result of the participant invitation / removal to/from the conference session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionInviteParticipantsRequestDelivered(in IImsCallSession session); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionInviteParticipantsRequestFailed(in IImsCallSession session, in ImsReasonInfo reasonInfo); void callSessionRemoveParticipantsRequestDelivered(in IImsCallSession session); @@ -107,7 +107,7 @@ oneway interface IImsCallSessionListener { /** * Notifies the changes of the conference info. in the conference session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionConferenceStateUpdated(in IImsCallSession session, in ImsConferenceState state); @@ -120,10 +120,10 @@ oneway interface IImsCallSessionListener { /** * Notifies of handover information for this call */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHandover(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionHandoverFailed(in IImsCallSession session, in int srcAccessTech, in int targetAccessTech, in ImsReasonInfo reasonInfo); void callSessionMayHandover(in IImsCallSession session, @@ -137,7 +137,7 @@ oneway interface IImsCallSessionListener { * - {@link com.android.internal.telephony.Phone#TTY_MODE_HCO} * - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionTtyModeReceived(in IImsCallSession session, in int mode); /** @@ -146,13 +146,13 @@ oneway interface IImsCallSessionListener { * @param session The call session. * @param isMultiParty {@code true} if the session became multiparty, {@code false} otherwise. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionMultipartyStateChanged(in IImsCallSession session, in boolean isMultiParty); /** * Notifies the supplementary service information for the current session. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void callSessionSuppServiceReceived(in IImsCallSession session, in ImsSuppServiceNotification suppSrvNotification); diff --git a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl index a7a62a625478..216b45c37458 100644 --- a/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl @@ -32,7 +32,7 @@ oneway interface IImsRegistrationListener { * * @deprecated see {@link registrationConnectedWithRadioTech} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationConnected(); /** @@ -48,7 +48,7 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationConnectedWithRadioTech(int imsRadioTech); /** @@ -57,14 +57,14 @@ oneway interface IImsRegistrationListener { * @param imsRadioTech the radio access technology. Valid values are {@code * RIL_RADIO_TECHNOLOGY_*} defined in {@link ServiceState}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationProgressingWithRadioTech(int imsRadioTech); /** * Notifies the application when the device is disconnected from the IMS network. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationDisconnected(in ImsReasonInfo imsReasonInfo); /** @@ -98,7 +98,7 @@ oneway interface IImsRegistrationListener { * @param enabledFeatures features enabled as defined in com.android.ims.ImsConfig#FeatureConstants. * @param disabledFeatures features disabled as defined in com.android.ims.ImsConfig#FeatureConstants. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationFeatureCapabilityChanged(int serviceClass, in int[] enabledFeatures, in int[] disabledFeatures); @@ -106,13 +106,13 @@ oneway interface IImsRegistrationListener { * Updates the application with the waiting voice message count. * @param count The number of waiting voice messages. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void voiceMessageCountUpdate(int count); /** * Notifies the application when the list of URIs associated with IMS client is updated. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationAssociatedUriChanged(in Uri[] uris); /** @@ -123,6 +123,6 @@ oneway interface IImsRegistrationListener { * attempted. * @param imsReasonInfo Reason for the failure. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void registrationChangeFailed(in int targetAccessTech, in ImsReasonInfo imsReasonInfo); } diff --git a/telephony/java/com/android/ims/internal/IImsUtListener.aidl b/telephony/java/com/android/ims/internal/IImsUtListener.aidl index 9a12ceee5212..604adf84817b 100644 --- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl @@ -31,38 +31,38 @@ oneway interface IImsUtListener { /** * Notifies the result of the supplementary service configuration udpate. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationUpdated(in IImsUt ut, int id); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationUpdateFailed(in IImsUt ut, int id, in ImsReasonInfo error); /** * Notifies the result of the supplementary service configuration query. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationQueried(in IImsUt ut, int id, in Bundle ssInfo); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationQueryFailed(in IImsUt ut, int id, in ImsReasonInfo error); void lineIdentificationSupplementaryServiceResponse(int id, in ImsSsInfo config); /** * Notifies the status of the call barring supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallBarringQueried(in IImsUt ut, int id, in ImsSsInfo[] cbInfo); /** * Notifies the status of the call forwarding supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallForwardQueried(in IImsUt ut, int id, in ImsCallForwardInfo[] cfInfo); /** * Notifies the status of the call waiting supplementary service. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void utConfigurationCallWaitingQueried(in IImsUt ut, int id, in ImsSsInfo[] cwInfo); diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl index cf8d63794546..5d575abda979 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl @@ -31,25 +31,25 @@ import android.telecom.VideoProfile; * {@hide} */ oneway interface IImsVideoCallCallback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void receiveSessionModifyRequest(in VideoProfile videoProfile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void receiveSessionModifyResponse(int status, in VideoProfile requestedProfile, in VideoProfile responseProfile); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void handleCallSessionEvent(int event); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changePeerDimensions(int width, int height); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeCallDataUsage(long dataUsage); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeCameraCapabilities(in VideoProfile.CameraCapabilities cameraCapabilities); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void changeVideoQuality(int videoQuality); } diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl index 4d20bd675628..44d83897390a 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl @@ -41,7 +41,7 @@ import com.android.ims.internal.IImsVideoCallCallback; * @hide */ oneway interface IImsVideoCallProvider { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) void setCallback(IImsVideoCallCallback callback); void setCamera(String cameraId, int uid); diff --git a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl index 76ebc0f3ac2f..89620eaaf609 100644 --- a/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl +++ b/telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl @@ -24,7 +24,7 @@ import android.os.PersistableBundle; interface ICarrierConfigLoader { /** @deprecated Use {@link #getConfigForSubIdWithFeature(int, String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) PersistableBundle getConfigForSubId(int subId, String callingPackage); PersistableBundle getConfigForSubIdWithFeature(int subId, String callingPackage, diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index 28ef235bf398..09f9b4212c03 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -25,7 +25,7 @@ import android.telephony.ImsiEncryptionInfo; interface IPhoneSubInfo { /** @deprecated Use {@link #getDeviceIdWithFeature(String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String getDeviceId(String callingPackage); /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index d33835f27053..a38d5b6f2141 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -96,7 +96,7 @@ interface ITelephony { void call(String callingPackage, String number); /** @deprecated Use {@link #isRadioOnWithFeature(String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isRadioOn(String callingPackage); /** @@ -110,7 +110,7 @@ interface ITelephony { /** * @deprecated Use {@link #isRadioOnForSubscriberWithFeature(int, String, String) instead */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean isRadioOnForSubscriber(int subId, String callingPackage); /** @@ -190,7 +190,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if MMI command is executed. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean handlePinMmiForSubscriber(int subId, String dialString); /** @@ -614,7 +614,7 @@ interface ITelephony { * successful iccOpenLogicalChannel. * @return true if the channel was closed successfully. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) boolean iccCloseLogicalChannel(int subId, int channel); /** @@ -656,7 +656,7 @@ interface ITelephony { * @return The APDU response from the ICC card with the status appended at * the end. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) String iccTransmitApduLogicalChannel(int subId, int channel, int cla, int instruction, int p1, int p2, int p3, String data); diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index 2ca459811e04..a6f0f667d0cd 100644 --- a/telephony/java/com/android/internal/telephony/OperatorInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -35,37 +35,37 @@ public class OperatorInfo implements Parcelable { FORBIDDEN; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorAlphaLong; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorAlphaShort; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private String mOperatorNumeric; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private State mState = State.UNKNOWN; private int mRan = AccessNetworkType.UNKNOWN; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorAlphaLong() { return mOperatorAlphaLong; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorAlphaShort() { return mOperatorAlphaShort; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public String getOperatorNumeric() { return mOperatorNumeric; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public State getState() { return mState; @@ -75,7 +75,7 @@ public class OperatorInfo implements Parcelable { return mRan; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -97,7 +97,7 @@ public class OperatorInfo implements Parcelable { mRan = ran; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -124,7 +124,7 @@ public class OperatorInfo implements Parcelable { /** * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static State rilStateToState(String s) { if (s.equals("unknown")) { return State.UNKNOWN; @@ -180,7 +180,7 @@ public class OperatorInfo implements Parcelable { * Implement the Parcelable interface * Method to deserialize a OperatorInfo object, or an array thereof. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final Creator CREATOR = new Creator() { @Override diff --git a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java index f8ab87d042eb..2109c6a4739c 100644 --- a/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java +++ b/telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java @@ -19,6 +19,7 @@ package com.android.internal.telephony; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.XmlResourceParser; +import android.os.Build; import android.util.SparseIntArray; import com.android.internal.telephony.cdma.sms.UserData; @@ -28,15 +29,15 @@ import com.android.telephony.Rlog; public class Sms7BitEncodingTranslator { private static final String TAG = "Sms7BitEncodingTranslator"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE; private static boolean mIs7BitTranslationTableLoaded = false; private static SparseIntArray mTranslationTable = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableCommon = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableGSM = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static SparseIntArray mTranslationTableCDMA = null; // Parser variables diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index 084882b10c9b..6d46ed3b8416 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -39,18 +39,18 @@ public abstract class SmsMessageBase { Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*"); /** {@hide} The address of the SMSC. May be null */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mScAddress; /** {@hide} The address of the sender */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected SmsAddress mOriginatingAddress; /** {@hide} The address of the receiver */ protected SmsAddress mRecipientAddress; /** {@hide} The message body as a string. May be null if the message isn't text */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected String mMessageBody; /** {@hide} */ @@ -76,21 +76,21 @@ public abstract class SmsMessageBase { protected byte[] mUserData; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected SmsHeader mUserDataHeader; // "Message Waiting Indication Group" // 23.038 Section 4 /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mIsMwi; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mMwiSense; /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) protected boolean mMwiDontStore; /** @@ -104,7 +104,7 @@ public abstract class SmsMessageBase { protected int mIndexOnIcc = -1; /** TP-Message-Reference - Message Reference of sent message. @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int mMessageRef; @UnsupportedAppUsage diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index a34e474e666e..f636276f11b8 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -233,7 +233,7 @@ public class SmsMessage extends SmsMessageBase { * null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddr, String destAddr, String message, boolean statusReportRequested, SmsHeader smsHeader, int priority) { @@ -316,7 +316,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing null SC address and the encoded message. Returns * null on encode error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String destAddr, UserData userData, boolean statusReportRequested, int priority) { return privateGetSubmitPdu(destAddr, statusReportRequested, userData, priority); diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java index d186fcf63cfe..851bc020a1da 100644 --- a/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java +++ b/telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java @@ -18,6 +18,7 @@ package com.android.internal.telephony.cdma.sms; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; +import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.cdma.CdmaSmsCbProgramData; import android.telephony.cdma.CdmaSmsCbProgramResults; @@ -1919,7 +1920,7 @@ public final class BearerData { * @return the number of bits to read from the stream * @throws CodingException if the specified encoding is not supported */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static int getBitsForNumFields(int msgEncoding, int numFields) throws CodingException { switch (msgEncoding) { diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java index d1903450261b..7e2cc6af4182 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbHeader.java @@ -17,6 +17,7 @@ package com.android.internal.telephony.gsm; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbEtwsInfo; @@ -111,7 +112,7 @@ public class SmsCbHeader { private final int mSerialNumber; /** The Message Identifier in 3GPP is the same as the Service Category in CDMA. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final int mMessageIdentifier; private final int mDataCodingScheme; @@ -130,7 +131,7 @@ public class SmsCbHeader { /** CMAS warning notification info. */ private final SmsCbCmasInfo mCmasInfo; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public SmsCbHeader(byte[] pdu) throws IllegalArgumentException { if (pdu == null || pdu.length < PDU_HEADER_LENGTH) { throw new IllegalArgumentException("Illegal PDU"); @@ -228,17 +229,17 @@ public class SmsCbHeader { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getGeographicalScope() { return mGeographicalScope; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getSerialNumber() { return mSerialNumber; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getServiceCategory() { return mMessageIdentifier; } @@ -251,12 +252,12 @@ public class SmsCbHeader { return mDataCodingSchemeStructedData; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getPageIndex() { return mPageIndex; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getNumberOfPages() { return mNrOfPages; } diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index e3df903b7f4f..b51e8d3d3c5d 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -266,7 +266,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -292,7 +292,7 @@ public class SmsMessage extends SmsMessageBase { * encoded message. Returns null on encode error. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, byte[] header, int encoding, @@ -491,7 +491,7 @@ public class SmsMessage extends SmsMessageBase { * @return a SubmitPdu containing the encoded SC address if applicable and the * encoded message. Returns null on encode error. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static SubmitPdu getSubmitPdu(String scAddress, String destinationAddress, String message, boolean statusReportRequested, int validityPeriod) { @@ -774,9 +774,9 @@ public class SmsMessage extends SmsMessageBase { } private static class PduParser { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) byte mPdu[]; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int mCur; SmsHeader mUserDataHeader; byte[] mUserData; @@ -1168,14 +1168,14 @@ public class SmsMessage extends SmsMessageBase { } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public int getStatus() { return mStatus; } /** {@inheritDoc} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @Override public boolean isStatusReportMessage() { return mIsStatusReportMessage; diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java index 1d136924aa2c..d79225fe5369 100644 --- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java @@ -21,6 +21,7 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.graphics.Bitmap; import android.graphics.Color; +import android.os.Build; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet; @@ -385,7 +386,7 @@ public class IccUtils { return GsmAlphabet.gsm8BitUnpackedToString(data, offset, length, defaultCharset.trim()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static int hexCharToInt(char c) { if (c >= '0' && c <= '9') return (c - '0'); diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index b3ed8ac09034..7329c16d68d0 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -187,7 +187,7 @@ interface IWifiManager void factoryReset(String packageName); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) Network getCurrentNetwork(); byte[] retrieveBackupData(); diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index 329ca37407de..4c23286258d8 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -22,6 +22,7 @@ import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.wifi.WifiAnnotations.ChannelWidth; import android.net.wifi.WifiAnnotations.WifiStandard; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -381,7 +382,7 @@ public final class ScanResult implements Parcelable { * @deprecated use is80211mcResponder() instead * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean is80211McRTTResponder; /** @@ -772,47 +773,47 @@ public final class ScanResult implements Parcelable { */ public static class InformationElement { /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_SSID = 0; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_SUPPORTED_RATES = 1; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_TIM = 5; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_BSS_LOAD = 11; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_ERP = 42; /** @hide */ public static final int EID_HT_CAPABILITIES = 45; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_RSN = 48; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_EXTENDED_SUPPORTED_RATES = 50; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_HT_OPERATION = 61; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_INTERWORKING = 107; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_ROAMING_CONSORTIUM = 111; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_EXTENDED_CAPS = 127; /** @hide */ public static final int EID_VHT_CAPABILITIES = 191; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_VHT_OPERATION = 192; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int EID_VSA = 221; /** @hide */ public static final int EID_EXTENSION_PRESENT = 255; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index fd4e1ddac3a2..9a8a5ad4b41f 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -906,7 +906,7 @@ public class WifiConfiguration implements Parcelable { * @hide * Number of reports indicating no Internet Access */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int numNoInternetAccessReports; /** @@ -926,7 +926,7 @@ public class WifiConfiguration implements Parcelable { * this configuration and selects "don't ask again". * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean noInternetAccessExpected; /** @@ -966,7 +966,7 @@ public class WifiConfiguration implements Parcelable { * @deprecated only kept for @UnsupportedAppUsage * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean selfAdded; /** diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 8ef8fe1abb0d..8ee08f1610d6 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1055,7 +1055,7 @@ public class WifiManager { * @see #ACTION_LINK_CONFIGURATION_CHANGED * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final String LINK_CONFIGURATION_CHANGED_ACTION = "android.net.wifi.LINK_CONFIGURATION_CHANGED"; @@ -1265,7 +1265,7 @@ public class WifiManager { * change is significant enough to change the RSSI signal level. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int RSSI_LEVELS = 5; //TODO (b/146346676): This needs to be removed, not used in the code. diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java index d47989235f0b..d3a6bac2513f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pConfig.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.net.MacAddress; import android.net.wifi.WpsInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -138,7 +139,7 @@ public class WifiP2pConfig implements Parcelable { public int groupOwnerIntent = GROUP_OWNER_INTENT_AUTO; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int netId = WifiP2pGroup.NETWORK_ID_PERSISTENT; /** diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java index 710175fee747..567637af02c7 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java @@ -19,6 +19,7 @@ package android.net.wifi.p2p; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -185,7 +186,7 @@ public class WifiP2pDevice implements Parcelable { * Note: The events formats can be looked up in the wpa_supplicant code * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public WifiP2pDevice(String string) throws IllegalArgumentException { String[] tokens = string.split("[ \n]"); Matcher match; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java index ededf67fec7f..e7866e618089 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java @@ -17,6 +17,7 @@ package android.net.wifi.p2p; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -83,7 +84,7 @@ public class WifiP2pDeviceList implements Parcelable { * @param device to be updated * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void update(WifiP2pDevice device) { updateSupplicantDetails(device); mDevices.get(device.deviceAddress).status = device.status; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java index ad38c5af07fc..13ac7a0bf966 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pManager.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pManager.java @@ -399,7 +399,7 @@ public class WifiP2pManager { public static final int CANCEL_CONNECT_SUCCEEDED = BASE + 12; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final int CREATE_GROUP = BASE + 13; /** @hide */ public static final int CREATE_GROUP_FAILED = BASE + 14; @@ -1105,7 +1105,7 @@ public class WifiP2pManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int putListener(Object listener) { if (listener == null) return INVALID_LISTENER_KEY; int key; @@ -1417,7 +1417,7 @@ public class WifiP2pManager { * {@link ActionListener#onSuccess} or {@link ActionListener#onFailure}. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void startWps(Channel c, WpsInfo wps, ActionListener listener) { checkChannel(c); c.mAsyncChannel.sendMessage(START_WPS, 0, c.putListener(listener), wps); @@ -1698,7 +1698,7 @@ public class WifiP2pManager { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWFDInfo(@NonNull Channel c, @NonNull WifiP2pWfdInfo wfdInfo, @Nullable ActionListener listener) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java index 37b442baeb3f..5d018e75488e 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java @@ -170,7 +170,7 @@ public class WifiP2pServiceInfo implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceInfo createFromParcel(Parcel in) { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java index 68cbb88037b0..dea0477cf09b 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java @@ -265,7 +265,7 @@ public class WifiP2pServiceRequest implements Parcelable { } /** Implement the Parcelable interface {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static final @android.annotation.NonNull Creator CREATOR = new Creator() { public WifiP2pServiceRequest createFromParcel(Parcel in) { -- cgit v1.2.3-59-g8ed1b From eddcb1bfe8cb450245c8566a292d0ed5d9b76c7a Mon Sep 17 00:00:00 2001 From: Kevin Jeon Date: Wed, 11 Nov 2020 00:07:39 +0000 Subject: Remove isServiceConnected() from TelecomManager isServiceConnected() was being called before uses of getTelecomService() to ensure that the service was connected before accessing it. However, isServiceConnected() used getTelecomService() to check if the service was connected, resulting in unnecessary binder calls. Bug: 173036057 Bug: 173039862 Test: manual testing (switching between different tabs, calling) Change-Id: I622464927826d8af1c6e75ed4557580d8723315c --- telecomm/java/android/telecom/TelecomManager.java | 497 ++++++++++++---------- 1 file changed, 269 insertions(+), 228 deletions(-) (limited to 'telecomm/java') diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index b335a9032b3e..83b007db6541 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -997,13 +997,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme) { - try { - if (isServiceConnected()) { - return getTelecomService().getDefaultOutgoingPhoneAccount(uriScheme, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getDefaultOutgoingPhoneAccount(uriScheme, mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getDefaultOutgoingPhoneAccount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getDefaultOutgoingPhoneAccount", e); } return null; } @@ -1023,13 +1024,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public @Nullable PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() { - try { - if (isServiceConnected()) { - return getTelecomService().getUserSelectedOutgoingPhoneAccount( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getUserSelectedOutgoingPhoneAccount( mContext.getOpPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getUserSelectedOutgoingPhoneAccount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getUserSelectedOutgoingPhoneAccount", e); } return null; } @@ -1045,12 +1047,13 @@ public class TelecomManager { @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @SystemApi public void setUserSelectedOutgoingPhoneAccount(@Nullable PhoneAccountHandle accountHandle) { - try { - if (isServiceConnected()) { - getTelecomService().setUserSelectedOutgoingPhoneAccount(accountHandle); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.setUserSelectedOutgoingPhoneAccount(accountHandle); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#setUserSelectedOutgoingPhoneAccount"); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#setUserSelectedOutgoingPhoneAccount"); } } @@ -1064,13 +1067,14 @@ public class TelecomManager { * @see SubscriptionManager#getDefaultVoiceSubscriptionId() */ public PhoneAccountHandle getSimCallManager() { - try { - if (isServiceConnected()) { - return getTelecomService().getSimCallManager( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getSimCallManager( SubscriptionManager.getDefaultSubscriptionId()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getSimCallManager"); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getSimCallManager"); } return null; } @@ -1086,12 +1090,13 @@ public class TelecomManager { * @see SubscriptionManager#getActiveSubscriptionInfoList() */ public @Nullable PhoneAccountHandle getSimCallManagerForSubscription(int subscriptionId) { - try { - if (isServiceConnected()) { - return getTelecomService().getSimCallManager(subscriptionId); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getSimCallManager(subscriptionId); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getSimCallManager"); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getSimCallManager"); } return null; } @@ -1109,12 +1114,13 @@ public class TelecomManager { */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 119305590) public PhoneAccountHandle getSimCallManager(int userId) { - try { - if (isServiceConnected()) { - return getTelecomService().getSimCallManagerForUser(userId); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getSimCallManagerForUser(userId); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getSimCallManagerForUser"); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getSimCallManagerForUser"); } return null; } @@ -1151,13 +1157,14 @@ public class TelecomManager { android.Manifest.permission.READ_PHONE_STATE }) public List getPhoneAccountsSupportingScheme(String uriScheme) { - try { - if (isServiceConnected()) { - return getTelecomService().getPhoneAccountsSupportingScheme(uriScheme, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getPhoneAccountsSupportingScheme(uriScheme, mContext.getOpPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e); } return new ArrayList<>(); } @@ -1192,13 +1199,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public List getSelfManagedPhoneAccounts() { - try { - if (isServiceConnected()) { - return getTelecomService().getSelfManagedPhoneAccounts(mContext.getOpPackageName(), + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getSelfManagedPhoneAccounts(mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getSelfManagedPhoneAccounts()", e); } return new ArrayList<>(); } @@ -1217,14 +1225,15 @@ public class TelecomManager { @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @NonNull List getCallCapablePhoneAccounts( boolean includeDisabledAccounts) { - try { - if (isServiceConnected()) { - return getTelecomService().getCallCapablePhoneAccounts(includeDisabledAccounts, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getCallCapablePhoneAccounts(includeDisabledAccounts, mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts(" + + includeDisabledAccounts + ")", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getCallCapablePhoneAccounts(" + - includeDisabledAccounts + ")", e); } return new ArrayList<>(); } @@ -1241,12 +1250,13 @@ public class TelecomManager { @SuppressLint("Doclava125") @Deprecated public List getPhoneAccountsForPackage() { - try { - if (isServiceConnected()) { - return getTelecomService().getPhoneAccountsForPackage(mContext.getPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getPhoneAccountsForPackage(mContext.getPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsForPackage", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsForPackage", e); } return null; } @@ -1259,12 +1269,13 @@ public class TelecomManager { * @return The {@link PhoneAccount} object. */ public PhoneAccount getPhoneAccount(PhoneAccountHandle account) { - try { - if (isServiceConnected()) { - return getTelecomService().getPhoneAccount(account); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getPhoneAccount(account); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getPhoneAccount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getPhoneAccount", e); } return null; } @@ -1277,12 +1288,13 @@ public class TelecomManager { */ @SystemApi public int getAllPhoneAccountsCount() { - try { - if (isServiceConnected()) { - return getTelecomService().getAllPhoneAccountsCount(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getAllPhoneAccountsCount(); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountsCount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountsCount", e); } return 0; } @@ -1295,12 +1307,13 @@ public class TelecomManager { */ @SystemApi public List getAllPhoneAccounts() { - try { - if (isServiceConnected()) { - return getTelecomService().getAllPhoneAccounts(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getAllPhoneAccounts(); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e); } return Collections.EMPTY_LIST; } @@ -1313,12 +1326,13 @@ public class TelecomManager { */ @SystemApi public List getAllPhoneAccountHandles() { - try { - if (isServiceConnected()) { - return getTelecomService().getAllPhoneAccountHandles(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getAllPhoneAccountHandles(); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e); } return Collections.EMPTY_LIST; } @@ -1338,12 +1352,13 @@ public class TelecomManager { * @param account The complete {@link PhoneAccount}. */ public void registerPhoneAccount(PhoneAccount account) { - try { - if (isServiceConnected()) { - getTelecomService().registerPhoneAccount(account); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.registerPhoneAccount(account); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#registerPhoneAccount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#registerPhoneAccount", e); } } @@ -1353,12 +1368,13 @@ public class TelecomManager { * @param accountHandle A {@link PhoneAccountHandle} for the {@link PhoneAccount} to unregister. */ public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) { - try { - if (isServiceConnected()) { - getTelecomService().unregisterPhoneAccount(accountHandle); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.unregisterPhoneAccount(accountHandle); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#unregisterPhoneAccount", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#unregisterPhoneAccount", e); } } @@ -1379,12 +1395,13 @@ public class TelecomManager { @SystemApi @SuppressLint("Doclava125") public void clearAccounts() { - try { - if (isServiceConnected()) { - getTelecomService().clearAccounts(mContext.getPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.clearAccounts(mContext.getPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#clearAccounts", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#clearAccounts", e); } } @@ -1393,12 +1410,15 @@ public class TelecomManager { * @hide */ public void clearAccountsForPackage(String packageName) { - try { - if (isServiceConnected() && !TextUtils.isEmpty(packageName)) { - getTelecomService().clearAccounts(packageName); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + if (!TextUtils.isEmpty(packageName)) { + service.clearAccounts(packageName); + } + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#clearAccountsForPackage", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#clearAccountsForPackage", e); } } @@ -1411,12 +1431,13 @@ public class TelecomManager { @SystemApi @SuppressLint("Doclava125") public ComponentName getDefaultPhoneApp() { - try { - if (isServiceConnected()) { - return getTelecomService().getDefaultPhoneApp(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getDefaultPhoneApp(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get the default phone app.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get the default phone app.", e); } return null; } @@ -1428,12 +1449,13 @@ public class TelecomManager { * selected as the default dialer. */ public String getDefaultDialerPackage() { - try { - if (isServiceConnected()) { - return getTelecomService().getDefaultDialerPackage(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getDefaultDialerPackage(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get the default dialer package name.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get the default dialer package name.", e); } return null; } @@ -1449,13 +1471,14 @@ public class TelecomManager { @SystemApi @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @Nullable String getDefaultDialerPackage(@NonNull UserHandle userHandle) { - try { - if (isServiceConnected()) { - return getTelecomService().getDefaultDialerPackageForUser( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getDefaultDialerPackageForUser( userHandle.getIdentifier()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get the default dialer package name.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get the default dialer package name.", e); } return null; } @@ -1482,12 +1505,13 @@ public class TelecomManager { android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String packageName) { - try { - if (isServiceConnected()) { - return getTelecomService().setDefaultDialer(packageName); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.setDefaultDialer(packageName); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to set the default dialer.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to set the default dialer.", e); } return false; } @@ -1499,12 +1523,13 @@ public class TelecomManager { * preloaded. */ public @Nullable String getSystemDialerPackage() { - try { - if (isServiceConnected()) { - return getTelecomService().getSystemDialerPackage(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getSystemDialerPackage(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get the system dialer package name.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get the system dialer package name.", e); } return null; } @@ -1518,13 +1543,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVoiceMailNumber(PhoneAccountHandle accountHandle, String number) { - try { - if (isServiceConnected()) { - return getTelecomService().isVoiceMailNumber(accountHandle, number, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isVoiceMailNumber(accountHandle, number, mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling ITelecomService#isVoiceMailNumber.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling ITelecomService#isVoiceMailNumber.", e); } return false; } @@ -1538,13 +1564,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber(PhoneAccountHandle accountHandle) { - try { - if (isServiceConnected()) { - return getTelecomService().getVoiceMailNumber(accountHandle, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getVoiceMailNumber(accountHandle, mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling ITelecomService#hasVoiceMailNumber.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling ITelecomService#hasVoiceMailNumber.", e); } return null; } @@ -1569,13 +1596,14 @@ public class TelecomManager { android.Manifest.permission.READ_PHONE_NUMBERS }, conditional = true) public String getLine1Number(PhoneAccountHandle accountHandle) { - try { - if (isServiceConnected()) { - return getTelecomService().getLine1Number(accountHandle, + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getLine1Number(accountHandle, mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling ITelecomService#getLine1Number.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling ITelecomService#getLine1Number.", e); } return null; } @@ -1589,13 +1617,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInCall() { - try { - if (isServiceConnected()) { - return getTelecomService().isInCall(mContext.getOpPackageName(), + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isInCall(mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling isInCall().", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling isInCall().", e); } return false; } @@ -1610,15 +1639,16 @@ public class TelecomManager { * companion app; {@code false} otherwise. */ public boolean hasCompanionInCallServiceAccess() { - try { - if (isServiceConnected()) { - return getTelecomService().hasCompanionInCallServiceAccess( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.hasCompanionInCallServiceAccess( mContext.getOpPackageName()); - } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling hasCompanionInCallServiceAccess().", e); - if (!isSystemProcess()) { - e.rethrowAsRuntimeException(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling hasCompanionInCallServiceAccess().", e); + if (!isSystemProcess()) { + e.rethrowAsRuntimeException(); + } } } return false; @@ -1637,13 +1667,14 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isInManagedCall() { - try { - if (isServiceConnected()) { - return getTelecomService().isInManagedCall(mContext.getOpPackageName(), + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isInManagedCall(mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException calling isInManagedCall().", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException calling isInManagedCall().", e); } return false; } @@ -1666,12 +1697,13 @@ public class TelecomManager { */ @SystemApi public @CallState int getCallState() { - try { - if (isServiceConnected()) { - return getTelecomService().getCallState(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getCallState(); + } catch (RemoteException e) { + Log.d(TAG, "RemoteException calling getCallState().", e); } - } catch (RemoteException e) { - Log.d(TAG, "RemoteException calling getCallState().", e); } return TelephonyManager.CALL_STATE_IDLE; } @@ -1688,12 +1720,13 @@ public class TelecomManager { android.Manifest.permission.READ_PHONE_STATE }) public boolean isRinging() { - try { - if (isServiceConnected()) { - return getTelecomService().isRinging(mContext.getOpPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isRinging(mContext.getOpPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get ringing state of phone app.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get ringing state of phone app.", e); } return false; } @@ -1716,12 +1749,13 @@ public class TelecomManager { @RequiresPermission(Manifest.permission.ANSWER_PHONE_CALLS) @Deprecated public boolean endCall() { - try { - if (isServiceConnected()) { - return getTelecomService().endCall(mContext.getPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.endCall(mContext.getPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#endCall", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#endCall", e); } return false; } @@ -1742,12 +1776,13 @@ public class TelecomManager { {Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE}) @Deprecated public void acceptRingingCall() { - try { - if (isServiceConnected()) { - getTelecomService().acceptRingingCall(mContext.getPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.acceptRingingCall(mContext.getPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#acceptRingingCall", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#acceptRingingCall", e); } } @@ -1763,13 +1798,14 @@ public class TelecomManager { {Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE}) @Deprecated public void acceptRingingCall(int videoState) { - try { - if (isServiceConnected()) { - getTelecomService().acceptRingingCallWithVideoState( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.acceptRingingCallWithVideoState( mContext.getPackageName(), videoState); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#acceptRingingCallWithVideoState", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#acceptRingingCallWithVideoState", e); } } @@ -1793,12 +1829,13 @@ public class TelecomManager { */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void silenceRinger() { - try { - if (isServiceConnected()) { - getTelecomService().silenceRinger(mContext.getOpPackageName()); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.silenceRinger(mContext.getOpPackageName()); + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelecomService#silenceRinger", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecomService#silenceRinger", e); } } @@ -1810,13 +1847,14 @@ public class TelecomManager { android.Manifest.permission.READ_PHONE_STATE }) public boolean isTtySupported() { - try { - if (isServiceConnected()) { - return getTelecomService().isTtySupported(mContext.getOpPackageName(), + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isTtySupported(mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get TTY supported state.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get TTY supported state.", e); } return false; } @@ -1834,13 +1872,14 @@ public class TelecomManager { @SystemApi @RequiresPermission(READ_PRIVILEGED_PHONE_STATE) public @TtyMode int getCurrentTtyMode() { - try { - if (isServiceConnected()) { - return getTelecomService().getCurrentTtyMode(mContext.getOpPackageName(), + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.getCurrentTtyMode(mContext.getOpPackageName(), mContext.getAttributionTag()); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException attempting to get the current TTY mode.", e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException attempting to get the current TTY mode.", e); } return TTY_MODE_OFF; } @@ -1876,8 +1915,9 @@ public class TelecomManager { * {@link ConnectionService#onCreateIncomingConnection}. */ public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) { - try { - if (isServiceConnected()) { + ITelecomService service = getTelecomService(); + if (service != null) { + try { if (extras != null && extras.getBoolean(EXTRA_IS_HANDOVER) && mContext.getApplicationContext().getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.O_MR1) { @@ -1885,11 +1925,10 @@ public class TelecomManager { "acceptHandover for API > O-MR1"); return; } - getTelecomService().addNewIncomingCall( - phoneAccount, extras == null ? new Bundle() : extras); + service.addNewIncomingCall(phoneAccount, extras == null ? new Bundle() : extras); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException adding a new incoming call: " + phoneAccount, e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException adding a new incoming call: " + phoneAccount, e); } } @@ -1924,13 +1963,14 @@ public class TelecomManager { */ public void addNewIncomingConference(@NonNull PhoneAccountHandle phoneAccount, @NonNull Bundle extras) { - try { - if (isServiceConnected()) { - getTelecomService().addNewIncomingConference( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.addNewIncomingConference( phoneAccount, extras == null ? new Bundle() : extras); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException adding a new incoming conference: " + phoneAccount, e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException adding a new incoming conference: " + phoneAccount, e); } } @@ -1947,13 +1987,14 @@ public class TelecomManager { */ @SystemApi public void addNewUnknownCall(PhoneAccountHandle phoneAccount, Bundle extras) { - try { - if (isServiceConnected()) { - getTelecomService().addNewUnknownCall( + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.addNewUnknownCall( phoneAccount, extras == null ? new Bundle() : extras); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException adding a new unknown call: " + phoneAccount, e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException adding a new unknown call: " + phoneAccount, e); } } @@ -2374,12 +2415,13 @@ public class TelecomManager { */ public void acceptHandover(Uri srcAddr, @VideoProfile.VideoState int videoState, PhoneAccountHandle destAcct) { - try { - if (isServiceConnected()) { - getTelecomService().acceptHandover(srcAddr, videoState, destAcct); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.acceptHandover(srcAddr, videoState, destAcct); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException acceptHandover: " + e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException acceptHandover: " + e); } } @@ -2393,13 +2435,14 @@ public class TelecomManager { @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall() { - try { - if (isServiceConnected()) { - return getTelecomService().isInEmergencyCall(); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + return service.isInEmergencyCall(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException isInEmergencyCall: " + e); + return false; } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException isInEmergencyCall: " + e); - return false; } return false; } @@ -2411,12 +2454,13 @@ public class TelecomManager { * @hide */ public void handleCallIntent(Intent intent, String callingPackageProxy) { - try { - if (isServiceConnected()) { - getTelecomService().handleCallIntent(intent, callingPackageProxy); + ITelecomService service = getTelecomService(); + if (service != null) { + try { + service.handleCallIntent(intent, callingPackageProxy); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException handleCallIntent: " + e); } - } catch (RemoteException e) { - Log.e(TAG, "RemoteException handleCallIntent: " + e); } } @@ -2428,14 +2472,11 @@ public class TelecomManager { if (mTelecomServiceOverride != null) { return mTelecomServiceOverride; } - return ITelecomService.Stub.asInterface(ServiceManager.getService(Context.TELECOM_SERVICE)); - } - - private boolean isServiceConnected() { - boolean isConnected = getTelecomService() != null; - if (!isConnected) { + ITelecomService service = ITelecomService.Stub.asInterface( + ServiceManager.getService(Context.TELECOM_SERVICE)); + if (service == null) { Log.w(TAG, "Telecom Service not found."); } - return isConnected; + return service; } } -- cgit v1.2.3-59-g8ed1b From 796760c56efcd094ccda55551cfbbd52fbde9075 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Tue, 10 Nov 2020 15:32:51 -0800 Subject: Suppress all hidden abstract methods in constructable classes. Having a hidden abstract method for a class that can be extended means that public implementors cannot implement these hidden methods posing a risk that custom implementations will not have required abstract methods resulting in an exception. Bug: 151134792 Test: make update-api Change-Id: I758d12465fabc671be19bedeeceb16885de23c87 Exempt-From-Owner-Approval: large scale suppression of existing issues, no-op in terms of behavior --- .../java/android/app/job/JobScheduler.java | 3 + core/java/android/content/ContentResolver.java | 5 ++ core/java/android/content/Context.java | 28 +++++++ core/java/android/content/pm/PackageManager.java | 91 ++++++++++++++++++++++ .../hardware/camera2/CameraCaptureSession.java | 2 + core/java/android/hardware/radio/RadioTuner.java | 1 + .../AbstractInputMethodService.java | 1 + .../service/autofill/InternalTransformation.java | 1 + core/java/android/view/ViewStructure.java | 2 + core/java/android/view/Window.java | 5 ++ core/java/android/webkit/CookieManager.java | 4 + core/java/android/webkit/WebHistoryItem.java | 1 + core/java/android/webkit/WebIconDatabase.java | 1 + core/java/android/webkit/WebSettings.java | 12 +++ core/java/android/widget/AbsListView.java | 3 + core/java/android/widget/AbsSpinner.java | 1 + media/java/android/media/Image.java | 2 + telecomm/java/android/telecom/InCallService.java | 1 + telephony/java/android/telephony/CellLocation.java | 3 + .../android/telephony/ims/feature/ImsFeature.java | 2 + 20 files changed, 169 insertions(+) (limited to 'telecomm/java') diff --git a/apex/jobscheduler/framework/java/android/app/job/JobScheduler.java b/apex/jobscheduler/framework/java/android/app/job/JobScheduler.java index bf5781beb52b..361325dae7fd 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobScheduler.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobScheduler.java @@ -169,6 +169,7 @@ public abstract class JobScheduler { * @param tag Debugging tag for dumps associated with this job (instead of the service class) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public abstract @Result int scheduleAsPackage(@NonNull JobInfo job, @NonNull String packageName, @@ -211,6 +212,7 @@ public abstract class JobScheduler { * Returns a list of all currently-executing jobs. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract List getStartedJobs(); /** @@ -220,5 +222,6 @@ public abstract class JobScheduler { *

This is a slow operation, so it should be called sparingly. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract List getAllJobSnapshots(); } \ No newline at end of file diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 422d3f7c6784..e35fb037582a 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -839,6 +839,7 @@ public abstract class ContentResolver implements ContentInterface { } /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage protected abstract IContentProvider acquireProvider(Context c, String name); @@ -855,15 +856,19 @@ public abstract class ContentResolver implements ContentInterface { } /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean releaseProvider(IContentProvider icp); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage protected abstract IContentProvider acquireUnstableProvider(Context c, String name); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean releaseUnstableProvider(IContentProvider icp); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void unstableProviderDied(IContentProvider icp); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 46d4f222a6b4..fb1366d6d9ed 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -811,6 +811,7 @@ public abstract class Context { * case {@link #getOpPackageName()} will be the name of the primary package in * that process (so that app ops uid verification will work with the name). */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract String getBasePackageName(); @@ -927,6 +928,7 @@ public abstract class Context { * @see #MODE_PRIVATE * @removed */ + @SuppressWarnings("HiddenAbstractMethod") public abstract SharedPreferences getSharedPreferences(File file, @PreferencesMode int mode); /** @@ -957,6 +959,7 @@ public abstract class Context { public abstract boolean deleteSharedPreferences(String name); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void reloadSharedPreferences(); /** @@ -1045,6 +1048,7 @@ public abstract class Context { * @see #getSharedPreferences(String, int) * @removed */ + @SuppressWarnings("HiddenAbstractMethod") public abstract File getSharedPreferencesPath(String name); /** @@ -1516,6 +1520,7 @@ public abstract class Context { * There is no guarantee when these files will be deleted. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @SystemApi public abstract File getPreloadsFileCache(); @@ -2184,6 +2189,7 @@ public abstract class Context { * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user, String[] receiverPermissions); @@ -2214,6 +2220,7 @@ public abstract class Context { * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void sendBroadcast(Intent intent, @Nullable String receiverPermission, @@ -2224,6 +2231,7 @@ public abstract class Context { * of an associated app op as per {@link android.app.AppOpsManager}. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void sendBroadcast(Intent intent, String receiverPermission, int appOp); @@ -2339,6 +2347,7 @@ public abstract class Context { * @see android.app.Activity#RESULT_OK * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void sendOrderedBroadcast(@NonNull Intent intent, @Nullable String receiverPermission, @Nullable Bundle options, @@ -2351,6 +2360,7 @@ public abstract class Context { * of an associated app op as per {@link android.app.AppOpsManager}. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void sendOrderedBroadcast(Intent intent, String receiverPermission, int appOp, BroadcastReceiver resultReceiver, @@ -2404,6 +2414,7 @@ public abstract class Context { * @see #sendBroadcast(Intent, String, Bundle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission Intent intent, @@ -2426,6 +2437,7 @@ public abstract class Context { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract void sendBroadcastAsUser(@RequiresPermission Intent intent, @@ -2472,6 +2484,7 @@ public abstract class Context { * BroadcastReceiver, Handler, int, String, Bundle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract void sendOrderedBroadcastAsUser(Intent intent, UserHandle user, @@ -2485,6 +2498,7 @@ public abstract class Context { * BroadcastReceiver, Handler, int, String, Bundle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage public abstract void sendOrderedBroadcastAsUser(Intent intent, UserHandle user, @@ -2699,6 +2713,7 @@ public abstract class Context { * @hide * This is just here for sending CONNECTIVITY_ACTION. */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @RequiresPermission(allOf = { android.Manifest.permission.INTERACT_ACROSS_USERS, @@ -2989,6 +3004,7 @@ public abstract class Context { * @see #sendBroadcast * @see #unregisterReceiver */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) @UnsupportedAppUsage @@ -3099,6 +3115,7 @@ public abstract class Context { /** * @hide like {@link #startForegroundService(Intent)} but for a specific user. */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract ComponentName startForegroundServiceAsUser(Intent service, UserHandle user); @@ -3137,6 +3154,7 @@ public abstract class Context { /** * @hide like {@link #startService(Intent)} but for a specific user. */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage @@ -3145,6 +3163,7 @@ public abstract class Context { /** * @hide like {@link #stopService(Intent)} but for a specific user. */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract boolean stopServiceAsUser(Intent service, UserHandle user); @@ -5282,6 +5301,7 @@ public abstract class Context { public abstract int checkPermission(@NonNull String permission, int pid, int uid); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @PackageManager.PermissionResult @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract int checkPermission(@NonNull String permission, int pid, int uid, @@ -5509,6 +5529,7 @@ public abstract class Context { @Intent.AccessUriMode int modeFlags); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @PackageManager.PermissionResult public abstract int checkUriPermission(Uri uri, int pid, int uid, @Intent.AccessUriMode int modeFlags, IBinder callerToken); @@ -5793,6 +5814,7 @@ public abstract class Context { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract Context createApplicationContext(ApplicationInfo application, @CreatePackageOptions int flags) throws PackageManager.NameNotFoundException; @@ -6024,6 +6046,7 @@ public abstract class Context { * @see #isCredentialProtectedStorage() * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract Context createCredentialProtectedStorageContext(); @@ -6036,6 +6059,7 @@ public abstract class Context { * @return The compatibility info holder, or null if not required by the application. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract DisplayAdjustments getDisplayAdjustments(int displayId); /** @@ -6070,12 +6094,14 @@ public abstract class Context { * @see #getDisplay() * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @TestApi public abstract int getDisplayId(); /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void updateDisplay(int displayId); /** @@ -6104,6 +6130,7 @@ public abstract class Context { * @see #createCredentialProtectedStorageContext() * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract boolean isCredentialProtectedStorage(); @@ -6111,6 +6138,7 @@ public abstract class Context { * Returns true if the context can load unsafe resources, e.g. fonts. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract boolean canLoadUnsafeResources(); /** diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a77d8b17e1f7..2d3fb24c02cf 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3919,6 +3919,7 @@ public abstract class PackageManager { * found on the system. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage public abstract PackageInfo getPackageInfoAsUser(@NonNull String packageName, @@ -3985,6 +3986,7 @@ public abstract class PackageManager { * does not contain such an activity. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract @Nullable Intent getCarLaunchIntentForPackage(@NonNull String packageName); /** @@ -4050,6 +4052,7 @@ public abstract class PackageManager { * found on the system. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract int getPackageUidAsUser(@NonNull String packageName, @UserIdInt int userId) throws NameNotFoundException; @@ -4068,6 +4071,7 @@ public abstract class PackageManager { * found on the system. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract int getPackageUidAsUser(@NonNull String packageName, @PackageInfoFlags int flags, @UserIdInt int userId) throws NameNotFoundException; @@ -4110,6 +4114,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract boolean arePermissionsIndividuallyControlled(); @@ -4118,6 +4123,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract boolean isWirelessConsentModeEnabled(); /** @@ -4170,6 +4176,7 @@ public abstract class PackageManager { @ApplicationInfoFlags int flags) throws NameNotFoundException; /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract ApplicationInfo getApplicationInfoAsUser(@NonNull String packageName, @@ -4360,6 +4367,7 @@ public abstract class PackageManager { * deleted with {@code DELETE_KEEP_DATA} flag set). * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) @@ -4408,6 +4416,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage @NonNull @TestApi @@ -4521,6 +4530,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String packageName, @@ -4547,6 +4557,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String packageName, @@ -4591,6 +4602,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, @@ -4613,6 +4625,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, @@ -4888,6 +4901,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean shouldShowRequestPermissionRationale(@NonNull String permName); @@ -5003,6 +5017,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @TestApi public abstract @Nullable String[] getNamesForUids(int[] uids); @@ -5019,6 +5034,7 @@ public abstract class PackageManager { * found on the system. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract int getUidForSharedUser(@NonNull String sharedUserName) throws NameNotFoundException; @@ -5062,6 +5078,7 @@ public abstract class PackageManager { * deleted with {@code DELETE_KEEP_DATA} flag set). * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @TestApi public abstract List getInstalledApplicationsAsUser( @@ -5074,6 +5091,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.ACCESS_INSTANT_APPS) public abstract @NonNull List getInstantApps(); @@ -5085,6 +5103,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.ACCESS_INSTANT_APPS) public abstract @Nullable Drawable getInstantAppIcon(String packageName); @@ -5133,6 +5152,7 @@ public abstract class PackageManager { * deprecated * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract int getInstantAppCookieMaxSize(); /** @@ -5190,6 +5210,7 @@ public abstract class PackageManager { /** * @removed */ + @SuppressWarnings("HiddenAbstractMethod") public abstract boolean setInstantAppCookie(@Nullable byte[] cookie); /** @@ -5228,6 +5249,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract @NonNull List getSharedLibrariesAsUser( @InstallFlags int flags, @UserIdInt int userId); @@ -5240,6 +5262,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @RequiresPermission(Manifest.permission.ACCESS_SHARED_LIBRARIES) @SystemApi @@ -5259,6 +5282,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage @TestApi public abstract @NonNull String getServicesSystemSharedLibraryPackageName(); @@ -5270,6 +5294,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage @TestApi public abstract @NonNull String getSharedSystemSharedLibraryPackageName(); @@ -5376,6 +5401,7 @@ public abstract class PackageManager { * containing something else, such as the activity resolver. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage public abstract ResolveInfo resolveActivityAsUser(@NonNull Intent intent, @@ -5417,6 +5443,7 @@ public abstract class PackageManager { * empty list is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract List queryIntentActivitiesAsUser(@NonNull Intent intent, @@ -5440,6 +5467,7 @@ public abstract class PackageManager { * empty list is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi @@ -5502,6 +5530,7 @@ public abstract class PackageManager { * no matching receivers, an empty list or null is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @@ -5513,6 +5542,7 @@ public abstract class PackageManager { /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract List queryBroadcastReceiversAsUser(@NonNull Intent intent, @@ -5551,6 +5581,7 @@ public abstract class PackageManager { /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable public abstract ResolveInfo resolveServiceAsUser(@NonNull Intent intent, @ResolveInfoFlags int flags, @UserIdInt int userId); @@ -5583,6 +5614,7 @@ public abstract class PackageManager { * empty list or null is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract List queryIntentServicesAsUser(@NonNull Intent intent, @@ -5621,6 +5653,7 @@ public abstract class PackageManager { * no matching services, an empty list or null is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract List queryIntentContentProvidersAsUser( @@ -5688,6 +5721,7 @@ public abstract class PackageManager { * provider. If a provider was not found, returns null. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage public abstract ProviderInfo resolveContentProviderAsUser(@NonNull String providerName, @@ -6072,6 +6106,7 @@ public abstract class PackageManager { * @return the drawable or null if no drawable is required. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage public abstract Drawable getUserBadgeForDensity(@NonNull UserHandle user, int density); @@ -6090,6 +6125,7 @@ public abstract class PackageManager { * @return the drawable or null if no drawable is required. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage public abstract Drawable getUserBadgeForDensityNoBackground(@NonNull UserHandle user, @@ -6228,6 +6264,7 @@ public abstract class PackageManager { * TODO(b/170852794): mark maxTargetSdk as {@code Build.VERSION_CODES.S} * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170928809, publicAlternatives = "Use {@code Context#createContextAsUser(UserHandle, int)}" @@ -6280,6 +6317,7 @@ public abstract class PackageManager { * * @deprecated use {@link PackageInstaller#installExistingPackage()} instead. */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @SystemApi public abstract int installExistingPackage(@NonNull String packageName) @@ -6292,6 +6330,7 @@ public abstract class PackageManager { * * @deprecated use {@link PackageInstaller#installExistingPackage()} instead. */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @SystemApi public abstract int installExistingPackage(@NonNull String packageName, @@ -6304,6 +6343,7 @@ public abstract class PackageManager { * * @deprecated use {@link PackageInstaller#installExistingPackage()} instead. */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @RequiresPermission(anyOf = { Manifest.permission.INSTALL_EXISTING_PACKAGES, @@ -6384,6 +6424,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT) public abstract void verifyIntentFilter(int verificationId, int verificationCode, @@ -6409,6 +6450,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract int getIntentVerificationStatusAsUser(@NonNull String packageName, @@ -6434,6 +6476,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(@NonNull String packageName, @@ -6451,6 +6494,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi public abstract List getIntentFilterVerifications( @@ -6467,6 +6511,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi public abstract List getAllIntentFilters(@NonNull String packageName); @@ -6481,6 +6526,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @SystemApi @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL) @@ -6498,6 +6544,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(allOf = { Manifest.permission.SET_PREFERRED_APPLICATIONS, @@ -6524,6 +6571,7 @@ public abstract class PackageManager { @Nullable String installerPackageName); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(@NonNull String packageName, boolean updateAvaialble); @@ -6544,6 +6592,7 @@ public abstract class PackageManager { * indicate that no callback is desired. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(Manifest.permission.DELETE_PACKAGES) @UnsupportedAppUsage public abstract void deletePackage(@NonNull String packageName, @@ -6564,6 +6613,7 @@ public abstract class PackageManager { * @param userId The user Id * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(anyOf = { Manifest.permission.DELETE_PACKAGES, Manifest.permission.INTERACT_ACROSS_USERS_FULL}) @@ -6581,6 +6631,7 @@ public abstract class PackageManager { * * @deprecated use {@link #getInstallSourceInfo(String)} instead */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @Nullable public abstract String getInstallerPackageName(@NonNull String packageName); @@ -6620,6 +6671,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void clearApplicationUserData(@NonNull String packageName, @Nullable IPackageDataObserver observer); @@ -6639,6 +6691,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void deleteApplicationCacheFiles(@NonNull String packageName, @Nullable IPackageDataObserver observer); @@ -6661,6 +6714,7 @@ public abstract class PackageManager { * callback is desired. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void deleteApplicationCacheFilesAsUser(@NonNull String packageName, @UserIdInt int userId, @Nullable IPackageDataObserver observer); @@ -6694,6 +6748,7 @@ public abstract class PackageManager { } /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void freeStorageAndNotify(@Nullable String volumeUuid, long freeStorageSize, @Nullable IPackageDataObserver observer); @@ -6727,6 +6782,7 @@ public abstract class PackageManager { } /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void freeStorage(@Nullable String volumeUuid, long freeStorageSize, @Nullable IntentSender pi); @@ -6750,6 +6806,7 @@ public abstract class PackageManager { * @deprecated use {@link StorageStatsManager} instead. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @UnsupportedAppUsage public abstract void getPackageSizeInfoAsUser(@NonNull String packageName, @@ -6881,6 +6938,7 @@ public abstract class PackageManager { * an app to be responsible for a particular role and to check current role * holders, see {@link android.app.role.RoleManager}. */ + @SuppressWarnings("HiddenAbstractMethod") @Deprecated @UnsupportedAppUsage public abstract void replacePreferredActivity(@NonNull IntentFilter filter, int match, @@ -6988,6 +7046,7 @@ public abstract class PackageManager { * default, if any. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage public abstract ComponentName getHomeActivities(@NonNull List outActivities); @@ -7089,6 +7148,7 @@ public abstract class PackageManager { * @param userId Ther userId of the user whose restrictions are to be flushed. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void flushPackageRestrictionsAsUser(@UserIdInt int userId); @@ -7099,6 +7159,7 @@ public abstract class PackageManager { * or by installing it, such as with {@link #installExistingPackage(String)} * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean setApplicationHiddenSettingAsUser(@NonNull String packageName, boolean hidden, @NonNull UserHandle userHandle); @@ -7108,6 +7169,7 @@ public abstract class PackageManager { * @see #setApplicationHiddenSettingAsUser(String, boolean, UserHandle) * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean getApplicationHiddenSettingAsUser(@NonNull String packageName, @NonNull UserHandle userHandle); @@ -7141,6 +7203,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS) public abstract void addOnPermissionsChangeListener( @@ -7153,6 +7216,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @RequiresPermission(Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS) public abstract void removeOnPermissionsChangeListener( @@ -7166,6 +7230,7 @@ public abstract class PackageManager { * application's AndroidManifest.xml. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract KeySet getKeySetByAlias(@NonNull String packageName, @NonNull String alias); @@ -7173,6 +7238,7 @@ public abstract class PackageManager { /** Return the signing {@link KeySet} for this application. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract KeySet getSigningKeySet(@NonNull String packageName); @@ -7184,6 +7250,7 @@ public abstract class PackageManager { * Compare to {@link #isSignedByExactly(String packageName, KeySet ks)}. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isSignedBy(@NonNull String packageName, @NonNull KeySet ks); @@ -7193,6 +7260,7 @@ public abstract class PackageManager { * {@link #isSignedBy(String packageName, KeySet ks)}. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isSignedByExactly(@NonNull String packageName, @NonNull KeySet ks); @@ -7410,6 +7478,7 @@ public abstract class PackageManager { * @throws IllegalArgumentException if the package was not found. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isPackageSuspendedForUser(@NonNull String packageName, int userId); @@ -7485,6 +7554,7 @@ public abstract class PackageManager { * @param packageName the package to change the category hint for. * @param categoryHint the category hint to set. */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void setApplicationCategoryHint(@NonNull String packageName, @ApplicationInfo.Category int categoryHint); @@ -7500,34 +7570,43 @@ public abstract class PackageManager { } /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract int getMoveStatus(int moveId); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void registerMoveCallback(@NonNull MoveCallback callback, @NonNull Handler handler); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void unregisterMoveCallback(@NonNull MoveCallback callback); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract int movePackage(@NonNull String packageName, @NonNull VolumeInfo vol); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract @Nullable VolumeInfo getPackageCurrentVolume(@NonNull ApplicationInfo app); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public abstract List getPackageCandidateVolumes( @NonNull ApplicationInfo app); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") public abstract int movePrimaryStorage(@NonNull VolumeInfo vol); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") public abstract @Nullable VolumeInfo getPrimaryStorageCurrentVolume(); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") public abstract @NonNull List getPrimaryStorageCandidateVolumes(); /** @@ -7537,6 +7616,7 @@ public abstract class PackageManager { * @return identity that uniquely identifies current device * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull public abstract VerifierDeviceIdentity getVerifierDeviceIdentity(); @@ -7545,6 +7625,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isUpgrade(); @@ -7574,6 +7655,7 @@ public abstract class PackageManager { * {@link #ONLY_IF_NO_MATCH_FOUND}. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void addCrossProfileIntentFilter(@NonNull IntentFilter filter, @UserIdInt int sourceUserId, @UserIdInt int targetUserId, int flags); @@ -7585,12 +7667,14 @@ public abstract class PackageManager { * @param sourceUserId The source user id. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void clearCrossProfileIntentFilters(@UserIdInt int sourceUserId); /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract Drawable loadItemIcon(@NonNull PackageItemInfo itemInfo, @@ -7599,12 +7683,14 @@ public abstract class PackageManager { /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage public abstract Drawable loadUnbadgedItemIcon(@NonNull PackageItemInfo itemInfo, @Nullable ApplicationInfo appInfo); /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isPackageAvailable(@NonNull String packageName); @@ -7825,6 +7911,7 @@ public abstract class PackageManager { * user, {@code INSTALL_REASON_UNKNOWN} is returned. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @TestApi @InstallReason public abstract int getInstallReason(@NonNull String packageName, @NonNull UserHandle user); @@ -7853,6 +7940,7 @@ public abstract class PackageManager { * @see {@link android.content.Intent#ACTION_INSTANT_APP_RESOLVER_SETTINGS} * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @SystemApi public abstract ComponentName getInstantAppResolverSettingsComponent(); @@ -7864,6 +7952,7 @@ public abstract class PackageManager { * @see {@link android.content.Intent#ACTION_INSTALL_INSTANT_APP_PACKAGE} * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable @SystemApi public abstract ComponentName getInstantAppInstallerComponent(); @@ -7874,6 +7963,7 @@ public abstract class PackageManager { * @see {@link android.provider.Settings.Secure#ANDROID_ID} * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @Nullable public abstract String getInstantAppAndroidId(@NonNull String packageName, @NonNull UserHandle user); @@ -7918,6 +8008,7 @@ public abstract class PackageManager { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void registerDexModule(@NonNull String dexModulePath, @Nullable DexModuleRegisterCallback callback); diff --git a/core/java/android/hardware/camera2/CameraCaptureSession.java b/core/java/android/hardware/camera2/CameraCaptureSession.java index f0a83f0b00b0..e8581595ad91 100644 --- a/core/java/android/hardware/camera2/CameraCaptureSession.java +++ b/core/java/android/hardware/camera2/CameraCaptureSession.java @@ -188,6 +188,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void prepare(int maxCount, @NonNull Surface surface) throws CameraAccessException; @@ -227,6 +228,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void tearDown(@NonNull Surface surface) throws CameraAccessException; /** diff --git a/core/java/android/hardware/radio/RadioTuner.java b/core/java/android/hardware/radio/RadioTuner.java index 0edd05533dd3..969db96561d7 100644 --- a/core/java/android/hardware/radio/RadioTuner.java +++ b/core/java/android/hardware/radio/RadioTuner.java @@ -257,6 +257,7 @@ public abstract class RadioTuner { * @throws IllegalArgumentException if id==0 * @hide This API is not thoroughly elaborated yet */ + @SuppressWarnings("HiddenAbstractMethod") public abstract @Nullable Bitmap getMetadataImage(int id); /** diff --git a/core/java/android/inputmethodservice/AbstractInputMethodService.java b/core/java/android/inputmethodservice/AbstractInputMethodService.java index 3ca5207d867c..cd436374b489 100644 --- a/core/java/android/inputmethodservice/AbstractInputMethodService.java +++ b/core/java/android/inputmethodservice/AbstractInputMethodService.java @@ -202,6 +202,7 @@ public abstract class AbstractInputMethodService extends Service * @param args The arguments passed to the dump method. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") abstract void dumpProtoInternal(FileDescriptor fd, String[] args); /** diff --git a/core/java/android/service/autofill/InternalTransformation.java b/core/java/android/service/autofill/InternalTransformation.java index 0dba2b9bb9a6..d31ea99470cf 100644 --- a/core/java/android/service/autofill/InternalTransformation.java +++ b/core/java/android/service/autofill/InternalTransformation.java @@ -45,6 +45,7 @@ public abstract class InternalTransformation implements Transformation, Parcelab * @param template the {@link RemoteViews presentation template}. * @param childViewId resource id of the child view inside the template. */ + @SuppressWarnings("HiddenAbstractMethod") abstract void apply(@NonNull ValueFinder finder, @NonNull RemoteViews template, int childViewId) throws Exception; diff --git a/core/java/android/view/ViewStructure.java b/core/java/android/view/ViewStructure.java index 606e8f99999a..29ce231d5d87 100644 --- a/core/java/android/view/ViewStructure.java +++ b/core/java/android/view/ViewStructure.java @@ -97,6 +97,7 @@ public abstract class ViewStructure { public abstract void setVisibility(int visibility); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void setAssistBlocked(boolean state); /** @@ -431,6 +432,7 @@ public abstract class ViewStructure { public abstract void asyncCommit(); /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract Rect getTempRect(); /** diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 8dd4b667d357..9c163783124e 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -1387,6 +1387,7 @@ public abstract class Window { } /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void alwaysReadCloseOnTouchAttr(); @@ -1567,6 +1568,7 @@ public abstract class Window { * * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void clearContentView(); /** @@ -2636,18 +2638,21 @@ public abstract class Window { * Called when the activity changes from fullscreen mode to multi-window mode and visa-versa. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void onMultiWindowModeChanged(); /** * Called when the activity changes to/from picture-in-picture mode. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void onPictureInPictureModeChanged(boolean isInPictureInPictureMode); /** * Called when the activity just relaunched. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void reportActivityRelaunched(); /** diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index f62a28ec0d07..023d9ff28f41 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -154,6 +154,7 @@ public abstract class CookieManager { * HTTP request header * @hide Used by Browser and by WebViewProvider implementations. */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract String getCookie(String url, boolean privateBrowsing); @@ -230,6 +231,7 @@ public abstract class CookieManager { * @param privateBrowsing whether to use the private browsing cookie jar * @hide Used by Browser and WebViewProvider implementations. */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract boolean hasCookies(boolean privateBrowsing); @@ -264,6 +266,7 @@ public abstract class CookieManager { * * @hide Only for use by WebViewProvider implementations */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi protected abstract boolean allowFileSchemeCookiesImpl(); @@ -299,6 +302,7 @@ public abstract class CookieManager { * * @hide Only for use by WebViewProvider implementations */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi protected abstract void setAcceptFileSchemeCookiesImpl(boolean accept); } diff --git a/core/java/android/webkit/WebHistoryItem.java b/core/java/android/webkit/WebHistoryItem.java index b9e704285f84..2cb37b440128 100644 --- a/core/java/android/webkit/WebHistoryItem.java +++ b/core/java/android/webkit/WebHistoryItem.java @@ -35,6 +35,7 @@ public abstract class WebHistoryItem implements Cloneable { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract int getId(); diff --git a/core/java/android/webkit/WebIconDatabase.java b/core/java/android/webkit/WebIconDatabase.java index 08956e0f1b78..b70565816037 100644 --- a/core/java/android/webkit/WebIconDatabase.java +++ b/core/java/android/webkit/WebIconDatabase.java @@ -75,6 +75,7 @@ public abstract class WebIconDatabase { /** {@hide} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void bulkRequestIconForPageUrl(ContentResolver cr, String where, IconListener listener); diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 91b9390745ef..9b753f1b2d44 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -268,6 +268,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract void setNavDump(boolean enabled); @@ -280,6 +281,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract boolean getNavDump(); @@ -457,6 +459,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract void setUseWebViewBackgroundForOverscrollBackground(boolean view); @@ -469,6 +472,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract boolean getUseWebViewBackgroundForOverscrollBackground(); @@ -534,6 +538,7 @@ public abstract class WebSettings { * Developers should access this via {@link CookieManager#setShouldAcceptThirdPartyCookies}. * @hide Internal API. */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void setAcceptThirdPartyCookies(boolean accept); @@ -542,6 +547,7 @@ public abstract class WebSettings { * Developers should access this via {@link CookieManager#getShouldAcceptThirdPartyCookies}. * @hide Internal API */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract boolean getAcceptThirdPartyCookies(); @@ -669,6 +675,7 @@ public abstract class WebSettings { * @deprecated Please use {@link #setUserAgentString} instead. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract void setUserAgent(int ua); @@ -687,6 +694,7 @@ public abstract class WebSettings { * @deprecated Please use {@link #getUserAgentString} instead. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract int getUserAgent(); @@ -1050,6 +1058,7 @@ public abstract class WebSettings { * {@link #setPluginState} * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract void setPluginsEnabled(boolean flag); @@ -1259,6 +1268,7 @@ public abstract class WebSettings { * @deprecated This method has been replaced by {@link #getPluginState} * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi @Deprecated public abstract boolean getPluginsEnabled(); @@ -1445,6 +1455,7 @@ public abstract class WebSettings { * WebView. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract void setVideoOverlayForEmbeddedEncryptedVideoEnabled(boolean flag); @@ -1455,6 +1466,7 @@ public abstract class WebSettings { * @see #setVideoOverlayForEmbeddedEncryptedVideoEnabled * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @SystemApi public abstract boolean getVideoOverlayForEmbeddedEncryptedVideoEnabled(); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 88c0809613ee..e740cc2b1f7a 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -5348,6 +5348,7 @@ public abstract class AbsListView extends AdapterView implements Te * * @param down true if the scroll is going down, false if it is going up */ + @SuppressWarnings("HiddenAbstractMethod") abstract void fillGap(boolean down); void hideSelector() { @@ -5385,6 +5386,7 @@ public abstract class AbsListView extends AdapterView implements Te * @param y Where the user touched * @return The position of the first (or only) item in the row containing y */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage abstract int findMotionRow(int y); @@ -5432,6 +5434,7 @@ public abstract class AbsListView extends AdapterView implements Te * * @param position the position of the new selection */ + @SuppressWarnings("HiddenAbstractMethod") abstract void setSelectionInt(int position); /** diff --git a/core/java/android/widget/AbsSpinner.java b/core/java/android/widget/AbsSpinner.java index daf6914ff030..76e97ad7a0f6 100644 --- a/core/java/android/widget/AbsSpinner.java +++ b/core/java/android/widget/AbsSpinner.java @@ -310,6 +310,7 @@ public abstract class AbsSpinner extends AdapterView { } } + @SuppressWarnings("HiddenAbstractMethod") abstract void layout(int delta, boolean animate); @Override diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java index 610bffe13eae..0ef4b94f6e37 100644 --- a/media/java/android/media/Image.java +++ b/media/java/android/media/Image.java @@ -200,6 +200,7 @@ public abstract class Image implements AutoCloseable { * @return The window transformation that needs to be applied for this frame. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract int getTransform(); /** @@ -207,6 +208,7 @@ public abstract class Image implements AutoCloseable { * @return The scaling mode that needs to be applied for this frame. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract int getScalingMode(); /** diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index 982e5f30e28c..07de61759d59 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -680,6 +680,7 @@ public abstract class InCallService extends Service { public static abstract class VideoCall { /** @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void destroy(); /** diff --git a/telephony/java/android/telephony/CellLocation.java b/telephony/java/android/telephony/CellLocation.java index 8f5ec365e65c..e595002d175b 100644 --- a/telephony/java/android/telephony/CellLocation.java +++ b/telephony/java/android/telephony/CellLocation.java @@ -98,12 +98,14 @@ public abstract class CellLocation { /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract void fillInNotifierBundle(Bundle bundle); /** * @hide */ + @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract boolean isEmpty(); @@ -111,6 +113,7 @@ public abstract class CellLocation { * Invalidate this object. The location area code and the cell id are set to -1. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract void setStateInvalid(); /** diff --git a/telephony/java/android/telephony/ims/feature/ImsFeature.java b/telephony/java/android/telephony/ims/feature/ImsFeature.java index b0a7b62c88ab..96ca0225040f 100644 --- a/telephony/java/android/telephony/ims/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/feature/ImsFeature.java @@ -509,6 +509,7 @@ public abstract class ImsFeature { * @return true if the capability is enabled, false otherwise. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") public abstract boolean queryCapabilityConfiguration(int capability, int radioTech); /** @@ -547,5 +548,6 @@ public abstract class ImsFeature { * @return Binder instance that the framework will use to communicate with this feature. * @hide */ + @SuppressWarnings("HiddenAbstractMethod") protected abstract IInterface getBinder(); } -- cgit v1.2.3-59-g8ed1b From 1394a019e793989bf44324784e89eb1421a0d9c8 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Thu, 12 Nov 2020 18:26:09 -0800 Subject: 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 --- core/java/android/app/admin/DevicePolicyManager.java | 4 ++-- core/java/android/hardware/hdmi/HdmiControlManager.java | 10 +++++----- core/java/android/hardware/location/ContextHubManager.java | 6 +++--- core/java/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 +++--- .../service/persistentdata/PersistentDataBlockManager.java | 6 +++--- media/java/android/media/AudioManager.java | 6 +++--- telecomm/java/android/telecom/TelecomManager.java | 8 ++++---- telephony/java/android/telephony/CarrierConfigManager.java | 2 +- telephony/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(-) (limited to 'telecomm/java') diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f09e7526d6c1..16ae081049ef 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 500b2998e009..f1534d95a16c 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 1ed791d66f74..d44480796d75 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 21634cc544e7..1c35cb66ada8 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 737683050528..4e019cf0732e 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 13b30f43ff7a..72cd8ba204fd 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 5d3c66cc3f34..cfc3e01c23c5 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 0bf68b734b8a..8242f4e2c9dc 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 29477366379b..457888361f73 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 b335a9032b3e..5bba747894dc 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 b806313e32f8..902dc0619014 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 96f3ce0b39e8..4eacad3fd0ac 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 73c52ab0ab1b..034defb083de 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 41d0857214f3..7c051f0962c4 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(); } -- cgit v1.2.3-59-g8ed1b From 767cda30ef4d389885520d71961bf84082526628 Mon Sep 17 00:00:00 2001 From: Kevin Jeon Date: Tue, 17 Nov 2020 01:40:16 +0000 Subject: Cache the telecom service in getTelecomService() This change caches the results of getTelecomService() and implements a death recipient that clears the cache when necessary. Bug: 173460628 Bug: 173039862 Test: manual testing (phone calls, dialer tab transitions) Change-Id: I438d479c78319eafa917ba661d7cbd49600fff2c --- telecomm/java/android/telecom/TelecomManager.java | 46 ++++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'telecomm/java') diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 7143bef8d608..960b0df40061 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -32,6 +32,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.IBinder; import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; @@ -42,6 +43,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import com.android.internal.annotations.GuardedBy; import com.android.internal.telecom.ITelecomService; import java.lang.annotation.Retention; @@ -943,6 +945,15 @@ public class TelecomManager { private static final String TAG = "TelecomManager"; + + /** Cached service handles, cleared by resetServiceCache() at death */ + private static final Object CACHE_LOCK = new Object(); + + @GuardedBy("CACHE_LOCK") + private static ITelecomService sTelecomService; + @GuardedBy("CACHE_LOCK") + private static final DeathRecipient SERVICE_DEATH = new DeathRecipient(); + private final Context mContext; private final ITelecomService mTelecomServiceOverride; @@ -2472,11 +2483,36 @@ public class TelecomManager { if (mTelecomServiceOverride != null) { return mTelecomServiceOverride; } - ITelecomService service = ITelecomService.Stub.asInterface( - ServiceManager.getService(Context.TELECOM_SERVICE)); - if (service == null) { - Log.w(TAG, "Telecom Service not found."); + if (sTelecomService == null) { + ITelecomService temp = ITelecomService.Stub.asInterface( + ServiceManager.getService(Context.TELECOM_SERVICE)); + synchronized (CACHE_LOCK) { + if (sTelecomService == null && temp != null) { + try { + sTelecomService = temp; + sTelecomService.asBinder().linkToDeath(SERVICE_DEATH, 0); + } catch (Exception e) { + sTelecomService = null; + } + } + } + } + return sTelecomService; + } + + private static class DeathRecipient implements IBinder.DeathRecipient { + @Override + public void binderDied() { + resetServiceCache(); + } + } + + private static void resetServiceCache() { + synchronized (CACHE_LOCK) { + if (sTelecomService != null) { + sTelecomService.asBinder().unlinkToDeath(SERVICE_DEATH, 0); + sTelecomService = null; + } } - return service; } } -- cgit v1.2.3-59-g8ed1b From d24aea31483c70fa684f8b54965dc045b263f34b Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Tue, 24 Nov 2020 15:08:49 -0800 Subject: Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling. Test: cts Bug: 173437870 Change-Id: Ibd1b0f0bc66487cfdb05d3de46c7e8df74eeb8cc --- core/api/current.txt | 1 + telecomm/java/android/telecom/PhoneAccount.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'telecomm/java') diff --git a/core/api/current.txt b/core/api/current.txt index 9f7f3917a11f..23382be8bec9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -44553,6 +44553,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder toBuilder(); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 16384; // 0x4000 + field public static final int CAPABILITY_CALL_COMPOSER = 32768; // 0x8000 field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40 field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1 diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 5024ae27ee49..835ecaa8c90d 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -361,7 +361,13 @@ public final class PhoneAccount implements Parcelable { */ public static final int CAPABILITY_ADHOC_CONFERENCE_CALLING = 0x4000; - /* NEXT CAPABILITY: 0x8000 */ + /** + * Flag indicating whether this {@link PhoneAccount} is capable of supporting the call composer + * functionality for enriched calls. + */ + public static final int CAPABILITY_CALL_COMPOSER = 0x8000; + + /* NEXT CAPABILITY: 0x10000 */ /** * URI scheme for telephone number URIs. @@ -1088,6 +1094,9 @@ public final class PhoneAccount implements Parcelable { if (hasCapabilities(CAPABILITY_ADHOC_CONFERENCE_CALLING)) { sb.append("AdhocConf"); } + if (hasCapabilities(CAPABILITY_CALL_COMPOSER)) { + sb.append("CallComposer "); + } return sb.toString(); } -- cgit v1.2.3-59-g8ed1b From e75ae1662c7b802eb19952d1d8e722dbfca7485b Mon Sep 17 00:00:00 2001 From: Nazanin Date: Mon, 23 Nov 2020 15:20:02 -0800 Subject: Add an event and a parcelable to receive bluetooth framework call quality signal Bug: 173137125 Test: manual test check for regression Change-Id: I38e70ea284707d39cec7cb4fbdfd36be4f83e403 --- core/api/system-current.txt | 27 +++ .../telecom/BluetoothCallQualityReport.java | 256 +++++++++++++++++++++ 2 files changed, 283 insertions(+) create mode 100644 telecomm/java/android/telecom/BluetoothCallQualityReport.java (limited to 'telecomm/java') diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a56b39675c36..2b6ad82cb2d5 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9702,6 +9702,33 @@ package android.telecom { field @Deprecated public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5 } + public final class BluetoothCallQualityReport implements android.os.Parcelable { + method public int describeContents(); + method @IntRange(from=0) public int getNegativeAcknowledgementCount(); + method @IntRange(from=0) public int getPacketsNotReceivedCount(); + method @IntRange(from=0) public int getRetransmittedPacketsCount(); + method @IntRange(from=0xffffff81, to=20) public int getRssiDbm(); + method public long getSentTimestampMillis(); + method public int getSnrDb(); + method public boolean isChoppyVoice(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator CREATOR; + field public static final String EVENT_BLUETOOTH_CALL_QUALITY_REPORT = "android.telecom.event.BLUETOOTH_CALL_QUALITY_REPORT"; + field public static final String EXTRA_BLUETOOTH_CALL_QUALITY_REPORT = "android.telecom.extra.BLUETOOTH_CALL_QUALITY_REPORT"; + } + + public static final class BluetoothCallQualityReport.Builder { + ctor public BluetoothCallQualityReport.Builder(); + method @NonNull public android.telecom.BluetoothCallQualityReport build(); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setChoppyVoice(boolean); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setNegativeAcknowledgementCount(int); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setPacketsNotReceivedCount(int); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setRetransmittedPacketsCount(int); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setRssiDbm(int); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setSentTimestampMillis(long); + method @NonNull public android.telecom.BluetoothCallQualityReport.Builder setSnrDb(int); + } + public final class Call { method @Deprecated public void addListener(android.telecom.Call.Listener); method public void enterBackgroundAudioProcessing(); diff --git a/telecomm/java/android/telecom/BluetoothCallQualityReport.java b/telecomm/java/android/telecom/BluetoothCallQualityReport.java new file mode 100644 index 000000000000..10339a818205 --- /dev/null +++ b/telecomm/java/android/telecom/BluetoothCallQualityReport.java @@ -0,0 +1,256 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.telecom; + +import android.annotation.ElapsedRealtimeLong; +import android.annotation.IntRange; +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * This class represents the quality report that bluetooth framework sends + * whenever there's a bad voice quality is detected from their side. + * It is sent as part of a call event via {@link Call#sendCallEvent(String, Bundle)} + * associated with extra EXTRA_BLUETOOTH_CALL_QUALITY_REPORT. + * Note that this report will be sent only during an active voice/voip call. + * @hide + */ +@SystemApi +public final class BluetoothCallQualityReport implements Parcelable { + + /** + * Event that is sent via {@link Call#sendCallEvent(String, Bundle)} for a call quality report + */ + public static final String EVENT_BLUETOOTH_CALL_QUALITY_REPORT = + "android.telecom.event.BLUETOOTH_CALL_QUALITY_REPORT"; + + /** + * Extra key sent with {@link Call#sendCallEvent(String, Bundle)} + */ + public static final String EXTRA_BLUETOOTH_CALL_QUALITY_REPORT = + "android.telecom.extra.BLUETOOTH_CALL_QUALITY_REPORT"; + + private final long mSentTimestampMillis; + private final boolean mChoppyVoice; + private final int mRssiDbm; + private final int mSnrDb; + private final int mRetransmittedPacketsCount; + private final int mPacketsNotReceivedCount; + private final int mNegativeAcknowledgementCount; + + /** + * @return Time in milliseconds since the epoch. Designates when report was sent. + * Used to determine whether this report arrived too late to be useful. + */ + public @ElapsedRealtimeLong long getSentTimestampMillis() { + return mSentTimestampMillis; + } + + /** + * @return {@code true} if bluetooth hardware detects voice is choppy + */ + public boolean isChoppyVoice() { + return mChoppyVoice; + } + + /** + * @return Received Signal Strength Indication (RSSI) value in dBm. + * This value shall be an absolute received signal strength value. + */ + public @IntRange(from = -127, to = 20) int getRssiDbm() { + return mRssiDbm; + } + + /** + * @return Signal-to-Noise Ratio (SNR) value in dB. + * The controller shall provide the average SNR of all the channels currently used by the link. + */ + public int getSnrDb() { + return mSnrDb; + } + + /** + * @return The number of retransmissions since the last event. + * This count shall be reset after it is reported. + */ + public @IntRange(from = 0) int getRetransmittedPacketsCount() { + return mRetransmittedPacketsCount; + } + + /** + * @return No RX count since the last event. + * The count increases when no packet is received at the scheduled time slot or the received + * packet is corrupted. + * This count shall be reset after it is reported. + */ + public @IntRange(from = 0) int getPacketsNotReceivedCount() { + return mPacketsNotReceivedCount; + } + + /** + * @return NAK (Negative Acknowledge) count since the last event. + * This count shall be reset after it is reported. + */ + public @IntRange(from = 0) int getNegativeAcknowledgementCount() { + return mNegativeAcknowledgementCount; + } + + // + // Parcelable implementation + // + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeLong(mSentTimestampMillis); + out.writeBoolean(mChoppyVoice); + out.writeInt(mRssiDbm); + out.writeInt(mSnrDb); + out.writeInt(mRetransmittedPacketsCount); + out.writeInt(mPacketsNotReceivedCount); + out.writeInt(mNegativeAcknowledgementCount); + } + + public static final @android.annotation.NonNull Creator CREATOR = + new Creator() { + @Override + public BluetoothCallQualityReport createFromParcel(Parcel in) { + return new BluetoothCallQualityReport(in); + } + + @Override + public BluetoothCallQualityReport[] newArray(int size) { + return new BluetoothCallQualityReport[size]; + } + }; + + /** + * Builder class for {@link ConnectionRequest} + */ + public static final class Builder { + private long mSentTimestampMillis; + private boolean mChoppyVoice; + private int mRssiDbm; + private int mSnrDb; + private int mRetransmittedPacketsCount; + private int mPacketsNotReceivedCount; + private int mNegativeAcknowledgementCount; + + public Builder() { } + + /** + * Set the time when report was sent in milliseconds since the epoch. + * @param sentTimestampMillis + */ + public @NonNull Builder setSentTimestampMillis(long sentTimestampMillis) { + mSentTimestampMillis = sentTimestampMillis; + return this; + } + + /** + * Set if bluetooth hardware detects voice is choppy + * @param choppyVoice + */ + public @NonNull Builder setChoppyVoice(boolean choppyVoice) { + mChoppyVoice = choppyVoice; + return this; + } + + /** + * Set Received Signal Strength Indication (RSSI) value in dBm. + * @param rssiDbm + */ + public @NonNull Builder setRssiDbm(int rssiDbm) { + mRssiDbm = rssiDbm; + return this; + } + + /** + * Set Signal-to-Noise Ratio (SNR) value in dB. + * @param snrDb + */ + public @NonNull Builder setSnrDb(int snrDb) { + mSnrDb = snrDb; + return this; + } + + /** + * Set The number of retransmissions since the last event. + * @param retransmittedPacketsCount + */ + public @NonNull Builder setRetransmittedPacketsCount( + int retransmittedPacketsCount) { + mRetransmittedPacketsCount = retransmittedPacketsCount; + return this; + } + + /** + * Set No RX count since the last event. + * @param packetsNotReceivedCount + */ + public @NonNull Builder setPacketsNotReceivedCount( + int packetsNotReceivedCount) { + mPacketsNotReceivedCount = packetsNotReceivedCount; + return this; + } + + /** + * Set NAK (Negative Acknowledge) count since the last event. + * @param negativeAcknowledgementCount + */ + public @NonNull Builder setNegativeAcknowledgementCount( + int negativeAcknowledgementCount) { + mNegativeAcknowledgementCount = negativeAcknowledgementCount; + return this; + } + + /** + * Build the {@link BluetoothCallQualityReport} + * @return Result of the builder + */ + public @NonNull BluetoothCallQualityReport build() { + return new BluetoothCallQualityReport(this); + } + } + + private BluetoothCallQualityReport(Parcel in) { + mSentTimestampMillis = in.readLong(); + mChoppyVoice = in.readBoolean(); + mRssiDbm = in.readInt(); + mSnrDb = in.readInt(); + mRetransmittedPacketsCount = in.readInt(); + mPacketsNotReceivedCount = in.readInt(); + mNegativeAcknowledgementCount = in.readInt(); + } + + private BluetoothCallQualityReport(Builder builder) { + mSentTimestampMillis = builder.mSentTimestampMillis; + mChoppyVoice = builder.mChoppyVoice; + mRssiDbm = builder.mRssiDbm; + mSnrDb = builder.mSnrDb; + mRetransmittedPacketsCount = builder.mRetransmittedPacketsCount; + mPacketsNotReceivedCount = builder.mPacketsNotReceivedCount; + mNegativeAcknowledgementCount = builder.mNegativeAcknowledgementCount; + } +} -- cgit v1.2.3-59-g8ed1b From 3ed3883ff684d4f1177497d697fc6a1a13a9dfe5 Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Mon, 30 Nov 2020 21:54:36 -0800 Subject: Add Call Composer API extras in TelecomManager Test: cts Bug: 173437870 Change-Id: I46cd9ee72de3d217fa23b368c0b88811cf8ce555 --- core/api/current.txt | 7 +++ telecomm/java/android/telecom/TelecomManager.java | 61 ++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) (limited to 'telecomm/java') diff --git a/core/api/current.txt b/core/api/current.txt index 9f7f3917a11f..8d86916056d0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -44810,14 +44810,19 @@ package android.telecom { field public static final String EXTRA_DEFAULT_CALL_SCREENING_APP_COMPONENT_NAME = "android.telecom.extra.DEFAULT_CALL_SCREENING_APP_COMPONENT_NAME"; field public static final String EXTRA_DISCONNECT_CAUSE = "android.telecom.extra.DISCONNECT_CAUSE"; field public static final String EXTRA_HANDLE = "android.telecom.extra.HANDLE"; + field public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE"; field public static final String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS"; field public static final String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS"; + field public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE"; field public static final String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE"; field public static final String EXTRA_IS_DEFAULT_CALL_SCREENING_APP = "android.telecom.extra.IS_DEFAULT_CALL_SCREENING_APP"; + field public static final String EXTRA_LOCATION = "android.telecom.extra.LOCATION"; field public static final String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT"; field public static final String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER"; field public static final String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS"; + field public static final String EXTRA_OUTGOING_PICTURE = "android.telecom.extra.OUTGOING_PICTURE"; field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE"; + field public static final String EXTRA_PRIORITY = "android.telecom.extra.PRIORITY"; field public static final String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT"; field public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE"; field public static final String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE"; @@ -44833,6 +44838,8 @@ package android.telecom { field public static final int PRESENTATION_PAYPHONE = 4; // 0x4 field public static final int PRESENTATION_RESTRICTED = 2; // 0x2 field public static final int PRESENTATION_UNKNOWN = 3; // 0x3 + field public static final int PRIORITY_NORMAL = 0; // 0x0 + field public static final int PRIORITY_URGENT = 1; // 0x1 } public class VideoProfile implements android.os.Parcelable { diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 960b0df40061..5b03863efc7d 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -268,10 +268,69 @@ public class TelecomManager { /** * Optional extra for {@link android.content.Intent#ACTION_CALL} containing a string call * subject which will be associated with an outgoing call. Should only be specified if the - * {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT}. + * {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT} + * or {@link PhoneAccount#CAPABILITY_CALL_COMPOSER}. */ public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; + // Values for EXTRA_PRIORITY + /** + * Indicates the call composer call priority is normal. + * + * Reference: RCC.20 Section 2.4.4.2 + */ + public static final int PRIORITY_NORMAL = 0; + + /** + * Indicates the call composer call priority is urgent. + * + * Reference: RCC.20 Section 2.4.4.2 + */ + public static final int PRIORITY_URGENT = 1; + + /** + * Extra for the call composer call priority, either {@link #PRIORITY_NORMAL} or + * {@link #PRIORITY_URGENT}. + * + * Reference: RCC.20 Section 2.4.4.2 + */ + public static final String EXTRA_PRIORITY = "android.telecom.extra.PRIORITY"; + + /** + * Extra for the call composer call location, an {@link android.location.Location} parcelable + * class to represent the geolocation as a latitude and longitude pair. + * + * Reference: RCC.20 Section 2.4.3.2 + */ + public static final String EXTRA_LOCATION = "android.telecom.extra.LOCATION"; + + /** + * A boolean extra set on incoming calls to indicate that the call has a picture specified. + * Given that image download could take a (short) time, the EXTRA is set immediately upon + * adding the call to the Dialer app, this allows the Dialer app to reserve space for an image + * if one is expected. The EXTRA may be unset if the image download ends up failing for some + * reason. + */ + public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE"; + + /** + * A URI representing the picture that was downloaded when a call is received. + * This is a content URI within the call log provider which can be used to open a file + * descriptor. This could be set a short time after a call is added to the Dialer app if the + * download is delayed for some reason. The Dialer app will receive a callback via + * {@link Call.Callback#onDetailsChanged} when this value has changed. + * + * Reference: RCC.20 Section 2.4.3.2 + */ + public static final String EXTRA_INCOMING_PICTURE = "android.telecom.extra.INCOMING_PICTURE"; + + // TODO(hallliu), This UUID is obtained from TelephonyManager#uploadCallComposerPicture. + /** + * A ParcelUuid used as a token to represent a picture that was uploaded prior to the call + * being placed. + */ + public static final String EXTRA_OUTGOING_PICTURE = "android.telecom.extra.OUTGOING_PICTURE"; + /** * The extra used by a {@link ConnectionService} to provide the handle of the caller that * has initiated a new incoming call. -- cgit v1.2.3-59-g8ed1b From 64f05b101d158568da90c7d4c464443755d8d63d Mon Sep 17 00:00:00 2001 From: Sooraj Sasindran Date: Wed, 18 Nov 2020 12:07:10 -0800 Subject: Introduce IMS Cross SIM registration Introduce IMS Cross SIM registration Bug: 171391883 Test: Build Change-Id: Idd79a0a1f453a36587b89257e88437c96bf6ff4e --- core/api/current.txt | 9 +- core/api/system-current.txt | 4 + core/res/res/values/strings.xml | 11 +++ core/res/res/values/symbols.xml | 1 + telecomm/java/android/telecom/Call.java | 8 ++ telecomm/java/android/telecom/Connection.java | 10 ++- .../java/android/telephony/TelephonyManager.java | 2 + .../java/android/telephony/ims/ImsCallProfile.java | 9 ++ .../android/telephony/ims/ImsMmTelManager.java | 2 + .../java/android/telephony/ims/ImsRcsManager.java | 1 + .../android/telephony/ims/RegistrationManager.java | 97 +++++++++++++++++++++- .../ims/feature/CapabilityChangeRequest.java | 6 +- .../android/telephony/ims/feature/ImsFeature.java | 5 +- .../ims/stub/ImsRegistrationImplBase.java | 20 +++-- 14 files changed, 172 insertions(+), 13 deletions(-) (limited to 'telecomm/java') diff --git a/core/api/current.txt b/core/api/current.txt index 2c095ebd3451..99790b5904b2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -38764,6 +38764,7 @@ package android.telecom { field public static final int DIRECTION_UNKNOWN = -1; // 0xffffffff field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200 field public static final int PROPERTY_CONFERENCE = 1; // 0x1 + field public static final int PROPERTY_CROSS_SIM = 16384; // 0x4000 field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4 field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20 field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2 @@ -39057,6 +39058,7 @@ package android.telecom { field public static final String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER"; field public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE"; field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200 + field public static final int PROPERTY_CROSS_SIM = 8192; // 0x2000 field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20 field public static final int PROPERTY_HIGH_DEF_AUDIO = 4; // 0x4 field public static final int PROPERTY_IS_ADHOC_CONFERENCE = 4096; // 0x1000 @@ -42577,6 +42579,7 @@ package android.telephony.ims { method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException; method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback); + field public static final int ATTR_EPDG_OVER_CELL_INTERNET = 1; // 0x1 field public static final int REGISTRATION_STATE_NOT_REGISTERED = 0; // 0x0 field public static final int REGISTRATION_STATE_REGISTERED = 2; // 0x2 field public static final int REGISTRATION_STATE_REGISTERING = 1; // 0x1 @@ -42584,8 +42587,10 @@ package android.telephony.ims { public static class RegistrationManager.RegistrationCallback { ctor public RegistrationManager.RegistrationCallback(); - method public void onRegistered(int); - method public void onRegistering(int); + method @Deprecated public void onRegistered(int); + method public void onRegistered(int, int); + method @Deprecated public void onRegistering(int); + method public void onRegistering(int, int); method public void onTechnologyChangeFailed(int, @NonNull android.telephony.ims.ImsReasonInfo); method public void onUnregistered(@NonNull android.telephony.ims.ImsReasonInfo); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 370751c796da..a562721d0f5e 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -12150,6 +12150,7 @@ package android.telephony.ims { field public static final String EXTRA_EXTENDING_TO_CONFERENCE_SUPPORTED = "android.telephony.ims.extra.EXTENDING_TO_CONFERENCE_SUPPORTED"; field public static final String EXTRA_FORWARDED_NUMBER = "android.telephony.ims.extra.FORWARDED_NUMBER"; field public static final String EXTRA_IS_CALL_PULL = "CallPull"; + field public static final String EXTRA_IS_CROSS_SIM_CALL = "android.telephony.ims.extra.IS_CROSS_SIM_CALL"; field public static final String EXTRA_LOCATION = "android.telephony.ims.extra.LOCATION"; field public static final String EXTRA_OI = "oi"; field public static final String EXTRA_OIR = "oir"; @@ -12292,6 +12293,8 @@ package android.telephony.ims { @Deprecated public static class ImsMmTelManager.RegistrationCallback extends android.telephony.ims.RegistrationManager.RegistrationCallback { ctor @Deprecated public ImsMmTelManager.RegistrationCallback(); + method @Deprecated public void onRegistered(int); + method @Deprecated public void onRegistering(int); } public final class ImsReasonInfo implements android.os.Parcelable { @@ -12931,6 +12934,7 @@ package android.telephony.ims.stub { method public void triggerFullNetworkRegistration(@IntRange(from=100, to=699) int, @Nullable String); method public void triggerSipDelegateDeregistration(); method public void updateSipDelegateRegistration(); + field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2 field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1 field public static final int REGISTRATION_TECH_LTE = 0; // 0x0 field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3a593b93346d..5715b31b94bc 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -292,6 +292,17 @@ Wi-Fi only + + + @string/crossSimFormat_spn + @string/crossSimFormat_spn_cross_sim_calling + + + + %s + + %s Cross-SIM Calling +