From 55418eada51d4f5e6532ae9517af66c50ea495c4 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Thu, 20 Dec 2018 15:30:45 +0000 Subject: [PATCH] Limit access to suspected false positives. Members modified herein are suspected to be false positives: i.e. things that were added to the greylist in P, but subsequent data analysis suggests that they are not, in fact, used after all. Add a maxTargetSdk=P to these APIs. This is lower-risk that simply removing these things from the greylist, as none of out data sources are perfect nor complete. For APIs that are not supported yet by annotations, move them to hiddenapi-greylist-max-p.txt instead which has the same effect. Exempted-From-Owner-Approval: Automatic changes to the codebase affecting only @UnsupportedAppUsage annotations, themselves added without requiring owners approval earlier. Bug: 115609023 Test: m Change-Id: Ia937d8c41512e7f1b6e7f67b9104c1878b5cc3a0 Merged-In: I020a9c09672ebcae64c5357abc4993e07e744687 --- config/hiddenapi-greylist-max-p.txt | 75 +++++++++++++++++++ config/hiddenapi-greylist.txt | 75 ------------------- .../java/android/accounts/AccountManager.java | 12 +-- .../accounts/AuthenticatorDescription.java | 5 +- core/java/android/app/Activity.java | 2 +- core/java/android/app/ActivityThread.java | 2 +- core/java/android/app/Dialog.java | 2 +- core/java/android/app/Fragment.java | 2 +- core/java/android/app/Instrumentation.java | 3 +- core/java/android/app/ProgressDialog.java | 3 +- core/java/android/app/ResultInfo.java | 3 +- .../android/app/admin/DeviceAdminInfo.java | 3 +- .../app/admin/DevicePolicyManager.java | 19 ++--- .../android/app/assist/AssistContent.java | 15 ++-- core/java/android/app/job/JobWorkItem.java | 11 +-- .../android/app/usage/ConfigurationStats.java | 13 ++-- core/java/android/app/usage/UsageEvents.java | 27 +++---- core/java/android/app/usage/UsageStats.java | 9 ++- .../android/app/usage/UsageStatsManager.java | 2 +- .../java/android/bluetooth/BluetoothA2dp.java | 2 +- .../android/bluetooth/BluetoothClass.java | 3 +- .../java/android/bluetooth/BluetoothUuid.java | 9 ++- core/java/android/content/Entity.java | 5 +- .../java/android/content/SyncAdapterType.java | 7 +- core/java/android/content/SyncInfo.java | 3 +- core/java/android/content/om/OverlayInfo.java | 3 +- .../android/content/pm/ApplicationInfo.java | 9 ++- core/java/android/content/pm/PackageInfo.java | 3 +- .../android/content/pm/PackageInfoLite.java | 3 +- .../java/android/content/pm/PackageStats.java | 3 +- .../content/res/CompatibilityInfo.java | 2 +- core/java/android/database/DatabaseUtils.java | 3 +- core/java/android/database/MatrixCursor.java | 5 +- .../database/sqlite/SQLiteQueryBuilder.java | 8 +- .../InputMethodService.java | 5 +- .../java/android/net/ConnectivityManager.java | 3 +- core/java/android/net/LinkAddress.java | 5 +- core/java/android/net/LinkProperties.java | 5 +- core/java/android/net/NetworkAgent.java | 3 +- core/java/android/net/NetworkFactory.java | 5 +- .../android/net/NetworkPolicyManager.java | 5 +- core/java/android/net/NetworkRequest.java | 3 +- core/java/android/net/RouteInfo.java | 5 +- core/java/android/net/WebAddress.java | 3 +- core/java/android/net/http/SslError.java | 5 +- core/java/android/os/storage/DiskInfo.java | 5 +- .../NotificationListenerService.java | 6 +- .../notification/StatusBarNotification.java | 11 +-- .../service/wallpaper/WallpaperService.java | 3 +- .../HideReturnsTransformationMethod.java | 3 +- .../method/PasswordTransformationMethod.java | 3 +- core/java/android/text/style/BulletSpan.java | 7 +- core/java/android/util/ArrayMap.java | 21 +++--- core/java/android/util/ArraySet.java | 5 +- core/java/android/util/DebugUtils.java | 3 +- core/java/android/util/Slog.java | 3 +- core/java/android/util/TimeUtils.java | 5 +- core/java/android/view/SurfaceView.java | 12 +-- core/java/android/view/View.java | 4 +- core/java/android/view/ViewGroup.java | 2 +- core/java/android/view/Window.java | 5 +- core/java/android/webkit/ConsoleMessage.java | 9 ++- core/java/android/widget/AbsListView.java | 7 +- core/java/android/widget/Gallery.java | 9 ++- core/java/android/widget/ListView.java | 9 ++- core/java/android/widget/MediaController.java | 9 ++- core/java/android/widget/PopupWindow.java | 4 +- core/java/android/widget/SimpleAdapter.java | 3 +- .../android/widget/SimpleCursorAdapter.java | 3 +- core/java/android/widget/TextView.java | 7 +- core/java/android/widget/VideoView.java | 4 +- .../com/android/internal/net/VpnProfile.java | 3 +- .../com/android/internal/os/AtomicFile.java | 3 +- .../android/internal/util/AsyncChannel.java | 5 +- .../android/internal/util/JournaledFile.java | 9 ++- graphics/java/android/graphics/Paint.java | 3 +- .../graphics/drawable/DrawableContainer.java | 3 +- keystore/java/android/security/KeyStore.java | 5 +- location/java/android/location/GpsStatus.java | 3 +- location/java/android/location/Location.java | 3 +- .../android/location/LocationManager.java | 2 +- .../android/location/LocationRequest.java | 21 +++--- .../java/android/media/CamcorderProfile.java | 3 +- media/java/android/media/ExifInterface.java | 9 ++- .../android/media/MediaMetadataRetriever.java | 7 +- media/java/android/media/MediaRecorder.java | 15 ++-- media/java/android/media/ThumbnailUtils.java | 13 ++-- .../android/telecom/PhoneAccountHandle.java | 2 +- .../android/telephony/CellIdentityLte.java | 3 +- .../java/android/telephony/CellInfoCdma.java | 3 +- .../java/android/telephony/CellInfoLte.java | 5 +- .../telephony/NeighboringCellInfo.java | 11 +-- .../android/telephony/RadioAccessFamily.java | 3 +- telephony/java/android/telephony/Rlog.java | 2 +- .../java/android/telephony/ServiceState.java | 34 ++++----- .../java/android/telephony/SmsManager.java | 3 +- .../android/telephony/TelephonyManager.java | 12 +-- .../android/telephony/VoLteServiceState.java | 3 +- .../telephony/cdma/CdmaCellLocation.java | 13 ++-- .../telephony/gsm/GsmCellLocation.java | 3 +- .../internal/telephony/GsmAlphabet.java | 3 +- .../internal/telephony/OperatorInfo.java | 3 +- .../internal/telephony/SmsMessageBase.java | 11 +-- .../android/net/wifi/WifiConfiguration.java | 3 +- wifi/java/android/net/wifi/WifiInfo.java | 3 +- .../android/net/wifi/p2p/WifiP2pWfdInfo.java | 3 +- .../wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java | 3 +- .../net/wifi/p2p/nsd/WifiP2pServiceInfo.java | 5 +- .../wifi/p2p/nsd/WifiP2pServiceRequest.java | 3 +- 109 files changed, 444 insertions(+), 357 deletions(-) diff --git a/config/hiddenapi-greylist-max-p.txt b/config/hiddenapi-greylist-max-p.txt index e69de29bb2d1d..7840b186615fc 100644 --- a/config/hiddenapi-greylist-max-p.txt +++ b/config/hiddenapi-greylist-max-p.txt @@ -0,0 +1,75 @@ +Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher; +Landroid/app/ISearchManager$Stub;->()V +Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager; +Landroid/app/IUiModeManager;->disableCarMode(I)V +Landroid/bluetooth/IBluetooth$Stub;->()V +Landroid/bluetooth/IBluetoothA2dp$Stub;->()V +Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver; +Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender; +Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo; +Landroid/net/IConnectivityManager;->reportInetCondition(II)V +Landroid/os/BatteryStats$Counter;->()V +Landroid/os/BatteryStats$HistoryItem;->clear()V +Landroid/os/BatteryStats$HistoryItem;->next:Landroid/os/BatteryStats$HistoryItem; +Landroid/os/BatteryStats$HistoryItem;->same(Landroid/os/BatteryStats$HistoryItem;)Z +Landroid/os/BatteryStats$HistoryItem;->setTo(JBLandroid/os/BatteryStats$HistoryItem;)V +Landroid/os/BatteryStats$HistoryItem;->setTo(Landroid/os/BatteryStats$HistoryItem;)V +Landroid/os/BatteryStats$Timer;->()V +Landroid/os/BatteryStats$Uid$Pkg;->()V +Landroid/os/BatteryStats$Uid$Proc;->()V +Landroid/os/BatteryStats$Uid$Sensor;->()V +Landroid/os/BatteryStats$Uid$Wakelock;->()V +Landroid/os/BatteryStats;->()V +Landroid/os/BatteryStats;->getMobileRadioActiveTime(JI)J +Landroid/os/BatteryStats;->getNetworkActivityBytes(II)J +Landroid/os/CancellationSignal;->mCancelInProgress:Z +Landroid/os/CancellationSignal;->mIsCanceled:Z +Landroid/os/CancellationSignal;->mOnCancelListener:Landroid/os/CancellationSignal$OnCancelListener; +Landroid/os/CancellationSignal;->mRemote:Landroid/os/ICancellationSignal; +Landroid/os/CancellationSignal;->waitForCancelFinishedLocked()V +Landroid/os/IPowerManager;->nap(J)V +Landroid/os/Parcel;->mCreators:Ljava/util/HashMap; +Landroid/os/PowerManager;->mHandler:Landroid/os/Handler; +Landroid/os/Process;->sendSignalQuiet(II)V +Landroid/os/Registrant;->getHandler()Landroid/os/Handler; +Landroid/os/RegistrantList;->get(I)Ljava/lang/Object; +Landroid/os/RemoteCallback;->mHandler:Landroid/os/Handler; +Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener; +Landroid/os/SystemProperties;->native_add_change_callback()V +Landroid/os/SystemProperties;->native_get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; +Landroid/os/SystemProperties;->native_get_boolean(Ljava/lang/String;Z)Z +Landroid/os/SystemProperties;->native_get_int(Ljava/lang/String;I)I +Landroid/os/SystemProperties;->native_set(Ljava/lang/String;Ljava/lang/String;)V +Landroid/os/UserHandle;->formatUid(Ljava/io/PrintWriter;I)V +Landroid/os/WorkSource;->sGoneWork:Landroid/os/WorkSource; +Landroid/os/WorkSource;->sNewbWork:Landroid/os/WorkSource; +Landroid/os/WorkSource;->sTmpWorkSource:Landroid/os/WorkSource; +Landroid/os/WorkSource;->updateLocked(Landroid/os/WorkSource;ZZ)Z +Landroid/service/carrier/ICarrierMessagingCallback$Stub;->()V +Landroid/service/carrier/ICarrierMessagingService;->filterSms(Landroid/service/carrier/MessagePdu;Ljava/lang/String;IILandroid/service/carrier/ICarrierMessagingCallback;)V +Landroid/telephony/CarrierMessagingServiceManager;->()V +Landroid/view/IWindowManager;->setInTouchMode(Z)V +Landroid/view/IWindowManager;->showStrictModeViolation(Z)V +Lcom/android/internal/R$styleable;->AndroidManifestActivityAlias:[I +Lcom/android/internal/R$styleable;->AndroidManifestGrantUriPermission:[I +Lcom/android/internal/R$styleable;->AndroidManifestInstrumentation:[I +Lcom/android/internal/R$styleable;->AndroidManifestOriginalPackage:[I +Lcom/android/internal/R$styleable;->AndroidManifestPathPermission:[I +Lcom/android/internal/R$styleable;->AndroidManifestPermission:[I +Lcom/android/internal/R$styleable;->AndroidManifestPermissionGroup:[I +Lcom/android/internal/R$styleable;->AndroidManifestPermissionTree:[I +Lcom/android/internal/R$styleable;->AndroidManifestProtectedBroadcast:[I +Lcom/android/internal/R$styleable;->AndroidManifestSupportsScreens:[I +Lcom/android/internal/R$styleable;->AndroidManifestUsesConfiguration:[I +Lcom/android/internal/R$styleable;->AndroidManifestUsesFeature:[I +Lcom/android/internal/R$styleable;->CycleInterpolator:[I +Lcom/android/internal/R$styleable;->LinearLayout:[I +Lcom/android/internal/R$styleable;->MenuView:[I +Lcom/android/internal/R$styleable;->Searchable:[I +Lcom/android/internal/R$styleable;->SearchableActionKey:[I +Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->()V +Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V +Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V +Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V +Lcom/android/internal/telephony/ITelephonyRegistry;->notifyOtaspChanged(I)V +Lcom/android/internal/view/BaseIWindow;->()V diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index 648ff274f37cb..dd7559d704659 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -173,7 +173,6 @@ Landroid/app/IAssistDataReceiver;->onHandleAssistData(Landroid/os/Bundle;)V Landroid/app/IAssistDataReceiver;->onHandleAssistScreenshot(Landroid/graphics/Bitmap;)V Landroid/app/IInputForwarder;->forwardEvent(Landroid/view/InputEvent;)Z Landroid/app/IInstrumentationWatcher$Stub;->()V -Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher; Landroid/app/IInstrumentationWatcher;->instrumentationStatus(Landroid/content/ComponentName;ILandroid/os/Bundle;)V Landroid/app/INotificationManager$Stub$Proxy;->(Landroid/os/IBinder;)V Landroid/app/INotificationManager$Stub$Proxy;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z @@ -191,7 +190,6 @@ Landroid/app/INotificationManager;->getZenModeConfig()Landroid/service/notificat Landroid/app/IProcessObserver$Stub;->()V Landroid/app/ISearchManager$Stub$Proxy;->getGlobalSearchActivity()Landroid/content/ComponentName; Landroid/app/ISearchManager$Stub$Proxy;->getWebSearchActivity()Landroid/content/ComponentName; -Landroid/app/ISearchManager$Stub;->()V Landroid/app/ISearchManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/ISearchManager; Landroid/app/ISearchManager;->getGlobalSearchActivity()Landroid/content/ComponentName; Landroid/app/IServiceConnection$Stub$Proxy;->(Landroid/os/IBinder;)V @@ -206,8 +204,6 @@ Landroid/app/IStopUserCallback;->userStopped(I)V Landroid/app/ITransientNotification$Stub;->()V Landroid/app/ITransientNotification;->show(Landroid/os/IBinder;)V Landroid/app/IUiModeManager$Stub$Proxy;->(Landroid/os/IBinder;)V -Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager; -Landroid/app/IUiModeManager;->disableCarMode(I)V Landroid/app/IUserSwitchObserver$Stub;->()V Landroid/app/IWallpaperManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IWallpaperManager; Landroid/app/IWallpaperManager;->getHeightHint()I @@ -251,7 +247,6 @@ Landroid/app/UserSwitchObserver;->()V Landroid/app/VrStateCallback;->()V Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String; Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/IBluetooth$Stub;->()V Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth; Landroid/bluetooth/IBluetooth$Stub;->TRANSACTION_enable:I Landroid/bluetooth/IBluetooth;->fetchRemoteUuids(Landroid/bluetooth/BluetoothDevice;)Z @@ -259,7 +254,6 @@ Landroid/bluetooth/IBluetooth;->getAddress()Ljava/lang/String; Landroid/bluetooth/IBluetooth;->getRemoteAlias(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String; Landroid/bluetooth/IBluetooth;->isEnabled()Z Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V -Landroid/bluetooth/IBluetoothA2dp$Stub;->()V Landroid/bluetooth/IBluetoothA2dp$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothA2dp; Landroid/bluetooth/IBluetoothA2dp;->connect(Landroid/bluetooth/BluetoothDevice;)Z Landroid/bluetooth/IBluetoothA2dp;->disconnect(Landroid/bluetooth/BluetoothDevice;)Z @@ -308,9 +302,7 @@ Landroid/content/IContentService;->setMasterSyncAutomatically(Z)V Landroid/content/IIntentReceiver$Stub$Proxy;->(Landroid/os/IBinder;)V Landroid/content/IIntentReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/content/IIntentReceiver$Stub;->()V -Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver; Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V -Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender; Landroid/content/IOnPrimaryClipChangedListener$Stub;->()V Landroid/content/IOnPrimaryClipChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IOnPrimaryClipChangedListener; Landroid/content/IRestrictionsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IRestrictionsManager; @@ -605,13 +597,11 @@ Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkIn Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo; Landroid/net/IConnectivityManager;->getAllNetworkState()[Landroid/net/NetworkState; Landroid/net/IConnectivityManager;->getLastTetherError(Ljava/lang/String;)I -Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo; Landroid/net/IConnectivityManager;->getTetherableIfaces()[Ljava/lang/String; Landroid/net/IConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String; Landroid/net/IConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String; Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String; Landroid/net/IConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager;->reportInetCondition(II)V Landroid/net/IConnectivityManager;->startLegacyVpn(Lcom/android/internal/net/VpnProfile;)V Landroid/net/INetd$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetd; Landroid/net/INetd;->interfaceAddAddress(Ljava/lang/String;Ljava/lang/String;I)V @@ -685,7 +675,6 @@ Landroid/os/BatteryManager;->EXTRA_CHARGE_COUNTER:Ljava/lang/String; Landroid/os/BatteryManager;->EXTRA_INVALID_CHARGER:Ljava/lang/String; Landroid/os/BatteryManager;->EXTRA_MAX_CHARGING_CURRENT:Ljava/lang/String; Landroid/os/BatteryManager;->EXTRA_MAX_CHARGING_VOLTAGE:Ljava/lang/String; -Landroid/os/BatteryStats$Counter;->()V Landroid/os/BatteryStats$Counter;->getCountLocked(I)I Landroid/os/BatteryStats$HistoryItem;->()V Landroid/os/BatteryStats$HistoryItem;->batteryHealth:B @@ -693,41 +682,31 @@ Landroid/os/BatteryStats$HistoryItem;->batteryLevel:B Landroid/os/BatteryStats$HistoryItem;->batteryPlugType:B Landroid/os/BatteryStats$HistoryItem;->batteryStatus:B Landroid/os/BatteryStats$HistoryItem;->batteryVoltage:C -Landroid/os/BatteryStats$HistoryItem;->clear()V Landroid/os/BatteryStats$HistoryItem;->cmd:B Landroid/os/BatteryStats$HistoryItem;->CMD_UPDATE:B -Landroid/os/BatteryStats$HistoryItem;->next:Landroid/os/BatteryStats$HistoryItem; -Landroid/os/BatteryStats$HistoryItem;->same(Landroid/os/BatteryStats$HistoryItem;)Z -Landroid/os/BatteryStats$HistoryItem;->setTo(JBLandroid/os/BatteryStats$HistoryItem;)V -Landroid/os/BatteryStats$HistoryItem;->setTo(Landroid/os/BatteryStats$HistoryItem;)V Landroid/os/BatteryStats$HistoryItem;->states2:I Landroid/os/BatteryStats$HistoryItem;->states:I Landroid/os/BatteryStats$HistoryItem;->time:J -Landroid/os/BatteryStats$Timer;->()V Landroid/os/BatteryStats$Timer;->getCountLocked(I)I Landroid/os/BatteryStats$Timer;->getTotalTimeLocked(JI)J Landroid/os/BatteryStats$Uid$Pkg$Serv;->getLaunches(I)I Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStarts(I)I Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStartTime(JI)J -Landroid/os/BatteryStats$Uid$Pkg;->()V Landroid/os/BatteryStats$Uid$Pkg;->getServiceStats()Landroid/util/ArrayMap; Landroid/os/BatteryStats$Uid$Pkg;->getWakeupAlarmStats()Landroid/util/ArrayMap; Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->()V Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->overTime:J Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->type:I Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->usedTime:J -Landroid/os/BatteryStats$Uid$Proc;->()V Landroid/os/BatteryStats$Uid$Proc;->countExcessivePowers()I Landroid/os/BatteryStats$Uid$Proc;->getExcessivePower(I)Landroid/os/BatteryStats$Uid$Proc$ExcessivePower; Landroid/os/BatteryStats$Uid$Proc;->getForegroundTime(I)J Landroid/os/BatteryStats$Uid$Proc;->getStarts(I)I Landroid/os/BatteryStats$Uid$Proc;->getSystemTime(I)J Landroid/os/BatteryStats$Uid$Proc;->getUserTime(I)J -Landroid/os/BatteryStats$Uid$Sensor;->()V Landroid/os/BatteryStats$Uid$Sensor;->getHandle()I Landroid/os/BatteryStats$Uid$Sensor;->getSensorTime()Landroid/os/BatteryStats$Timer; Landroid/os/BatteryStats$Uid$Sensor;->GPS:I -Landroid/os/BatteryStats$Uid$Wakelock;->()V Landroid/os/BatteryStats$Uid$Wakelock;->getWakeTime(I)Landroid/os/BatteryStats$Timer; Landroid/os/BatteryStats$Uid;->()V Landroid/os/BatteryStats$Uid;->getAudioTurnedOnTimer()Landroid/os/BatteryStats$Timer; @@ -744,7 +723,6 @@ Landroid/os/BatteryStats$Uid;->getWifiBatchedScanTime(IJI)J Landroid/os/BatteryStats$Uid;->getWifiMulticastTime(JI)J Landroid/os/BatteryStats$Uid;->getWifiRunningTime(JI)J Landroid/os/BatteryStats$Uid;->getWifiScanTime(JI)J -Landroid/os/BatteryStats;->()V Landroid/os/BatteryStats;->computeBatteryRealtime(JI)J Landroid/os/BatteryStats;->computeBatteryTimeRemaining(J)J Landroid/os/BatteryStats;->computeBatteryUptime(JI)J @@ -752,8 +730,6 @@ Landroid/os/BatteryStats;->computeChargeTimeRemaining(J)J Landroid/os/BatteryStats;->dumpLine(Ljava/io/PrintWriter;ILjava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V Landroid/os/BatteryStats;->getBatteryUptime(J)J Landroid/os/BatteryStats;->getGlobalWifiRunningTime(JI)J -Landroid/os/BatteryStats;->getMobileRadioActiveTime(JI)J -Landroid/os/BatteryStats;->getNetworkActivityBytes(II)J Landroid/os/BatteryStats;->getNextHistoryLocked(Landroid/os/BatteryStats$HistoryItem;)Z Landroid/os/BatteryStats;->getPhoneOnTime(JI)J Landroid/os/BatteryStats;->getPhoneSignalStrengthTime(IJI)J @@ -784,11 +760,6 @@ Landroid/os/Bundle;->getSize()I Landroid/os/Bundle;->putIBinder(Ljava/lang/String;Landroid/os/IBinder;)V Landroid/os/Bundle;->putParcelableList(Ljava/lang/String;Ljava/util/List;)V Landroid/os/Bundle;->setDefusable(Landroid/os/Bundle;Z)Landroid/os/Bundle; -Landroid/os/CancellationSignal;->mCancelInProgress:Z -Landroid/os/CancellationSignal;->mIsCanceled:Z -Landroid/os/CancellationSignal;->mOnCancelListener:Landroid/os/CancellationSignal$OnCancelListener; -Landroid/os/CancellationSignal;->mRemote:Landroid/os/ICancellationSignal; -Landroid/os/CancellationSignal;->waitForCancelFinishedLocked()V Landroid/os/Debug$MemoryInfo;->dalvikPrivateClean:I Landroid/os/Debug$MemoryInfo;->dalvikRss:I Landroid/os/Debug$MemoryInfo;->dalvikSharedClean:I @@ -919,7 +890,6 @@ Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I Landroid/os/IPowerManager;->goToSleep(JII)V Landroid/os/IPowerManager;->isInteractive()Z -Landroid/os/IPowerManager;->nap(J)V Landroid/os/IPowerManager;->reboot(ZLjava/lang/String;Z)V Landroid/os/IPowerManager;->releaseWakeLock(Landroid/os/IBinder;I)V Landroid/os/IPowerManager;->userActivity(JII)V @@ -969,7 +939,6 @@ Landroid/os/MessageQueue;->removeSyncBarrier(I)V Landroid/os/Parcel$ReadWriteHelper;->()V Landroid/os/Parcel;->getGlobalAllocCount()J Landroid/os/Parcel;->getGlobalAllocSize()J -Landroid/os/Parcel;->mCreators:Ljava/util/HashMap; Landroid/os/Parcel;->mNativePtr:J Landroid/os/Parcel;->readArrayMap(Landroid/util/ArrayMap;Ljava/lang/ClassLoader;)V Landroid/os/Parcel;->readArraySet(Ljava/lang/ClassLoader;)Landroid/util/ArraySet; @@ -1012,7 +981,6 @@ Landroid/os/PowerManager;->getMinimumScreenBrightnessSetting()I Landroid/os/PowerManager;->goToSleep(JII)V Landroid/os/PowerManager;->GO_TO_SLEEP_REASON_TIMEOUT:I Landroid/os/PowerManager;->isLightDeviceIdleMode()Z -Landroid/os/PowerManager;->mHandler:Landroid/os/Handler; Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager; Landroid/os/PowerManager;->setPowerSaveMode(Z)Z Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V @@ -1045,7 +1013,6 @@ Landroid/os/Process;->PROC_ZERO_TERM:I Landroid/os/Process;->readProcFile(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z Landroid/os/Process;->readProcLines(Ljava/lang/String;[Ljava/lang/String;[J)V Landroid/os/Process;->ROOT_UID:I -Landroid/os/Process;->sendSignalQuiet(II)V Landroid/os/Process;->setArgV0(Ljava/lang/String;)V Landroid/os/Process;->setProcessGroup(II)V Landroid/os/Process;->SHELL_UID:I @@ -1054,7 +1021,6 @@ Landroid/os/Process;->WIFI_UID:I Landroid/os/RecoverySystem;->verifyPackageCompatibility(Ljava/io/InputStream;)Z Landroid/os/Registrant;->(Landroid/os/Handler;ILjava/lang/Object;)V Landroid/os/Registrant;->clear()V -Landroid/os/Registrant;->getHandler()Landroid/os/Handler; Landroid/os/Registrant;->messageForRegistrant()Landroid/os/Message; Landroid/os/Registrant;->notifyRegistrant()V Landroid/os/Registrant;->notifyRegistrant(Landroid/os/AsyncResult;)V @@ -1063,14 +1029,12 @@ Landroid/os/RegistrantList;->()V Landroid/os/RegistrantList;->add(Landroid/os/Handler;ILjava/lang/Object;)V Landroid/os/RegistrantList;->add(Landroid/os/Registrant;)V Landroid/os/RegistrantList;->addUnique(Landroid/os/Handler;ILjava/lang/Object;)V -Landroid/os/RegistrantList;->get(I)Ljava/lang/Object; Landroid/os/RegistrantList;->notifyRegistrants()V Landroid/os/RegistrantList;->notifyRegistrants(Landroid/os/AsyncResult;)V Landroid/os/RegistrantList;->notifyResult(Ljava/lang/Object;)V Landroid/os/RegistrantList;->remove(Landroid/os/Handler;)V Landroid/os/RegistrantList;->removeCleared()V Landroid/os/RegistrantList;->size()I -Landroid/os/RemoteCallback;->mHandler:Landroid/os/Handler; Landroid/os/RemoteCallbackList;->mCallbacks:Landroid/util/ArrayMap; Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException; Landroid/os/SELinux;->checkSELinuxAccess(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z @@ -1099,7 +1063,6 @@ Landroid/os/SharedMemory;->getFd()I Landroid/os/ShellCommand;->peekNextArg()Ljava/lang/String; Landroid/os/StatFs;->mStat:Landroid/system/StructStatVfs; Landroid/os/storage/IObbActionListener$Stub;->()V -Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener; Landroid/os/storage/IStorageManager$Stub$Proxy;->(Landroid/os/IBinder;)V Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager; Landroid/os/storage/StorageEventListener;->()V @@ -1123,13 +1086,8 @@ Landroid/os/SystemClock;->currentThreadTimeMicro()J Landroid/os/SystemClock;->currentTimeMicro()J Landroid/os/SystemProperties;->()V Landroid/os/SystemProperties;->addChangeCallback(Ljava/lang/Runnable;)V -Landroid/os/SystemProperties;->native_add_change_callback()V Landroid/os/SystemProperties;->native_get(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/SystemProperties;->native_get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/os/SystemProperties;->native_get_boolean(Ljava/lang/String;Z)Z -Landroid/os/SystemProperties;->native_get_int(Ljava/lang/String;I)I Landroid/os/SystemProperties;->native_get_long(Ljava/lang/String;J)J -Landroid/os/SystemProperties;->native_set(Ljava/lang/String;Ljava/lang/String;)V Landroid/os/SystemProperties;->PROP_NAME_MAX:I Landroid/os/SystemProperties;->reportSyspropChanged()V Landroid/os/SystemProperties;->sChangeCallbacks:Ljava/util/ArrayList; @@ -1171,7 +1129,6 @@ Landroid/os/UserHandle;->ALL:Landroid/os/UserHandle; Landroid/os/UserHandle;->CURRENT:Landroid/os/UserHandle; Landroid/os/UserHandle;->CURRENT_OR_SELF:Landroid/os/UserHandle; Landroid/os/UserHandle;->ERR_GID:I -Landroid/os/UserHandle;->formatUid(Ljava/io/PrintWriter;I)V Landroid/os/UserHandle;->getAppIdFromSharedAppGid(I)I Landroid/os/UserHandle;->getCallingUserId()I Landroid/os/UserHandle;->getUid(II)I @@ -1242,11 +1199,7 @@ Landroid/os/WorkSource;->mNames:[Ljava/lang/String; Landroid/os/WorkSource;->mNum:I Landroid/os/WorkSource;->mUids:[I Landroid/os/WorkSource;->setReturningDiffs(Landroid/os/WorkSource;)[Landroid/os/WorkSource; -Landroid/os/WorkSource;->sGoneWork:Landroid/os/WorkSource; Landroid/os/WorkSource;->size()I -Landroid/os/WorkSource;->sNewbWork:Landroid/os/WorkSource; -Landroid/os/WorkSource;->sTmpWorkSource:Landroid/os/WorkSource; -Landroid/os/WorkSource;->updateLocked(Landroid/os/WorkSource;ZZ)Z Landroid/os/ZygoteStartFailedEx;->(Ljava/lang/String;)V Landroid/os/ZygoteStartFailedEx;->(Ljava/lang/Throwable;)V Landroid/preference/PreferenceGroupAdapter;->getItem(I)Landroid/preference/Preference; @@ -1539,8 +1492,6 @@ Landroid/security/keystore/IKeystoreService;->is_hardware_backed(Ljava/lang/Stri Landroid/security/keystore/IKeystoreService;->list(Ljava/lang/String;I)[Ljava/lang/String; Landroid/security/keystore/IKeystoreService;->reset()I Landroid/security/keystore/IKeystoreService;->ungrant(Ljava/lang/String;I)I -Landroid/service/carrier/ICarrierMessagingCallback$Stub;->()V -Landroid/service/carrier/ICarrierMessagingService;->filterSms(Landroid/service/carrier/MessagePdu;Ljava/lang/String;IILandroid/service/carrier/ICarrierMessagingCallback;)V Landroid/service/dreams/IDreamManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/dreams/IDreamManager; Landroid/service/dreams/IDreamManager;->awaken()V Landroid/service/dreams/IDreamManager;->dream()V @@ -1578,7 +1529,6 @@ Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBin Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V Landroid/telecom/Log;->i(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V Landroid/telecom/Log;->w(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V -Landroid/telephony/CarrierMessagingServiceManager;->()V Landroid/telephony/ims/compat/feature/MMTelFeature;->()V Landroid/telephony/ims/compat/ImsService;->()V Landroid/telephony/ims/compat/stub/ImsCallSessionImplBase;->()V @@ -1682,11 +1632,9 @@ Landroid/view/IWindowManager;->registerDockedStackListener(Landroid/view/IDocked Landroid/view/IWindowManager;->removeRotationWatcher(Landroid/view/IRotationWatcher;)V Landroid/view/IWindowManager;->setAnimationScale(IF)V Landroid/view/IWindowManager;->setAnimationScales([F)V -Landroid/view/IWindowManager;->setInTouchMode(Z)V Landroid/view/IWindowManager;->setNavBarVirtualKeyHapticFeedbackEnabled(Z)V Landroid/view/IWindowManager;->setShelfHeight(ZI)V Landroid/view/IWindowManager;->setStrictModeVisualIndicatorPreference(Ljava/lang/String;)V -Landroid/view/IWindowManager;->showStrictModeViolation(Z)V Landroid/view/IWindowManager;->thawRotation()V Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I Landroid/view/IWindowSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowSession; @@ -2184,7 +2132,6 @@ Lcom/android/internal/R$styleable;->AlertDialog:[I Lcom/android/internal/R$styleable;->AnalogClock:[I Lcom/android/internal/R$styleable;->AndroidManifest:[I Lcom/android/internal/R$styleable;->AndroidManifestActivity:[I -Lcom/android/internal/R$styleable;->AndroidManifestActivityAlias:[I Lcom/android/internal/R$styleable;->AndroidManifestActivity_allowTaskReparenting:I Lcom/android/internal/R$styleable;->AndroidManifestActivity_configChanges:I Lcom/android/internal/R$styleable;->AndroidManifestActivity_description:I @@ -2218,21 +2165,13 @@ Lcom/android/internal/R$styleable;->AndroidManifestApplication_supportsRtl:I Lcom/android/internal/R$styleable;->AndroidManifestApplication_theme:I Lcom/android/internal/R$styleable;->AndroidManifestApplication_uiOptions:I Lcom/android/internal/R$styleable;->AndroidManifestData:[I -Lcom/android/internal/R$styleable;->AndroidManifestGrantUriPermission:[I -Lcom/android/internal/R$styleable;->AndroidManifestInstrumentation:[I Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter:[I Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter_priority:I Lcom/android/internal/R$styleable;->AndroidManifestMetaData:[I Lcom/android/internal/R$styleable;->AndroidManifestMetaData_name:I Lcom/android/internal/R$styleable;->AndroidManifestMetaData_resource:I Lcom/android/internal/R$styleable;->AndroidManifestMetaData_value:I -Lcom/android/internal/R$styleable;->AndroidManifestOriginalPackage:[I Lcom/android/internal/R$styleable;->AndroidManifestPackageVerifier:[I -Lcom/android/internal/R$styleable;->AndroidManifestPathPermission:[I -Lcom/android/internal/R$styleable;->AndroidManifestPermission:[I -Lcom/android/internal/R$styleable;->AndroidManifestPermissionGroup:[I -Lcom/android/internal/R$styleable;->AndroidManifestPermissionTree:[I -Lcom/android/internal/R$styleable;->AndroidManifestProtectedBroadcast:[I Lcom/android/internal/R$styleable;->AndroidManifestProvider:[I Lcom/android/internal/R$styleable;->AndroidManifestService:[I Lcom/android/internal/R$styleable;->AndroidManifestService_enabled:I @@ -2240,9 +2179,6 @@ Lcom/android/internal/R$styleable;->AndroidManifestService_exported:I Lcom/android/internal/R$styleable;->AndroidManifestService_name:I Lcom/android/internal/R$styleable;->AndroidManifestService_permission:I Lcom/android/internal/R$styleable;->AndroidManifestService_process:I -Lcom/android/internal/R$styleable;->AndroidManifestSupportsScreens:[I -Lcom/android/internal/R$styleable;->AndroidManifestUsesConfiguration:[I -Lcom/android/internal/R$styleable;->AndroidManifestUsesFeature:[I Lcom/android/internal/R$styleable;->AndroidManifestUsesLibrary:[I Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission:[I Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission_name:I @@ -2265,7 +2201,6 @@ Lcom/android/internal/R$styleable;->CompoundButton:[I Lcom/android/internal/R$styleable;->CompoundButton_button:I Lcom/android/internal/R$styleable;->CompoundButton_checked:I Lcom/android/internal/R$styleable;->ContactsDataKind:[I -Lcom/android/internal/R$styleable;->CycleInterpolator:[I Lcom/android/internal/R$styleable;->DatePicker:[I Lcom/android/internal/R$styleable;->DialogPreference:[I Lcom/android/internal/R$styleable;->DialogPreference_dialogTitle:I @@ -2285,7 +2220,6 @@ Lcom/android/internal/R$styleable;->Keyboard:[I Lcom/android/internal/R$styleable;->KeyboardView:[I Lcom/android/internal/R$styleable;->Keyboard_Key:[I Lcom/android/internal/R$styleable;->Keyboard_Row:[I -Lcom/android/internal/R$styleable;->LinearLayout:[I Lcom/android/internal/R$styleable;->ListPreference:[I Lcom/android/internal/R$styleable;->ListPreference_entries:I Lcom/android/internal/R$styleable;->ListView:[I @@ -2300,7 +2234,6 @@ Lcom/android/internal/R$styleable;->MapView:[I Lcom/android/internal/R$styleable;->MapView_apiKey:I Lcom/android/internal/R$styleable;->MenuGroup:[I Lcom/android/internal/R$styleable;->MenuItem:[I -Lcom/android/internal/R$styleable;->MenuView:[I Lcom/android/internal/R$styleable;->NumberPicker:[I Lcom/android/internal/R$styleable;->PopupWindow:[I Lcom/android/internal/R$styleable;->PopupWindow_popupAnimationStyle:I @@ -2327,8 +2260,6 @@ Lcom/android/internal/R$styleable;->QuickContactBadge:[I Lcom/android/internal/R$styleable;->RingtonePreference:[I Lcom/android/internal/R$styleable;->ScrollView:[I Lcom/android/internal/R$styleable;->ScrollView_fillViewport:I -Lcom/android/internal/R$styleable;->Searchable:[I -Lcom/android/internal/R$styleable;->SearchableActionKey:[I Lcom/android/internal/R$styleable;->SelectionModeDrawables:[I Lcom/android/internal/R$styleable;->Switch:[I Lcom/android/internal/R$styleable;->SwitchPreference:[I @@ -3393,7 +3324,6 @@ Lcom/android/internal/telephony/IntRangeManager;->mRanges:Ljava/util/ArrayList; Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener; Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->(Landroid/os/IBinder;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->()V Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneSubInfo; Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/IPhoneSubInfo;->getIccSerialNumber(Ljava/lang/String;)Ljava/lang/String; @@ -3440,13 +3370,9 @@ Lcom/android/internal/telephony/ITelephony;->updateServiceLocation()V Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;->(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry; Lcom/android/internal/telephony/ITelephonyRegistry;->listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallState(ILjava/lang/String;)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellInfo(Ljava/util/List;)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyOtaspChanged(I)V Lcom/android/internal/telephony/IWapPushManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IWapPushManager; Lcom/android/internal/telephony/IWapPushManager;->addPackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z Lcom/android/internal/telephony/IWapPushManager;->deletePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z @@ -4222,7 +4148,6 @@ Lcom/android/internal/view/ActionBarPolicy;->getTabContainerHeight()I Lcom/android/internal/view/ActionBarPolicy;->hasEmbeddedTabs()Z Lcom/android/internal/view/ActionBarPolicy;->mContext:Landroid/content/Context; Lcom/android/internal/view/ActionBarPolicy;->showsOverflowMenuButton()Z -Lcom/android/internal/view/BaseIWindow;->()V Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;->(Landroid/os/IBinder;)V Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager; Lcom/android/internal/view/IInputMethodSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodSession; diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 3189d089e6d84..bb182f2b29486 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -2231,12 +2231,12 @@ public class AccountManager { } private abstract class AmsTask extends FutureTask implements AccountManagerFuture { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final IAccountManagerResponse mResponse; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Handler mHandler; final AccountManagerCallback mCallback; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Activity mActivity; public AmsTask(Activity activity, Handler handler, AccountManagerCallback callback) { super(new Callable() { @@ -2561,13 +2561,13 @@ public class AccountManager { } volatile AccountManagerFuture mFuture = null; final String mAccountType; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final String mAuthTokenType; final String[] mFeatures; final Bundle mAddAccountOptions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Bundle mLoginOptions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final AccountManagerCallback mMyCallback; private volatile int mNumAccounts = 0; diff --git a/core/java/android/accounts/AuthenticatorDescription.java b/core/java/android/accounts/AuthenticatorDescription.java index 6875867108de2..2360cec5bde84 100644 --- a/core/java/android/accounts/AuthenticatorDescription.java +++ b/core/java/android/accounts/AuthenticatorDescription.java @@ -17,6 +17,7 @@ package android.accounts; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcelable; import android.os.Parcel; @@ -77,7 +78,7 @@ public class AuthenticatorDescription implements Parcelable { return new AuthenticatorDescription(type); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private AuthenticatorDescription(String type) { this.type = type; this.packageName = null; @@ -88,7 +89,7 @@ public class AuthenticatorDescription implements Parcelable { this.customTokens = false; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private AuthenticatorDescription(Parcel source) { this.type = source.readString(); this.packageName = source.readString(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a6f9bcab716d0..a510c578fdd15 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -840,7 +840,7 @@ public class Activity extends ContextThemeWrapper @UnsupportedAppUsage /*package*/ boolean mWindowAdded = false; /*package*/ boolean mVisibleFromServer = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) /*package*/ boolean mVisibleFromClient = true; /*package*/ ActionBar mActionBar = null; private boolean mEnableDefaultActionBarUp; diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 15af8a90dd49e..4f1744730f243 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3460,7 +3460,7 @@ public final class ActivityThread extends ClientTransactionHandler { return sCurrentBroadcastIntent.get(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void handleReceiver(ReceiverData data) { // If we are getting ready to gc after going to the background, well // we are back active so skip it. diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index b81795cd35b52..3b7ddcc86dc2d 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -130,7 +130,7 @@ public class Dialog implements DialogInterface, Window.Callback, private boolean mShowing = false; private boolean mCanceled = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Handler mHandler = new Handler(); private static final int DISMISS = 0x43; diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 49917b40521de..6f3b3a3f90901 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -390,7 +390,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene ViewGroup mContainer; // The View generated for this fragment. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) View mView; // Whether this fragment should defer starting until after other fragments diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index ab0a31575174d..5d2f620310e00 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -29,6 +29,7 @@ import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.hardware.input.InputManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Debug; import android.os.IBinder; @@ -2000,7 +2001,7 @@ public class Instrumentation { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static void checkStartActivityResult(int res, Object intent) { if (!ActivityManager.isStartResultFatalError(res)) { return; diff --git a/core/java/android/app/ProgressDialog.java b/core/java/android/app/ProgressDialog.java index 1b10fd7cf86d3..3193eb89ac809 100644 --- a/core/java/android/app/ProgressDialog.java +++ b/core/java/android/app/ProgressDialog.java @@ -22,6 +22,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -64,7 +65,7 @@ public class ProgressDialog extends AlertDialog { */ public static final int STYLE_HORIZONTAL = 1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private ProgressBar mProgress; @UnsupportedAppUsage private TextView mMessageView; diff --git a/core/java/android/app/ResultInfo.java b/core/java/android/app/ResultInfo.java index 4335488777ba2..d916c94ab6c5c 100644 --- a/core/java/android/app/ResultInfo.java +++ b/core/java/android/app/ResultInfo.java @@ -18,6 +18,7 @@ package android.app; import android.annotation.UnsupportedAppUsage; import android.content.Intent; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -65,7 +66,7 @@ public class ResultInfo implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public ResultInfo createFromParcel(Parcel in) { diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index 5fe1af0a18ba1..d04dc1782f667 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -29,6 +29,7 @@ import android.content.res.Resources.NotFoundException; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; @@ -181,7 +182,7 @@ public final class DeviceAdminInfo implements Parcelable { /** @hide */ public static class PolicyInfo { public final int ident; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final String tag; public final int label; public final int description; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7bcc209c6500e..1b08ecd32fca1 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -51,6 +51,7 @@ import android.content.pm.UserInfo; import android.graphics.Bitmap; import android.net.ProxyInfo; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcelable; import android.os.PersistableBundle; @@ -2125,7 +2126,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordQuality(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2191,7 +2192,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumLength(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2261,7 +2262,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumUpperCase(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2331,7 +2332,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumLowerCase(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2400,7 +2401,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumLetters(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2469,7 +2470,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumNumeric(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2537,7 +2538,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumSymbols(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2606,7 +2607,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordMinimumNonLetter(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { @@ -2758,7 +2759,7 @@ public class DevicePolicyManager { } /** @hide per-user version */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getPasswordHistoryLength(@Nullable ComponentName admin, int userHandle) { if (mService != null) { try { diff --git a/core/java/android/app/assist/AssistContent.java b/core/java/android/app/assist/AssistContent.java index bdbce5282b948..ff7e181ba3580 100644 --- a/core/java/android/app/assist/AssistContent.java +++ b/core/java/android/app/assist/AssistContent.java @@ -4,6 +4,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.ClipData; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -14,18 +15,18 @@ import android.os.Parcelable; * {@link android.app.Activity#onProvideAssistContent Activity.onProvideAssistContent}. */ public class AssistContent implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mIsAppProvidedIntent = false; private boolean mIsAppProvidedWebUri = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Intent mIntent; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mStructuredData; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private ClipData mClipData; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Uri mUri; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Bundle mExtras; public AssistContent() { @@ -174,7 +175,7 @@ public class AssistContent implements Parcelable { mIsAppProvidedWebUri = in.readInt() == 1; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) void writeToParcelInternal(Parcel dest, int flags) { if (mIntent != null) { dest.writeInt(1); diff --git a/core/java/android/app/job/JobWorkItem.java b/core/java/android/app/job/JobWorkItem.java index bfc6df260e805..f804681cb3e90 100644 --- a/core/java/android/app/job/JobWorkItem.java +++ b/core/java/android/app/job/JobWorkItem.java @@ -21,6 +21,7 @@ import static android.app.job.JobInfo.NETWORK_BYTES_UNKNOWN; import android.annotation.BytesLong; import android.annotation.UnsupportedAppUsage; import android.content.Intent; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -30,15 +31,15 @@ import android.os.Parcelable; * {@link JobParameters#dequeueWork() JobParameters.dequeueWork} for more details. */ final public class JobWorkItem implements Parcelable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Intent mIntent; final long mNetworkDownloadBytes; final long mNetworkUploadBytes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mDeliveryCount; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mWorkId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) Object mGrants; /** @@ -224,7 +225,7 @@ final public class JobWorkItem implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) JobWorkItem(Parcel in) { if (in.readInt() != 0) { mIntent = Intent.CREATOR.createFromParcel(in); diff --git a/core/java/android/app/usage/ConfigurationStats.java b/core/java/android/app/usage/ConfigurationStats.java index dff9b611010f3..87a737db09b24 100644 --- a/core/java/android/app/usage/ConfigurationStats.java +++ b/core/java/android/app/usage/ConfigurationStats.java @@ -17,6 +17,7 @@ package android.app.usage; import android.annotation.UnsupportedAppUsage; import android.content.res.Configuration; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -29,37 +30,37 @@ public final class ConfigurationStats implements Parcelable { /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public Configuration mConfiguration; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mBeginTimeStamp; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mEndTimeStamp; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mLastTimeActive; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mTotalTimeActive; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int mActivationCount; /** diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java index 9f22ad193e425..4864ece8ef52f 100644 --- a/core/java/android/app/usage/UsageEvents.java +++ b/core/java/android/app/usage/UsageEvents.java @@ -19,6 +19,7 @@ import android.annotation.IntDef; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.content.res.Configuration; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -178,32 +179,32 @@ public final class UsageEvents implements Parcelable { /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String mPackage; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String mClass; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mTimeStamp; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int mEventType; /** * Only present for {@link #CONFIGURATION_CHANGE} event types. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public Configuration mConfiguration; /** @@ -386,30 +387,30 @@ public final class UsageEvents implements Parcelable { } // Only used when creating the resulting events. Not used for reading/unparceling. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private List mEventsToWrite = null; // Only used for reading/unparceling events. @UnsupportedAppUsage private Parcel mParcel = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mEventCount; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mIndex = 0; /* * In order to save space, since ComponentNames will be duplicated everywhere, * we use a map and index into it. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String[] mStringPool; /** * Construct the iterator from a parcel. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public UsageEvents(Parcel in) { byte[] bytes = in.readBlob(); Parcel data = Parcel.obtain(); @@ -494,7 +495,7 @@ public final class UsageEvents implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int findStringIndex(String str) { final int index = Arrays.binarySearch(mStringPool, str); if (index < 0) { @@ -506,7 +507,7 @@ public final class UsageEvents implements Parcelable { /** * Writes a single event to the parcel. Modify this when updating {@link Event}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void writeEventToParcel(Event event, Parcel p, int flags) { final int packageIndex; if (event.mPackage != null) { @@ -550,7 +551,7 @@ public final class UsageEvents implements Parcelable { /** * Reads a single event from the parcel. Modify this when updating {@link Event}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void readEventFromParcel(Parcel p, Event eventOut) { final int packageIndex = p.readInt(); if (packageIndex >= 0) { diff --git a/core/java/android/app/usage/UsageStats.java b/core/java/android/app/usage/UsageStats.java index 0659a237d5224..6c41c24db3eed 100644 --- a/core/java/android/app/usage/UsageStats.java +++ b/core/java/android/app/usage/UsageStats.java @@ -18,6 +18,7 @@ package android.app.usage; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -32,26 +33,26 @@ public final class UsageStats implements Parcelable { /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String mPackageName; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mBeginTimeStamp; /** * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mEndTimeStamp; /** * Last time used by the user with an explicit action (notification, activity launch). * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public long mLastTimeUsed; /** diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index dbb00eb5c2885..01a63f43096a1 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -233,7 +233,7 @@ public final class UsageStatsManager { @SystemApi public static final String EXTRA_TIME_USED = "android.app.usage.extra.TIME_USED"; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static final UsageEvents sEmptyResults = new UsageEvents(); @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index 466b9cee10a0b..171c2f5b1a086 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -878,7 +878,7 @@ public final class BluetoothA2dp implements BluetoothProfile { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static String stateToString(int state) { switch (state) { case STATE_DISCONNECTED: diff --git a/core/java/android/bluetooth/BluetoothClass.java b/core/java/android/bluetooth/BluetoothClass.java index 3a78cbdd4d0af..1edbacbae4f7f 100755 --- a/core/java/android/bluetooth/BluetoothClass.java +++ b/core/java/android/bluetooth/BluetoothClass.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -65,7 +66,7 @@ public final class BluetoothClass implements Parcelable { private final int mClass; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public BluetoothClass(int classInt) { mClass = classInt; } diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index fdbfec00e6279..bc3c9a9ebf4b3 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -17,6 +17,7 @@ package android.bluetooth; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.ParcelUuid; import java.nio.ByteBuffer; @@ -38,20 +39,20 @@ public final class BluetoothUuid { * The following 128 bit values are calculated as: * uuid * 2^96 + BASE_UUID */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final ParcelUuid AudioSink = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid AudioSource = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final ParcelUuid AdvAudioDist = ParcelUuid.fromString("0000110D-0000-1000-8000-00805F9B34FB"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final ParcelUuid HSP = ParcelUuid.fromString("00001108-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid HSP_AG = ParcelUuid.fromString("00001112-0000-1000-8000-00805F9B34FB"); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final ParcelUuid Handsfree = ParcelUuid.fromString("0000111E-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid Handsfree_AG = diff --git a/core/java/android/content/Entity.java b/core/java/android/content/Entity.java index b9473e04c63c5..ff4f150062809 100644 --- a/core/java/android/content/Entity.java +++ b/core/java/android/content/Entity.java @@ -18,6 +18,7 @@ package android.content; import android.annotation.UnsupportedAppUsage; import android.net.Uri; +import android.os.Build; import java.util.ArrayList; @@ -29,9 +30,9 @@ import java.util.ArrayList; * corresponds to that RawContact. The uri refers to the Data table uri for each row. */ public final class Entity { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final private ContentValues mValues; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final private ArrayList mSubValues; public Entity(ContentValues values) { diff --git a/core/java/android/content/SyncAdapterType.java b/core/java/android/content/SyncAdapterType.java index ff77676505a75..6cd4841b9cf08 100644 --- a/core/java/android/content/SyncAdapterType.java +++ b/core/java/android/content/SyncAdapterType.java @@ -18,6 +18,7 @@ package android.content; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.text.TextUtils; import android.os.Parcelable; import android.os.Parcel; @@ -30,9 +31,9 @@ public class SyncAdapterType implements Parcelable { public final String authority; public final String accountType; public final boolean isKey; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean userVisible; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean supportsUploading; @UnsupportedAppUsage private final boolean isAlwaysSyncable; @@ -85,7 +86,7 @@ public class SyncAdapterType implements Parcelable { this.packageName = packageName; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private SyncAdapterType(String authority, String accountType) { if (TextUtils.isEmpty(authority)) { throw new IllegalArgumentException("the authority must not be empty: " + authority); diff --git a/core/java/android/content/SyncInfo.java b/core/java/android/content/SyncInfo.java index 7ebf922aead04..403cbcbf8b2fc 100644 --- a/core/java/android/content/SyncInfo.java +++ b/core/java/android/content/SyncInfo.java @@ -18,6 +18,7 @@ package android.content; import android.accounts.Account; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -95,7 +96,7 @@ public class SyncInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) SyncInfo(Parcel parcel) { authorityId = parcel.readInt(); account = parcel.readParcelable(Account.class.getClassLoader()); diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index 07b23d1decc04..dd550032df7c3 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -19,6 +19,7 @@ package android.content.om; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -114,7 +115,7 @@ public final class OverlayInfo implements Parcelable { /** * Package name of the target package */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final String targetPackageName; /** diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index cdacd1ecb95a7..da8811a6f636a 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Environment; import android.os.Parcel; import android.os.Parcelable; @@ -1428,9 +1429,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { return sCollator.compare(sa.toString(), sb.toString()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Collator sCollator = Collator.getInstance(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private PackageManager mPM; } @@ -1672,7 +1673,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void disableCompatibilityMode() { flags |= (FLAG_SUPPORTS_LARGE_SCREENS | FLAG_SUPPORTS_NORMAL_SCREENS | FLAG_SUPPORTS_SMALL_SCREENS | FLAG_RESIZEABLE_FOR_SCREENS | @@ -1797,7 +1798,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { return pm.getDefaultActivityIcon(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean isPackageUnavailable(PackageManager pm) { try { return pm.getPackageInfo(packageName, 0) == null; diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index 89e8608eec087..8cb6ffb47fb97 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -19,6 +19,7 @@ package android.content.pm; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.apex.ApexInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -494,7 +495,7 @@ public class PackageInfo implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private PackageInfo(Parcel source) { packageName = source.readString(); splitNames = source.createStringArray(); diff --git a/core/java/android/content/pm/PackageInfoLite.java b/core/java/android/content/pm/PackageInfoLite.java index e0e67b9321aaf..b878a955c223c 100644 --- a/core/java/android/content/pm/PackageInfoLite.java +++ b/core/java/android/content/pm/PackageInfoLite.java @@ -17,6 +17,7 @@ package android.content.pm; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -116,7 +117,7 @@ public class PackageInfoLite implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public PackageInfoLite createFromParcel(Parcel source) { diff --git a/core/java/android/content/pm/PackageStats.java b/core/java/android/content/pm/PackageStats.java index f70ec390e90e1..d3e86a35170e9 100644 --- a/core/java/android/content/pm/PackageStats.java +++ b/core/java/android/content/pm/PackageStats.java @@ -18,6 +18,7 @@ package android.content.pm; import android.annotation.UnsupportedAppUsage; import android.app.usage.StorageStatsManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -38,7 +39,7 @@ public class PackageStats implements Parcelable { public String packageName; /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int userHandle; /** Size of the code (e.g., APK) */ diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index 1ca7b132fdab6..7d101b8f78e54 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -612,7 +612,7 @@ public class CompatibilityInfo implements Parcelable { dest.writeFloat(applicationInvertedScale); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/core/java/android/database/DatabaseUtils.java b/core/java/android/database/DatabaseUtils.java index d60e61ac419e7..99061227ce11e 100644 --- a/core/java/android/database/DatabaseUtils.java +++ b/core/java/android/database/DatabaseUtils.java @@ -30,6 +30,7 @@ import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteFullException; import android.database.sqlite.SQLiteProgram; import android.database.sqlite.SQLiteStatement; +import android.os.Build; import android.os.OperationCanceledException; import android.os.Parcel; import android.os.ParcelFileDescriptor; @@ -322,7 +323,7 @@ public class DatabaseUtils { * @return object value type * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static int getTypeOfObject(Object obj) { if (obj == null) { return Cursor.FIELD_TYPE_NULL; diff --git a/core/java/android/database/MatrixCursor.java b/core/java/android/database/MatrixCursor.java index 5033296df9fb4..a52e96e249f8f 100644 --- a/core/java/android/database/MatrixCursor.java +++ b/core/java/android/database/MatrixCursor.java @@ -17,6 +17,7 @@ package android.database; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.ArrayList; /** @@ -27,9 +28,9 @@ import java.util.ArrayList; public class MatrixCursor extends AbstractCursor { private final String[] columnNames; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Object[] data; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int rowCount = 0; private final int columnCount; diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java index 5e7d585348312..ad86319408af4 100644 --- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java +++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java @@ -50,11 +50,11 @@ public class SQLiteQueryBuilder { Pattern.compile("\\s*\\d+\\s*(,\\s*\\d+\\s*)?"); private Map mProjectionMap = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mTables = ""; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private StringBuilder mWhereClause = null; // lazily created - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mDistinct; private SQLiteDatabase.CursorFactory mFactory; private boolean mStrict; @@ -786,7 +786,7 @@ public class SQLiteQueryBuilder { return query.toString(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String[] computeProjection(String[] projectionIn) { if (projectionIn != null && projectionIn.length > 0) { if (mProjectionMap != null) { diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index d165889e83254..364962612e715 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -39,6 +39,7 @@ import android.database.ContentObserver; import android.graphics.Rect; import android.graphics.Region; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -343,7 +344,7 @@ public class InputMethodService extends AbstractInputMethodService { InputMethodManager mImm; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mTheme = 0; LayoutInflater mInflater; @@ -418,7 +419,7 @@ public class InputMethodService extends AbstractInputMethodService { */ boolean mShouldClearInsetOfPreviousIme; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Insets mTmpInsets = new Insets(); final int[] mTmpLocation = new int[2]; diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 49c3dc63e1513..61d5a91277433 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -27,6 +27,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.Binder; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Handler; @@ -2768,7 +2769,7 @@ public class ConnectivityManager { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void unregisterNetworkFactory(Messenger messenger) { try { mService.unregisterNetworkFactory(messenger); diff --git a/core/java/android/net/LinkAddress.java b/core/java/android/net/LinkAddress.java index 77562dbd7bfa5..b40f15ae17bac 100644 --- a/core/java/android/net/LinkAddress.java +++ b/core/java/android/net/LinkAddress.java @@ -27,6 +27,7 @@ import static android.system.OsConstants.RT_SCOPE_UNIVERSE; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Pair; @@ -56,13 +57,13 @@ public class LinkAddress implements Parcelable { /** * IPv4 or IPv6 address. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private InetAddress address; /** * Prefix length. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int prefixLength; /** diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 80517ce28cda3..3a792065155e4 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -50,7 +51,7 @@ import java.util.StringJoiner; */ public final class LinkProperties implements Parcelable { // The interface described by the network link. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mIfaceName; private ArrayList mLinkAddresses = new ArrayList<>(); private ArrayList mDnses = new ArrayList<>(); @@ -1136,7 +1137,7 @@ public final class LinkProperties implements Parcelable { * @return {@code true} if both are identical, {@code false} otherwise. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public boolean isIdenticalHttpProxy(LinkProperties target) { return getHttpProxy() == null ? target.getHttpProxy() == null : getHttpProxy().equals(target.getHttpProxy()); diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index 114b423c31848..99bfc140f140a 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -19,6 +19,7 @@ package android.net; import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.net.ConnectivityManager.PacketKeepalive; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -352,7 +353,7 @@ public abstract class NetworkAgent extends Handler { /** * Called by the bearer code when it has new NetworkInfo data. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void sendNetworkInfo(NetworkInfo networkInfo) { queueOrSendMessage(EVENT_NETWORK_INFO_CHANGED, new NetworkInfo(networkInfo)); } diff --git a/core/java/android/net/NetworkFactory.java b/core/java/android/net/NetworkFactory.java index 010d72f3b17ae..7c6ca57ebf9c0 100644 --- a/core/java/android/net/NetworkFactory.java +++ b/core/java/android/net/NetworkFactory.java @@ -18,6 +18,7 @@ package android.net; import android.annotation.UnsupportedAppUsage; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -289,7 +290,7 @@ public class NetworkFactory extends Handler { sendMessage(obtainMessage(CMD_CANCEL_REQUEST, networkRequest)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setScoreFilter(int score) { sendMessage(obtainMessage(CMD_SET_SCORE, score, 0)); } @@ -307,7 +308,7 @@ public class NetworkFactory extends Handler { Log.d(LOG_TAG, s); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); pw.println(toString()); diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 299b23206dcf9..5ab34e9aa6e8a 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -28,6 +28,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; +import android.os.Build; import android.os.RemoteException; import android.os.UserHandle; import android.util.DebugUtils; @@ -203,7 +204,7 @@ public class NetworkPolicyManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void registerListener(INetworkPolicyListener listener) { try { mService.registerListener(listener); @@ -212,7 +213,7 @@ public class NetworkPolicyManager { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void unregisterListener(INetworkPolicyListener listener) { try { mService.unregisterListener(listener); diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 3b01b03edd4e1..9508217be53f0 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -21,6 +21,7 @@ import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.net.NetworkCapabilities.NetCapability; import android.net.NetworkCapabilities.Transport; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.Process; @@ -57,7 +58,7 @@ public class NetworkRequest implements Parcelable { * Causes CONNECTIVITY_ACTION broadcasts to be sent. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final int legacyType; /** diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 3e73d3d2d9973..37ab9ffb1f5b8 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -17,6 +17,7 @@ package android.net; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -81,7 +82,7 @@ public final class RouteInfo implements Parcelable { // Derived data members. // TODO: remove these. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean mIsHost; private final boolean mHasGateway; @@ -265,7 +266,7 @@ public final class RouteInfo implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean isHost() { return (mDestination.getAddress() instanceof Inet4Address && mDestination.getPrefixLength() == 32) || diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index 8026d765ee0c9..fbc281f26ce86 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -20,6 +20,7 @@ import static android.util.Patterns.GOOD_IRI_CHAR; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Locale; import java.util.regex.Matcher; @@ -50,7 +51,7 @@ public class WebAddress { private String mScheme; @UnsupportedAppUsage private String mHost; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mPort; @UnsupportedAppUsage private String mPath; diff --git a/core/java/android/net/http/SslError.java b/core/java/android/net/http/SslError.java index fad6689ed0558..b3f2fb79b5c3a 100644 --- a/core/java/android/net/http/SslError.java +++ b/core/java/android/net/http/SslError.java @@ -17,6 +17,7 @@ package android.net.http; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.security.cert.X509Certificate; /** @@ -68,7 +69,7 @@ public class SslError { * The SSL error set bitfield (each individual error is a bit index; * multiple individual errors can be OR-ed) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mErrors; /** @@ -80,7 +81,7 @@ public class SslError { /** * The URL associated with the error set. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final String mUrl; /** diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java index 7b6c97132b5cb..828f1c304ccbf 100644 --- a/core/java/android/os/storage/DiskInfo.java +++ b/core/java/android/os/storage/DiskInfo.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -66,7 +67,7 @@ public class DiskInfo implements Parcelable { this.flags = flags; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public DiskInfo(Parcel parcel) { id = parcel.readString(); flags = parcel.readInt(); @@ -196,7 +197,7 @@ public class DiskInfo implements Parcelable { return id.hashCode(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final Creator CREATOR = new Creator() { @Override public DiskInfo createFromParcel(Parcel in) { diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index e9ff59d8393c0..79e725b06757b 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -94,7 +94,7 @@ import java.util.List; */ public abstract class NotificationListenerService extends Service { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final String TAG = getClass().getSimpleName(); /** @@ -290,7 +290,7 @@ public abstract class NotificationListenerService extends Service { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected INotificationManager mNoMan; /** @@ -512,7 +512,7 @@ public abstract class NotificationListenerService extends Service { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected final INotificationManager getNotificationInterface() { if (mNoMan == null) { mNoMan = INotificationManager.Stub.asInterface( diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java index dd97d524d8297..2d8d0cfb7a3ba 100644 --- a/core/java/android/service/notification/StatusBarNotification.java +++ b/core/java/android/service/notification/StatusBarNotification.java @@ -22,6 +22,7 @@ import android.app.NotificationChannel; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -35,7 +36,7 @@ public class StatusBarNotification implements Parcelable { private final String pkg; @UnsupportedAppUsage private final int id; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final String tag; private final String key; private String groupKey; @@ -44,13 +45,13 @@ public class StatusBarNotification implements Parcelable { @UnsupportedAppUsage private final int uid; private final String opPkg; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int initialPid; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final Notification notification; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final UserHandle user; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final long postTime; private Context mContext; // used for inflation & icon expansion diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 0dfd7633b2ff6..3b436cdb985e5 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -33,6 +33,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -192,7 +193,7 @@ public abstract class WallpaperService extends Service { final Object mLock = new Object(); boolean mOffsetMessageEnqueued; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) float mPendingXOffset; float mPendingYOffset; float mPendingXOffsetStep; diff --git a/core/java/android/text/method/HideReturnsTransformationMethod.java b/core/java/android/text/method/HideReturnsTransformationMethod.java index e753754a38d43..440a4b1871733 100644 --- a/core/java/android/text/method/HideReturnsTransformationMethod.java +++ b/core/java/android/text/method/HideReturnsTransformationMethod.java @@ -17,6 +17,7 @@ package android.text.method; import android.annotation.UnsupportedAppUsage; +import android.os.Build; /** * This transformation method causes any carriage return characters (\r) @@ -50,6 +51,6 @@ extends ReplacementTransformationMethod { return sInstance; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static HideReturnsTransformationMethod sInstance; } diff --git a/core/java/android/text/method/PasswordTransformationMethod.java b/core/java/android/text/method/PasswordTransformationMethod.java index 479fdf4cbb231..c96fc5de08455 100644 --- a/core/java/android/text/method/PasswordTransformationMethod.java +++ b/core/java/android/text/method/PasswordTransformationMethod.java @@ -18,6 +18,7 @@ package android.text.method; import android.annotation.UnsupportedAppUsage; import android.graphics.Rect; +import android.os.Build; import android.os.Handler; import android.os.SystemClock; import android.text.Editable; @@ -264,6 +265,6 @@ implements TransformationMethod, TextWatcher @UnsupportedAppUsage private static PasswordTransformationMethod sInstance; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static char DOT = '\u2022'; } diff --git a/core/java/android/text/style/BulletSpan.java b/core/java/android/text/style/BulletSpan.java index 401344779f07e..0ed6969d259b6 100644 --- a/core/java/android/text/style/BulletSpan.java +++ b/core/java/android/text/style/BulletSpan.java @@ -26,6 +26,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Path.Direction; +import android.os.Build; import android.os.Parcel; import android.text.Layout; import android.text.ParcelableSpan; @@ -71,15 +72,15 @@ public class BulletSpan implements LeadingMarginSpan, ParcelableSpan { private static final int STANDARD_COLOR = 0; @Px - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mGapWidth; @Px private final int mBulletRadius; private Path mBulletPath = null; @ColorInt - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mColor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final boolean mWantColor; /** diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java index 5108a796a036d..8b5eecfad3788 100644 --- a/core/java/android/util/ArrayMap.java +++ b/core/java/android/util/ArrayMap.java @@ -19,6 +19,7 @@ package android.util; import libcore.util.EmptyArray; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.util.Collection; import java.util.ConcurrentModificationException; import java.util.Map; @@ -77,13 +78,13 @@ public final class ArrayMap implements Map { /** * Special hash array value that indicates the container is immutable. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) static final int[] EMPTY_IMMUTABLE_INTS = new int[0]; /** * @hide Special immutable empty ArrayMap. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static final ArrayMap EMPTY = new ArrayMap<>(-1); /** @@ -102,11 +103,11 @@ public final class ArrayMap implements Map { static int mTwiceBaseCacheSize; final boolean mIdentityHashCode; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int[] mHashes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) Object[] mArray; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mSize; MapCollections mCollections; @@ -122,7 +123,7 @@ public final class ArrayMap implements Map { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int indexOf(Object key, int hash) { final int N = mSize; @@ -161,7 +162,7 @@ public final class ArrayMap implements Map { return ~end; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int indexOfNull() { final int N = mSize; @@ -200,7 +201,7 @@ public final class ArrayMap implements Map { return ~end; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void allocArrays(final int size) { if (mHashes == EMPTY_IMMUTABLE_INTS) { throw new UnsupportedOperationException("ArrayMap is immutable"); @@ -239,7 +240,7 @@ public final class ArrayMap implements Map { mArray = new Object[size<<1]; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void freeArrays(final int[] hashes, final Object[] array, final int size) { if (hashes.length == (BASE_SIZE*2)) { synchronized (ArrayMap.class) { @@ -393,7 +394,7 @@ public final class ArrayMap implements Map { : indexOf(key, mIdentityHashCode ? System.identityHashCode(key) : key.hashCode()); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int indexOfValue(Object value) { final int N = mSize*2; final Object[] array = mArray; diff --git a/core/java/android/util/ArraySet.java b/core/java/android/util/ArraySet.java index 526a950b48207..860a97398e63b 100644 --- a/core/java/android/util/ArraySet.java +++ b/core/java/android/util/ArraySet.java @@ -19,6 +19,7 @@ package android.util; import libcore.util.EmptyArray; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; @@ -157,7 +158,7 @@ public final class ArraySet implements Collection, Set { return ~end; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void allocArrays(final int size) { if (size == (BASE_SIZE * 2)) { synchronized (ArraySet.class) { @@ -215,7 +216,7 @@ public final class ArraySet implements Collection, Set { mArray = new Object[size]; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void freeArrays(final int[] hashes, final Object[] array, final int size) { if (hashes.length == (BASE_SIZE * 2)) { synchronized (ArraySet.class) { diff --git a/core/java/android/util/DebugUtils.java b/core/java/android/util/DebugUtils.java index e87fcff3ee4bc..af73a16e012a3 100644 --- a/core/java/android/util/DebugUtils.java +++ b/core/java/android/util/DebugUtils.java @@ -17,6 +17,7 @@ package android.util; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.PrintWriter; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -109,7 +110,7 @@ public class DebugUtils { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static void buildShortClassTag(Object cls, StringBuilder out) { if (cls == null) { out.append("null"); diff --git a/core/java/android/util/Slog.java b/core/java/android/util/Slog.java index c9fc3f2d1bcc7..a85120f67f8df 100644 --- a/core/java/android/util/Slog.java +++ b/core/java/android/util/Slog.java @@ -17,6 +17,7 @@ package android.util; import android.annotation.UnsupportedAppUsage; +import android.os.Build; /** * @hide @@ -105,7 +106,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.P, trackingBug = 115609023) public static int wtfStack(String tag, String msg) { return Log.wtf(Log.LOG_ID_SYSTEM, tag, msg, null, true, true); } diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index 57d55bf31375b..91bc3eb5f83aa 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -19,6 +19,7 @@ package android.util; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.SystemClock; import libcore.timezone.CountryTimeZones; @@ -289,7 +290,7 @@ public class TimeUtils { } /** @hide Just for debugging; not internationalized. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static void formatDuration(long duration, PrintWriter pw, int fieldLen) { synchronized (sFormatSync) { int len = formatDurationLocked(duration, fieldLen); @@ -306,7 +307,7 @@ public class TimeUtils { } /** @hide Just for debugging; not internationalized. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static void formatDuration(long duration, PrintWriter pw) { formatDuration(duration, pw, 0); } diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 6319a8f6c66d3..d0a36e3c511d9 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -109,7 +109,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb final ReentrantLock mSurfaceLock = new ReentrantLock(); @UnsupportedAppUsage final Surface mSurface = new Surface(); // Current surface in use - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) boolean mDrawingStopped = true; // We use this to track if the application has produced a frame // in to the Surface. Up until that point, we should be careful not to punch @@ -128,7 +128,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb int mSubLayer = APPLICATION_MEDIA_SUBLAYER; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) boolean mIsCreating = false; private volatile boolean mRtHandlingPositionUpdates = false; @@ -158,9 +158,9 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb boolean mViewVisibility = false; boolean mWindowStopped = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mRequestedWidth = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mRequestedHeight = -1; /* Set SurfaceView's format to 565 by default to maintain backward * compatibility with applications assuming this format. @@ -171,7 +171,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb @UnsupportedAppUsage boolean mHaveFrame = false; boolean mSurfaceCreated = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) long mLastLockTime = 0; boolean mVisible = false; @@ -181,7 +181,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb int mSurfaceHeight = -1; @UnsupportedAppUsage int mFormat = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final Rect mSurfaceFrame = new Rect(); int mLastSurfaceWidth = -1, mLastSurfaceHeight = -1; private Translator mTranslator; diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 325fcc64781a4..f228773aebf27 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -4526,7 +4526,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * a long press could be performed before the tap is checked, in which case the tap's action * should not be invoked. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mHasPerformedLongPress; /** @@ -14095,7 +14095,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param flags Constant indicating the value which should be set * @param mask Constant indicating the bit range that should be changed */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) void setFlags(int flags, int mask) { final boolean accessibilityEnabled = AccessibilityManager.getInstance(mContext).isEnabled(); diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index b965036b390a3..81ab4b6b267aa 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -143,7 +143,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager protected OnHierarchyChangeListener mOnHierarchyChangeListener; // The view contained within this ViewGroup that has or contains focus. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private View mFocused; // The view contained within this ViewGroup (excluding nested keyboard navigation clusters) // that is or contains a default-focus view. diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 91a43f886ffe9..ef9e0eadd6a5e 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -37,6 +37,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.media.session.MediaController; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -284,7 +285,7 @@ public abstract class Window { private WindowControllerCallback mWindowControllerCallback; private OnRestrictedCaptionAreaChangedListener mOnRestrictedCaptionAreaChangedListener; private Rect mRestrictedCaptionAreaRect; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private WindowManager mWindowManager; @UnsupportedAppUsage private IBinder mAppToken; @@ -1276,7 +1277,7 @@ public abstract class Window { public abstract void alwaysReadCloseOnTouchAttr(); /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public boolean shouldCloseOnTouch(Context context, MotionEvent event) { final boolean isOutside = event.getAction() == MotionEvent.ACTION_DOWN && isOutOfBounds(context, event) diff --git a/core/java/android/webkit/ConsoleMessage.java b/core/java/android/webkit/ConsoleMessage.java index 6051956531e42..e54849772f9ad 100644 --- a/core/java/android/webkit/ConsoleMessage.java +++ b/core/java/android/webkit/ConsoleMessage.java @@ -17,6 +17,7 @@ package android.webkit; import android.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Public class representing a JavaScript console message from WebCore. This could be a issued @@ -36,13 +37,13 @@ public class ConsoleMessage { DEBUG }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private MessageLevel mLevel; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mMessage; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mSourceId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mLineNumber; public ConsoleMessage(String message, String sourceId, int lineNumber, MessageLevel msgLevel) { diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 66ce0eeafc962..0f56abac06d40 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -29,6 +29,7 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; +import android.os.Build; import android.os.Bundle; import android.os.Debug; import android.os.Handler; @@ -316,7 +317,7 @@ public abstract class AbsListView extends AdapterView implements Te /** * The drawable used to draw the selector */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) Drawable mSelector; /** @@ -677,7 +678,7 @@ public abstract class AbsListView extends AdapterView implements Te * ID of the active pointer. This is used to retain consistency during * drags/flings if multiple pointers are used. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mActivePointerId = INVALID_POINTER; /** @@ -6572,7 +6573,7 @@ public abstract class AbsListView extends AdapterView implements Te @ViewDebug.IntToString(from = ITEM_VIEW_TYPE_IGNORE, to = "ITEM_VIEW_TYPE_IGNORE"), @ViewDebug.IntToString(from = ITEM_VIEW_TYPE_HEADER_OR_FOOTER, to = "ITEM_VIEW_TYPE_HEADER_OR_FOOTER") }) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int viewType; /** diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java index ea1bfc2854c23..d6a0ae48cc133 100644 --- a/core/java/android/widget/Gallery.java +++ b/core/java/android/widget/Gallery.java @@ -22,6 +22,7 @@ import android.annotation.Widget; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; +import android.os.Build; import android.os.Bundle; import android.util.AttributeSet; import android.util.Log; @@ -105,7 +106,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList /** * Helper for detecting touch gestures. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private GestureDetector mGestureDetector; /** @@ -149,7 +150,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList /** * The currently selected item's child. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private View mSelectedChild; /** @@ -480,7 +481,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList /** * @return The center of this Gallery. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int getCenterOfGallery() { return (getWidth() - mPaddingLeft - mPaddingRight) / 2 + mPaddingLeft; } @@ -488,7 +489,7 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList /** * @return The center of the given view. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static int getCenterOfView(View view) { return view.getLeft() + view.getWidth() / 2; } diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index ee04bcfddb275..9b497866486d4 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -28,6 +28,7 @@ import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.os.Trace; import android.util.AttributeSet; @@ -189,7 +190,7 @@ public class ListView extends AbsListView { @UnsupportedAppUsage Drawable mDivider; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) int mDividerHeight; Drawable mOverScrollHeader; @@ -1390,7 +1391,7 @@ public class ListView extends AbsListView { * startPosition is 0). * @return The height of this ListView with the given children. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) final int measureHeightOfChildren(int widthMeasureSpec, int startPosition, int endPosition, int maxHeight, int disallowPartialChildPosition) { final ListAdapter adapter = mAdapter; @@ -1533,7 +1534,7 @@ public class ListView extends AbsListView { * * @param childCount Number of children */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void correctTooHigh(int childCount) { // First see if the last item is visible. If it is not, it is OK for the // top of the list to be pushed up. @@ -1583,7 +1584,7 @@ public class ListView extends AbsListView { * * @param childCount Number of children */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void correctTooLow(int childCount) { // First see if the first item is visible. If it is not, it is OK for the // bottom of the list to be pushed down. diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index 82d77c528564b..65925b446bbef 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.PixelFormat; import android.media.AudioManager; +import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; @@ -87,9 +88,9 @@ public class MediaController extends FrameLayout { private WindowManager.LayoutParams mDecorLayoutParams; @UnsupportedAppUsage private ProgressBar mProgress; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private TextView mEndTime; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private TextView mCurrentTime; @UnsupportedAppUsage private boolean mShowing; @@ -107,9 +108,9 @@ public class MediaController extends FrameLayout { private ImageButton mFfwdButton; @UnsupportedAppUsage private ImageButton mRewButton; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private ImageButton mNextButton; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private ImageButton mPrevButton; private CharSequence mPlayDescription; private CharSequence mPauseDescription; diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 0da47fd802b32..6f794503c5d0a 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -206,9 +206,9 @@ public class PopupWindow { private float mElevation; private Drawable mBackground; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Drawable mAboveAnchorBackgroundDrawable; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Drawable mBelowAnchorBackgroundDrawable; private Transition mEnterTransition; diff --git a/core/java/android/widget/SimpleAdapter.java b/core/java/android/widget/SimpleAdapter.java index a27354dc2bacb..15e1ffa7bc318 100644 --- a/core/java/android/widget/SimpleAdapter.java +++ b/core/java/android/widget/SimpleAdapter.java @@ -22,6 +22,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.net.Uri; +import android.os.Build; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -59,7 +60,7 @@ public class SimpleAdapter extends BaseAdapter implements Filterable, ThemedSpin private String[] mFrom; private ViewBinder mViewBinder; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private List> mData; private int mResource; diff --git a/core/java/android/widget/SimpleCursorAdapter.java b/core/java/android/widget/SimpleCursorAdapter.java index b670e6c83f9df..77fe5d1a93026 100644 --- a/core/java/android/widget/SimpleCursorAdapter.java +++ b/core/java/android/widget/SimpleCursorAdapter.java @@ -20,6 +20,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.database.Cursor; import android.net.Uri; +import android.os.Build; import android.view.View; /** @@ -52,7 +53,7 @@ public class SimpleCursorAdapter extends ResourceCursorAdapter { * This field should be made private, so it is hidden from the SDK. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected int[] mFrom; /** * A list of View ids representing the views to which the data must be bound. diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 83c38b981b39d..4c0163ef89da8 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -66,6 +66,7 @@ import android.graphics.drawable.Drawable; import android.graphics.fonts.FontVariationAxis; import android.icu.text.DecimalFormatSymbols; import android.os.AsyncTask; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.LocaleList; @@ -417,7 +418,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @ViewDebug.ExportedProperty(category = "text") @UnsupportedAppUsage private int mCurTextColor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCurHintTextColor; private boolean mFreezesText; @@ -9657,7 +9658,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener && mSavedMarqueeModeLayout.getLineWidth(0) > width)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void startMarquee() { // Do not ellipsize EditText if (getKeyListener() != null) return; @@ -9700,7 +9701,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private void startStopMarquee(boolean start) { if (mEllipsize == TextUtils.TruncateAt.MARQUEE) { if (start) { diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index 8b45d997627a6..40b0f13c596b8 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -113,7 +113,7 @@ public class VideoView extends SurfaceView private int mTargetState = STATE_IDLE; // All the stuff we need for playing and showing a video - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private SurfaceHolder mSurfaceHolder = null; @UnsupportedAppUsage private MediaPlayer mMediaPlayer = null; @@ -565,7 +565,7 @@ public class VideoView extends SurfaceView } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private MediaPlayer.OnErrorListener mErrorListener = new MediaPlayer.OnErrorListener() { public boolean onError(MediaPlayer mp, int framework_err, int impl_err) { diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index bc4b5fe3ff173..ec02432223de4 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -17,6 +17,7 @@ package com.android.internal.net; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -52,7 +53,7 @@ public class VpnProfile implements Cloneable, Parcelable { public String name = ""; // 0 @UnsupportedAppUsage public int type = TYPE_PPTP; // 1 - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String server = ""; // 2 @UnsupportedAppUsage public String username = ""; // 3 diff --git a/core/java/com/android/internal/os/AtomicFile.java b/core/java/com/android/internal/os/AtomicFile.java index e177fe3032539..a72a2f5e1be37 100644 --- a/core/java/com/android/internal/os/AtomicFile.java +++ b/core/java/com/android/internal/os/AtomicFile.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.FileUtils; import android.util.Log; @@ -51,7 +52,7 @@ public final class AtomicFile { mBackupName = new File(baseName.getPath() + ".bak"); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public File getBaseFile() { return mBaseName; } diff --git a/core/java/com/android/internal/util/AsyncChannel.java b/core/java/com/android/internal/util/AsyncChannel.java index 69297b5582a5e..b0888f2c8df93 100644 --- a/core/java/com/android/internal/util/AsyncChannel.java +++ b/core/java/com/android/internal/util/AsyncChannel.java @@ -21,6 +21,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -162,7 +163,7 @@ public class AsyncChannel { sCmdToString[CMD_CHANNEL_DISCONNECT - BASE] = "CMD_CHANNEL_DISCONNECT"; sCmdToString[CMD_CHANNEL_DISCONNECTED - BASE] = "CMD_CHANNEL_DISCONNECTED"; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected static String cmdToString(int cmd) { cmd -= BASE; if ((cmd >= 0) && (cmd < sCmdToString.length)) { @@ -591,7 +592,7 @@ public class AsyncChannel { * @param srcMsg * @param what */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void replyToMessage(Message srcMsg, int what) { Message msg = Message.obtain(); msg.what = what; diff --git a/core/java/com/android/internal/util/JournaledFile.java b/core/java/com/android/internal/util/JournaledFile.java index 73e04882856c3..d471fdcc7e128 100644 --- a/core/java/com/android/internal/util/JournaledFile.java +++ b/core/java/com/android/internal/util/JournaledFile.java @@ -17,6 +17,7 @@ package com.android.internal.util; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import java.io.File; import java.io.IOException; @@ -46,7 +47,7 @@ public class JournaledFile { * it to the real one. If there is both a real file and a temp one, assumes that the * temp one isn't fully written and deletes it. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public File chooseForRead() { File result; if (mReal.exists()) { @@ -71,7 +72,7 @@ public class JournaledFile { *

* Call {@link #commit} to commit the changes, or {@link #rollback} to forget the changes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public File chooseForWrite() { if (mWriting) { throw new IllegalStateException("uncommitted write already in progress"); @@ -99,7 +100,7 @@ public class JournaledFile { /** * Commit changes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void commit() { if (!mWriting) { throw new IllegalStateException("no file to commit"); @@ -111,7 +112,7 @@ public class JournaledFile { /** * Roll back changes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void rollback() { if (!mWriting) { throw new IllegalStateException("no file to roll back"); diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index e229c12d64f1c..7f79e40acba9b 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -22,6 +22,7 @@ import android.annotation.Size; import android.annotation.UnsupportedAppUsage; import android.graphics.FontListParser; import android.graphics.fonts.FontVariationAxis; +import android.os.Build; import android.os.LocaleList; import android.text.GraphicsOperations; import android.text.SpannableString; @@ -64,7 +65,7 @@ public class Paint { private MaskFilter mMaskFilter; private PathEffect mPathEffect; private Shader mShader; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private Typeface mTypeface; private Xfermode mXfermode; diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 8c893e0d88f31..77bd96ccecd73 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -29,6 +29,7 @@ import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.PorterDuff.Mode; import android.graphics.Rect; +import android.os.Build; import android.os.SystemClock; import android.util.DisplayMetrics; import android.util.LayoutDirection; @@ -739,7 +740,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected DrawableContainerState(DrawableContainerState orig, DrawableContainer owner, Resources res) { mOwner = owner; diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 36b7e37635ca4..25a6cdc4a7f48 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; @@ -333,7 +334,7 @@ public class KeyStore { return list(prefix, UID_SELF); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public boolean reset() { try { return mBinder.reset() == NO_ERROR; @@ -401,7 +402,7 @@ public class KeyStore { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public boolean isEmpty() { return isEmpty(UserHandle.myUserId()); } diff --git a/location/java/android/location/GpsStatus.java b/location/java/android/location/GpsStatus.java index d90a597b1cbb4..609a15e1be7e0 100644 --- a/location/java/android/location/GpsStatus.java +++ b/location/java/android/location/GpsStatus.java @@ -17,6 +17,7 @@ package android.location; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.util.SparseArray; import java.util.Iterator; @@ -207,7 +208,7 @@ public final class GpsStatus { status.mAzimuths); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) void setTimeToFirstFix(int ttff) { mTimeToFirstFix = ttff; } diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 682974cc26b0a..1cbcc068f776c 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -18,6 +18,7 @@ package android.location; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -123,7 +124,7 @@ public class Location implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mProvider; private long mTime = 0; @UnsupportedAppUsage diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 6c4150c4a8c7e..7eed6a18f227e 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -2322,7 +2322,7 @@ public class LocationManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public boolean sendNiResponse(int notifId, int userResponse) { try { return mService.sendNiResponse(notifId, userResponse); diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 2d7f7e309004f..154bd563fb0ff 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -18,6 +18,7 @@ package android.location; import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -142,19 +143,19 @@ public final class LocationRequest implements Parcelable { */ private static final double FASTEST_INTERVAL_FACTOR = 6.0; // 6x - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mQuality = POWER_LOW; @UnsupportedAppUsage private long mInterval = 60 * 60 * 1000; // 60 minutes - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private long mFastestInterval = (long) (mInterval / FASTEST_INTERVAL_FACTOR); // 10 minutes - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mExplicitFastestInterval = false; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private long mExpireAt = Long.MAX_VALUE; // no expiry - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mNumUpdates = Integer.MAX_VALUE; // no expiry - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private float mSmallestDisplacement = 0.0f; // meters @UnsupportedAppUsage private WorkSource mWorkSource = null; @@ -603,14 +604,14 @@ public final class LocationRequest implements Parcelable { return mHideFromAppOps; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void checkInterval(long millis) { if (millis < 0) { throw new IllegalArgumentException("invalid interval: " + millis); } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void checkQuality(int quality) { switch (quality) { case ACCURACY_FINE: @@ -625,14 +626,14 @@ public final class LocationRequest implements Parcelable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void checkDisplacement(float meters) { if (meters < 0.0f) { throw new IllegalArgumentException("invalid displacement: " + meters); } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void checkProvider(String name) { if (name == null) { throw new IllegalArgumentException("invalid provider: " + name); diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index aa123bdc9cff5..4f74ec9114995 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -19,6 +19,7 @@ package android.media; import android.annotation.UnsupportedAppUsage; import android.hardware.Camera; import android.hardware.Camera.CameraInfo; +import android.os.Build; /** * Retrieves the @@ -496,7 +497,7 @@ public class CamcorderProfile } // Methods implemented by JNI - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native final void native_init(); @UnsupportedAppUsage private static native final CamcorderProfile native_get_camcorder_profile( diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index 5b8fbc4041aec..ff18363758acc 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -21,6 +21,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.os.Build; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; @@ -469,7 +470,7 @@ public class ExifInterface { // See http://www.exiv2.org/makernote.html#R11 private static final int PEF_MAKER_NOTE_SKIP_SIZE = 6; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static SimpleDateFormat sFormatter; // See Exchangeable image file format for digital still cameras: Exif version 2.2. @@ -1295,7 +1296,7 @@ public class ExifInterface { sExifPointerTagMap.put(EXIF_POINTER_TAGS[5].number, IFD_TYPE_ORF_IMAGE_PROCESSING); // 8256 } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final String mFilename; private final FileDescriptor mSeekableFileDescriptor; private final AssetManager.AssetInputStream mAssetInputStream; @@ -1305,7 +1306,7 @@ public class ExifInterface { private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length]; private Set mAttributesOffsets = new HashSet<>(EXIF_TAGS.length); private ByteOrder mExifByteOrder = ByteOrder.BIG_ENDIAN; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mHasThumbnail; // The following values used for indicating a thumbnail position. private int mThumbnailOffset; @@ -2087,7 +2088,7 @@ public class ExifInterface { } /** {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static float convertRationalLatLonToFloat(String rationalString, String ref) { try { String [] parts = rationalString.split(","); diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 00a393a902b4a..b15dec4aaf54f 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.res.AssetFileDescriptor; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.os.IBinder; import java.io.FileDescriptor; @@ -677,12 +678,12 @@ public class MediaMetadataRetriever * allocated internally. */ public native void release(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private native void native_setup(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native void native_init(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private native final void native_finalize(); @Override diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index d4bfd6175a09c..c6f4ef6d632ff 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -22,6 +22,7 @@ import android.annotation.SystemApi; import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread; import android.hardware.Camera; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -101,12 +102,12 @@ public class MediaRecorder implements AudioRouting @UnsupportedAppUsage private Surface mSurface; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mPath; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private FileDescriptor mFd; private File mFile; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private EventHandler mEventHandler; @UnsupportedAppUsage private OnErrorListener mOnErrorListener; @@ -949,7 +950,7 @@ public class MediaRecorder implements AudioRouting // native implementation private native void _setOutputFile(FileDescriptor fd) throws IllegalStateException, IOException; private native void _setNextOutputFile(FileDescriptor fd) throws IllegalStateException, IOException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private native void _prepare() throws IllegalStateException, IOException; /** @@ -1051,7 +1052,7 @@ public class MediaRecorder implements AudioRouting mEventHandler.removeCallbacksAndMessages(null); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private native void native_reset(); /** @@ -1509,14 +1510,14 @@ public class MediaRecorder implements AudioRouting */ public native void release(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static native final void native_init(); @UnsupportedAppUsage private native final void native_setup(Object mediarecorder_this, String clientName, String opPackageName) throws IllegalStateException; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private native final void native_finalize(); @UnsupportedAppUsage diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java index 07ab06934eb3a..2b53237d983e2 100644 --- a/media/java/android/media/ThumbnailUtils.java +++ b/media/java/android/media/ThumbnailUtils.java @@ -26,6 +26,7 @@ import android.graphics.Rect; import android.media.MediaMetadataRetriever; import android.media.MediaFile.MediaFileType; import android.net.Uri; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.provider.MediaStore.Images; import android.util.Log; @@ -255,7 +256,7 @@ public class ThumbnailUtils { * For example, BitmapFactory downsamples an image by 2 even though the * request is 3. So we round up the sample size to avoid OOM. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static int computeSampleSize(BitmapFactory.Options options, int minSideLength, int maxNumOfPixels) { int initialSize = computeInitialSampleSize(options, minSideLength, @@ -274,7 +275,7 @@ public class ThumbnailUtils { return roundedSize; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static int computeInitialSampleSize(BitmapFactory.Options options, int minSideLength, int maxNumOfPixels) { double w = options.outWidth; @@ -342,7 +343,7 @@ public class ThumbnailUtils { return b; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void closeSilently(ParcelFileDescriptor c) { if (c == null) return; try { @@ -352,7 +353,7 @@ public class ThumbnailUtils { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static ParcelFileDescriptor makeInputStream( Uri uri, ContentResolver cr) { try { @@ -365,7 +366,7 @@ public class ThumbnailUtils { /** * Transform source Bitmap to targeted width and height. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static Bitmap transform(Matrix scaler, Bitmap source, int targetWidth, @@ -482,7 +483,7 @@ public class ThumbnailUtils { * The functions returns a SizedThumbnailBitmap, * which contains a downsampled bitmap and the thumbnail data in EXIF if exists. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static void createThumbnailFromEXIF(String filePath, int targetSize, int maxPixels, SizedThumbnailBitmap sizedThumbBitmap) { if (filePath == null) return; diff --git a/telecomm/java/android/telecom/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java index 097e3529dead4..5dedb045566ca 100644 --- a/telecomm/java/android/telecom/PhoneAccountHandle.java +++ b/telecomm/java/android/telecom/PhoneAccountHandle.java @@ -168,7 +168,7 @@ public final class PhoneAccountHandle implements Parcelable { } }; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private PhoneAccountHandle(Parcel in) { this(ComponentName.CREATOR.createFromParcel(in), in.readString(), diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index d957d077e0166..51393b90e61e5 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; @@ -65,7 +66,7 @@ public final class CellIdentityLte extends CellIdentity { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public CellIdentityLte(int mcc, int mnc, int ci, int pci, int tac) { this(ci, pci, tac, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, String.valueOf(mcc), String.valueOf(mnc), null, null); diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 8c76eae0b5440..c9f07dab6bbd1 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -41,7 +42,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public CellInfoCdma(CellInfoCdma ci) { super(ci); this.mCellIdentityCdma = ci.mCellIdentityCdma.copy(); diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 8ca6a1a6815bd..75938317bf44c 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -75,7 +76,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { return mCellIdentityLte; } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCellIdentity(CellIdentityLte cid) { if (DBG) log("setCellIdentity: " + cid); mCellIdentityLte = cid; @@ -87,7 +88,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { return mCellSignalStrengthLte; } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCellSignalStrength(CellSignalStrengthLte css) { if (DBG) log("setCellSignalStrength: " + css); mCellSignalStrengthLte = css; diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java index ac38efb4d0290..1c615aba8d614 100644 --- a/telephony/java/android/telephony/NeighboringCellInfo.java +++ b/telephony/java/android/telephony/NeighboringCellInfo.java @@ -25,6 +25,7 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS; import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -53,29 +54,29 @@ public class NeighboringCellInfo implements Parcelable * In GSM, mRssi is the Received RSSI; * In UMTS, mRssi is the Level index of CPICH Received Signal Code Power */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mRssi; /** * CID in 16 bits format in GSM. Return UNKNOWN_CID in UMTS and CMDA. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCid; /** * LAC in 16 bits format in GSM. Return UNKNOWN_CID in UMTS and CMDA. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mLac; /** * Primary Scrambling Code in 9 bits format in UMTS * Return UNKNOWN_CID in GSM and CMDA. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mPsc; /** * Radio network type, value is one of following * TelephonyManager.NETWORK_TYPE_XXXXXX. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mNetworkType; /** diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 448207424d59b..f63b753e075ef 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -271,7 +272,7 @@ public class RadioAccessFamily implements Parcelable { return TelephonyManager.NETWORK_CLASS_UNKNOWN; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static int getNetworkTypeFromRaf(int raf) { int type; diff --git a/telephony/java/android/telephony/Rlog.java b/telephony/java/android/telephony/Rlog.java index 5f2fa335135fc..cdab2dc54dd28 100644 --- a/telephony/java/android/telephony/Rlog.java +++ b/telephony/java/android/telephony/Rlog.java @@ -65,7 +65,7 @@ public final class Rlog { return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, msg); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static int i(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, msg + '\n' + Log.getStackTraceString(tr)); diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index ca0c854a1a756..421851be3e57c 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -316,19 +316,19 @@ public class ServiceState implements Parcelable { @RilRadioTechnology private int mRilDataRadioTechnology; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mCssIndicator; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private int mNetworkId; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private int mSystemId; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCdmaRoamingIndicator; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCdmaDefaultRoamingIndicator; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCdmaEriIconIndex; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mCdmaEriIconMode; @UnsupportedAppUsage @@ -1070,7 +1070,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setDataRegState(int state) { mDataRegState = state; if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState); @@ -1100,7 +1100,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setVoiceRoamingType(@RoamingType int type) { NetworkRegistrationState regState = getNetworkRegistrationState( NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TransportType.WWAN); @@ -1121,7 +1121,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setDataRoamingType(@RoamingType int type) { NetworkRegistrationState regState = getNetworkRegistrationState( NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN); @@ -1138,7 +1138,7 @@ public class ServiceState implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setEmergencyOnly(boolean emergencyOnly) { mIsEmergencyOnly = emergencyOnly; } @@ -1146,7 +1146,7 @@ public class ServiceState implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCdmaRoamingIndicator(int roaming) { this.mCdmaRoamingIndicator = roaming; } @@ -1154,7 +1154,7 @@ public class ServiceState implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCdmaDefaultRoamingIndicator (int roaming) { this.mCdmaDefaultRoamingIndicator = roaming; } @@ -1162,7 +1162,7 @@ public class ServiceState implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCdmaEriIconIndex(int index) { this.mCdmaEriIconIndex = index; } @@ -1170,7 +1170,7 @@ public class ServiceState implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCdmaEriIconMode(int mode) { this.mCdmaEriIconMode = mode; } @@ -1231,7 +1231,7 @@ public class ServiceState implements Parcelable { * @param b second obj * @return true if two objects equal or both are null */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static boolean equalsHandlesNulls (Object a, Object b) { return (a == null) ? (b == null) : a.equals (b); } @@ -1376,7 +1376,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setCssIndicator(int css) { this.mCssIndicator = (css != 0); } @@ -1555,7 +1555,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public int getCssIndicator() { return this.mCssIndicator ? 1 : 0; } @@ -1615,7 +1615,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static boolean bearerBitmapHasCdma(int radioTechnologyBitmap) { return (RIL_RADIO_CDMA_TECHNOLOGY_BITMASK & radioTechnologyBitmap) != 0; } diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 1b37bad65d578..1378bb004696a 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -28,6 +28,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.BaseBundle; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; @@ -89,7 +90,7 @@ public final class SmsManager { new ArrayMap(); /** A concrete subscription id, or the pseudo DEFAULT_SUBSCRIPTION_ID */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSubId; /* diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 26d2459d21168..ce9ebbd6f6236 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7929,7 +7929,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setSimOperatorNameForPhone(int phoneId, String name) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, name); @@ -7950,7 +7950,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setSimCountryIsoForPhone(int phoneId, String iso) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY, iso); @@ -7971,7 +7971,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setSimStateForPhone(int phoneId, String state) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SIM_STATE, state); @@ -8077,7 +8077,7 @@ public class TelephonyManager { * @param version baseband version * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setBasebandVersionForPhone(int phoneId, String version) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_BASEBAND_VERSION, version); } @@ -8143,7 +8143,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setPhoneType(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { TelephonyManager.setTelephonyProperty(phoneId, @@ -8173,7 +8173,7 @@ public class TelephonyManager { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String getOtaSpNumberSchemaForPhone(int phoneId, String defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { return TelephonyManager.getTelephonyProperty(phoneId, diff --git a/telephony/java/android/telephony/VoLteServiceState.java b/telephony/java/android/telephony/VoLteServiceState.java index cf961d0be10ca..d0b751981c281 100644 --- a/telephony/java/android/telephony/VoLteServiceState.java +++ b/telephony/java/android/telephony/VoLteServiceState.java @@ -17,6 +17,7 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -80,7 +81,7 @@ public final class VoLteServiceState implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public VoLteServiceState(int srvccState) { initialize(); diff --git a/telephony/java/android/telephony/cdma/CdmaCellLocation.java b/telephony/java/android/telephony/cdma/CdmaCellLocation.java index ee602c06f0f71..45b1e474b93d8 100644 --- a/telephony/java/android/telephony/cdma/CdmaCellLocation.java +++ b/telephony/java/android/telephony/cdma/CdmaCellLocation.java @@ -17,6 +17,7 @@ package android.telephony.cdma; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.telephony.CellLocation; @@ -24,7 +25,7 @@ import android.telephony.CellLocation; * Represents the cell location on a CDMA phone. */ public class CdmaCellLocation extends CellLocation { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mBaseStationId = -1; /** @@ -38,7 +39,7 @@ public class CdmaCellLocation extends CellLocation { * to 1296000, both values inclusive (corresponding to a range of -90 * to +90 degrees). Integer.MAX_VALUE is considered invalid value. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mBaseStationLatitude = INVALID_LAT_LONG; /** @@ -47,12 +48,12 @@ public class CdmaCellLocation extends CellLocation { * to 2592000, both values inclusive (corresponding to a range of -180 * to +180 degrees). Integer.MAX_VALUE is considered invalid value. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mBaseStationLongitude = INVALID_LAT_LONG; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSystemId = -1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mNetworkId = -1; /** @@ -206,7 +207,7 @@ public class CdmaCellLocation extends CellLocation { * @param b second obj * @return true if two objects equal or both are null */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private static boolean equalsHandlesNulls(Object a, Object b) { return (a == null) ? (b == null) : a.equals (b); } diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java index 98ce33368ca66..d6780ce107c9b 100644 --- a/telephony/java/android/telephony/gsm/GsmCellLocation.java +++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java @@ -17,6 +17,7 @@ package android.telephony.gsm; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.telephony.CellLocation; @@ -92,7 +93,7 @@ public class GsmCellLocation extends CellLocation { * Set the primary scrambling code. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public void setPsc(int psc) { mPsc = psc; } diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java index 69ff329e2d07d..84c0e6453104e 100644 --- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java +++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java @@ -21,6 +21,7 @@ import android.text.TextUtils; import android.util.SparseIntArray; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.telephony.Rlog; import java.nio.ByteBuffer; @@ -587,7 +588,7 @@ public class GsmAlphabet { * Additionally, in some country(ex. Korea), there are non-ASCII or MBCS characters. * If a character set is given, characters in data are treat as MBCS. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static String gsm8BitUnpackedToString(byte[] data, int offset, int length, String characterset) { boolean isMbcs = false; diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index a47e2b0260218..59c39b1583870 100644 --- a/telephony/java/com/android/internal/telephony/OperatorInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -17,6 +17,7 @@ package com.android.internal.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -91,7 +92,7 @@ public class OperatorInfo implements Parcelable { operatorNumeric, rilStateToState(stateString)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric) { diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index 7b1ead9722b88..190eac4d8c022 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -23,6 +23,7 @@ import java.text.BreakIterator; import java.util.Arrays; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.provider.Telephony; import android.telephony.SmsMessage; import android.text.Emoji; @@ -118,7 +119,7 @@ public abstract class SmsMessageBase { * Returns the address of the SMS service center that relayed this message * or null if there is none. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public String getServiceCenterAddress() { return mScAddress; } @@ -223,14 +224,14 @@ public abstract class SmsMessageBase { /** * Get protocol identifier. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public abstract int getProtocolIdentifier(); /** * See TS 23.040 9.2.3.9 returns true if this is a "replace short message" * SMS */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public abstract boolean isReplace(); /** @@ -302,7 +303,7 @@ public abstract class SmsMessageBase { * See TS 23.040, 9.9.2.3.15 for a description of other possible * values. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public abstract int getStatus(); /** @@ -315,7 +316,7 @@ public abstract class SmsMessageBase { * Returns true iff the TP-Reply-Path bit is set in * this message. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public abstract boolean isReplyPathPresent(); /** diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index ce8d71d7ed2a2..fd8796a7e2293 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -27,6 +27,7 @@ import android.net.ProxyInfo; import android.net.StaticIpConfiguration; import android.net.Uri; import android.net.wifi.WifiInfo; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; @@ -542,7 +543,7 @@ public class WifiConfiguration implements Parcelable { * the network we need to be before autojoin kicks in */ /** @hide **/ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public static int INVALID_RSSI = -127; // States for the userApproved field diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index e37a85670972a..669ec30e878f3 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -19,6 +19,7 @@ package android.net.wifi; import android.annotation.UnsupportedAppUsage; import android.net.NetworkInfo.DetailedState; import android.net.NetworkUtils; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -69,7 +70,7 @@ public class WifiInfo implements Parcelable { } private SupplicantState mSupplicantState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private String mBSSID; @UnsupportedAppUsage private WifiSsid mWifiSsid; diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java b/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java index ef1bff4c793c8..f9ef08fa6dc19 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java @@ -17,6 +17,7 @@ package android.net.wifi.p2p; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcelable; import android.os.Parcel; @@ -54,7 +55,7 @@ public class WifiP2pWfdInfo implements Parcelable { private int mMaxThroughput; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public WifiP2pWfdInfo() { } diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java index c9e9867e200d8..e32c8e80ad1cf 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java @@ -18,6 +18,7 @@ package android.net.wifi.p2p.nsd; import android.annotation.UnsupportedAppUsage; import android.net.nsd.DnsSdTxtRecord; +import android.os.Build; import android.text.TextUtils; import java.util.ArrayList; @@ -174,7 +175,7 @@ public class WifiP2pDnsSdServiceInfo extends WifiP2pServiceInfo { * @param version version number * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) static String createRequest(String dnsName, int dnsType, int version) { StringBuffer sb = new StringBuffer(); diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java index 35631985bdfca..e9ee7bbcaf6ce 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.java @@ -17,6 +17,7 @@ package android.net.wifi.p2p.nsd; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -84,7 +85,7 @@ public class WifiP2pServiceInfo implements Parcelable { * {"upnp", "10", "uuid:6859dede-8574-59ab-9322-123456789012::urn:schemas-upnp * -org:service:ContentDirectory:2"} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private List mQueryList; /** @@ -93,7 +94,7 @@ public class WifiP2pServiceInfo implements Parcelable { * @param queryList query string for wpa_supplicant * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected WifiP2pServiceInfo(List queryList) { if (queryList == null) { throw new IllegalArgumentException("query list cannot be null"); diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java index 2e7f44802ab28..f1f2262b0ec45 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java @@ -18,6 +18,7 @@ package android.net.wifi.p2p.nsd; import android.annotation.UnsupportedAppUsage; import android.net.wifi.p2p.WifiP2pManager; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -73,7 +74,7 @@ public class WifiP2pServiceRequest implements Parcelable { * @param query The part of service specific query. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) protected WifiP2pServiceRequest(int protocolType, String query) { validateQuery(query);